diff options
Diffstat (limited to 'src')
283 files changed, 47369 insertions, 9840 deletions
diff --git a/src/.clang-format b/src/.clang-format index 129f062ef8..fc53509138 100644 --- a/src/.clang-format +++ b/src/.clang-format @@ -6,7 +6,7 @@ AlignTrailingComments: true AllowAllParametersOfDeclarationOnNextLine: false AllowShortBlocksOnASingleLine: false AllowShortFunctionsOnASingleLine: All -AllowShortIfStatementsOnASingleLine: false +AllowShortIfStatementsOnASingleLine: true AllowShortLoopsOnASingleLine: false AlwaysBreakBeforeMultilineStrings: false AlwaysBreakTemplateDeclarations: true diff --git a/src/Makefile.am b/src/Makefile.am index a2072865a3..e8d22313dc 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -5,7 +5,7 @@ DIST_SUBDIRS = secp256k1 univalue AM_LDFLAGS = $(PTHREAD_CFLAGS) $(LIBTOOL_LDFLAGS) $(HARDENED_LDFLAGS) -AM_CXXFLAGS = $(HARDENED_CXXFLAGS) +AM_CXXFLAGS = $(HARDENED_CXXFLAGS) $(ERROR_CXXFLAGS) AM_CPPFLAGS = $(HARDENED_CPPFLAGS) EXTRA_LIBRARIES = diff --git a/src/Makefile.bench.include b/src/Makefile.bench.include index 2dc240e246..3bcecab596 100644 --- a/src/Makefile.bench.include +++ b/src/Makefile.bench.include @@ -15,6 +15,7 @@ bench_bench_bitcoin_SOURCES = \ bench/bench.cpp \ bench/bench.h \ bench/checkblock.cpp \ + bench/checkqueue.cpp \ bench/Examples.cpp \ bench/rollingbloom.cpp \ bench/crypto_hash.cpp \ diff --git a/src/Makefile.qt.include b/src/Makefile.qt.include index 64ba78665a..edc3c4b292 100644 --- a/src/Makefile.qt.include +++ b/src/Makefile.qt.include @@ -11,12 +11,11 @@ QT_TS = \ qt/locale/bitcoin_af_ZA.ts \ qt/locale/bitcoin_ar.ts \ qt/locale/bitcoin_be_BY.ts \ - qt/locale/bitcoin_bg.ts \ qt/locale/bitcoin_bg_BG.ts \ + qt/locale/bitcoin_bg.ts \ qt/locale/bitcoin_ca_ES.ts \ qt/locale/bitcoin_ca.ts \ qt/locale/bitcoin_ca@valencia.ts \ - qt/locale/bitcoin_cs_CZ.ts \ qt/locale/bitcoin_cs.ts \ qt/locale/bitcoin_cy.ts \ qt/locale/bitcoin_da.ts \ @@ -35,6 +34,7 @@ QT_TS = \ qt/locale/bitcoin_es.ts \ qt/locale/bitcoin_es_UY.ts \ qt/locale/bitcoin_es_VE.ts \ + qt/locale/bitcoin_et_EE.ts \ qt/locale/bitcoin_et.ts \ qt/locale/bitcoin_eu_ES.ts \ qt/locale/bitcoin_fa_IR.ts \ @@ -64,6 +64,7 @@ QT_TS = \ qt/locale/bitcoin_mn.ts \ qt/locale/bitcoin_ms_MY.ts \ qt/locale/bitcoin_nb.ts \ + qt/locale/bitcoin_ne.ts \ qt/locale/bitcoin_nl.ts \ qt/locale/bitcoin_pam.ts \ qt/locale/bitcoin_pl.ts \ @@ -354,7 +355,7 @@ endif RES_IMAGES = -RES_MOVIES = $(wildcard qt/res/movies/spinner-*.png) +RES_MOVIES = $(wildcard $(srcdir)/qt/res/movies/spinner-*.png) BITCOIN_RC = qt/res/bitcoin-qt-res.rc diff --git a/src/Makefile.test.include b/src/Makefile.test.include index 27b456240e..55a587cf87 100644 --- a/src/Makefile.test.include +++ b/src/Makefile.test.include @@ -13,32 +13,54 @@ EXTRA_DIST += \ test/bctest.py \ test/bitcoin-util-test.py \ test/data/bitcoin-util-test.json \ + test/data/blanktxv1.hex \ test/data/blanktxv1.json \ + test/data/blanktxv2.hex \ test/data/blanktxv2.json \ + test/data/tt-delin1-out.hex \ test/data/tt-delin1-out.json \ + test/data/tt-delout1-out.hex \ test/data/tt-delout1-out.json \ + test/data/tt-locktime317000-out.hex \ test/data/tt-locktime317000-out.json \ + test/data/tx394b54bb.hex \ + test/data/txcreate1.hex \ test/data/txcreate1.json \ + test/data/txcreate2.hex \ test/data/txcreate2.json \ + test/data/txcreatedata1.hex \ test/data/txcreatedata1.json \ + test/data/txcreatedata2.hex \ test/data/txcreatedata2.json \ + test/data/txcreatedata_seq0.hex \ test/data/txcreatedata_seq0.json \ + test/data/txcreatedata_seq1.hex \ test/data/txcreatedata_seq1.json \ - test/data/txcreatesignv1.json \ - test/data/blanktxv1.hex \ - test/data/blanktxv2.hex \ - test/data/tt-delin1-out.hex \ - test/data/tt-delout1-out.hex \ - test/data/tt-locktime317000-out.hex \ - test/data/tx394b54bb.hex \ - test/data/txcreate1.hex \ - test/data/txcreate2.hex \ - test/data/txcreatedata1.hex \ - test/data/txcreatedata2.hex \ + test/data/txcreatemultisig1.hex \ + test/data/txcreatemultisig1.json \ + test/data/txcreatemultisig2.hex \ + test/data/txcreatemultisig2.json \ + test/data/txcreatemultisig3.hex \ + test/data/txcreatemultisig3.json \ + test/data/txcreatemultisig4.hex \ + test/data/txcreatemultisig4.json \ + test/data/txcreateoutpubkey1.hex \ + test/data/txcreateoutpubkey1.json \ + test/data/txcreateoutpubkey2.hex \ + test/data/txcreateoutpubkey2.json \ + test/data/txcreateoutpubkey3.hex \ + test/data/txcreateoutpubkey3.json \ + test/data/txcreatescript1.hex \ + test/data/txcreatescript1.json \ + test/data/txcreatescript2.hex \ + test/data/txcreatescript2.json \ + test/data/txcreatescript3.hex \ + test/data/txcreatescript3.json \ + test/data/txcreatescript4.hex \ + test/data/txcreatescript4.json \ test/data/txcreatesignv1.hex \ - test/data/txcreatesignv2.hex \ - test/data/txcreatedata_seq0.hex \ - test/data/txcreatedata_seq1.hex + test/data/txcreatesignv1.json \ + test/data/txcreatesignv2.hex JSON_TEST_FILES = \ test/data/script_tests.json \ @@ -88,6 +110,7 @@ BITCOIN_TESTS =\ test/policyestimator_tests.cpp \ test/pow_tests.cpp \ test/prevector_tests.cpp \ + test/random_tests.cpp \ test/raii_event_tests.cpp \ test/reverselock_tests.cpp \ test/rpc_tests.cpp \ diff --git a/src/addrman.cpp b/src/addrman.cpp index 662e931d25..b6ab4c6305 100644 --- a/src/addrman.cpp +++ b/src/addrman.cpp @@ -53,14 +53,7 @@ bool CAddrInfo::IsTerrible(int64_t nNow) const double CAddrInfo::GetChance(int64_t nNow) const { double fChance = 1.0; - - int64_t nSinceLastSeen = nNow - nTime; - int64_t nSinceLastTry = nNow - nLastTry; - - if (nSinceLastSeen < 0) - nSinceLastSeen = 0; - if (nSinceLastTry < 0) - nSinceLastTry = 0; + int64_t nSinceLastTry = std::max<int64_t>(nNow - nLastTry, 0); // deprioritize very recent attempts away if (nSinceLastTry < 60 * 10) @@ -255,7 +248,7 @@ bool CAddrMan::Add_(const CAddress& addr, const CNetAddr& source, int64_t nTimeP int nId; CAddrInfo* pinfo = Find(addr, &nId); - // Do not set a penality for a source's self-announcement + // Do not set a penalty for a source's self-announcement if (addr == source) { nTimePenalty = 0; } diff --git a/src/arith_uint256.cpp b/src/arith_uint256.cpp index f9f2d19e68..dd34a313b7 100644 --- a/src/arith_uint256.cpp +++ b/src/arith_uint256.cpp @@ -173,9 +173,9 @@ unsigned int base_uint<BITS>::bits() const { for (int pos = WIDTH - 1; pos >= 0; pos--) { if (pn[pos]) { - for (int bits = 31; bits > 0; bits--) { - if (pn[pos] & 1 << bits) - return 32 * pos + bits + 1; + for (int nbits = 31; nbits > 0; nbits--) { + if (pn[pos] & 1 << nbits) + return 32 * pos + nbits + 1; } return 32 * pos + 1; } diff --git a/src/base58.h b/src/base58.h index cccebc9e0e..3998283bb1 100644 --- a/src/base58.h +++ b/src/base58.h @@ -147,7 +147,7 @@ public: K GetKey() { K ret; if (vchData.size() == Size) { - //if base58 encouded data not holds a ext key, return a !IsValid() key + // If base58 encoded data does not hold an ext key, return a !IsValid() key ret.Decode(&vchData[0]); } return ret; diff --git a/src/bench/bench.cpp b/src/bench/bench.cpp index 1bd9d06b80..b0df3d2b04 100644 --- a/src/bench/bench.cpp +++ b/src/bench/bench.cpp @@ -9,7 +9,10 @@ #include <iomanip> #include <sys/time.h> -std::map<std::string, benchmark::BenchFunction> benchmark::BenchRunner::benchmarks; +benchmark::BenchRunner::BenchmarkMap &benchmark::BenchRunner::benchmarks() { + static std::map<std::string, benchmark::BenchFunction> benchmarks_map; + return benchmarks_map; +} static double gettimedouble(void) { struct timeval tv; @@ -19,7 +22,7 @@ static double gettimedouble(void) { benchmark::BenchRunner::BenchRunner(std::string name, benchmark::BenchFunction func) { - benchmarks.insert(std::make_pair(name, func)); + benchmarks().insert(std::make_pair(name, func)); } void @@ -29,12 +32,9 @@ benchmark::BenchRunner::RunAll(double elapsedTimeForOne) std::cout << "#Benchmark" << "," << "count" << "," << "min" << "," << "max" << "," << "average" << "," << "min_cycles" << "," << "max_cycles" << "," << "average_cycles" << "\n"; - for (std::map<std::string,benchmark::BenchFunction>::iterator it = benchmarks.begin(); - it != benchmarks.end(); ++it) { - - State state(it->first, elapsedTimeForOne); - benchmark::BenchFunction& func = it->second; - func(state); + for (const auto &p: benchmarks()) { + State state(p.first, elapsedTimeForOne); + p.second(state); } perf_fini(); } @@ -92,6 +92,8 @@ bool benchmark::State::KeepRunning() --count; + assert(count != 0 && "count == 0 => (now == 0 && beginTime == 0) => return above"); + // Output results double average = (now-beginTime)/count; int64_t averageCycles = (nowCycles-beginCycles)/count; diff --git a/src/bench/bench.h b/src/bench/bench.h index 80dad6a8ef..0e7605c726 100644 --- a/src/bench/bench.h +++ b/src/bench/bench.h @@ -63,7 +63,8 @@ namespace benchmark { class BenchRunner { - static std::map<std::string, BenchFunction> benchmarks; + typedef std::map<std::string, BenchFunction> BenchmarkMap; + static BenchmarkMap &benchmarks(); public: BenchRunner(std::string name, BenchFunction func); diff --git a/src/bench/checkqueue.cpp b/src/bench/checkqueue.cpp new file mode 100644 index 0000000000..6fa9fe4fe8 --- /dev/null +++ b/src/bench/checkqueue.cpp @@ -0,0 +1,103 @@ +// Copyright (c) 2015 The Bitcoin Core developers +// Distributed under the MIT software license, see the accompanying +// file COPYING or http://www.opensource.org/licenses/mit-license.php. + +#include "bench.h" +#include "util.h" +#include "validation.h" +#include "checkqueue.h" +#include "prevector.h" +#include <vector> +#include <boost/thread/thread.hpp> +#include "random.h" + + +// This Benchmark tests the CheckQueue with the lightest +// weight Checks, so it should make any lock contention +// particularly visible +static const int MIN_CORES = 2; +static const size_t BATCHES = 101; +static const size_t BATCH_SIZE = 30; +static const int PREVECTOR_SIZE = 28; +static const int QUEUE_BATCH_SIZE = 128; +static void CCheckQueueSpeed(benchmark::State& state) +{ + struct FakeJobNoWork { + bool operator()() + { + return true; + } + void swap(FakeJobNoWork& x){}; + }; + CCheckQueue<FakeJobNoWork> queue {QUEUE_BATCH_SIZE}; + boost::thread_group tg; + for (auto x = 0; x < std::max(MIN_CORES, GetNumCores()); ++x) { + tg.create_thread([&]{queue.Thread();}); + } + while (state.KeepRunning()) { + CCheckQueueControl<FakeJobNoWork> control(&queue); + + // We call Add a number of times to simulate the behavior of adding + // a block of transactions at once. + + std::vector<std::vector<FakeJobNoWork>> vBatches(BATCHES); + for (auto& vChecks : vBatches) { + vChecks.resize(BATCH_SIZE); + } + for (auto& vChecks : vBatches) { + // We can't make vChecks in the inner loop because we want to measure + // the cost of getting the memory to each thread and we might get the same + // memory + control.Add(vChecks); + } + // control waits for completion by RAII, but + // it is done explicitly here for clarity + control.Wait(); + } + tg.interrupt_all(); + tg.join_all(); +} + +// This Benchmark tests the CheckQueue with a slightly realistic workload, +// where checks all contain a prevector that is indirect 50% of the time +// and there is a little bit of work done between calls to Add. +static void CCheckQueueSpeedPrevectorJob(benchmark::State& state) +{ + struct PrevectorJob { + prevector<PREVECTOR_SIZE, uint8_t> p; + PrevectorJob(){ + } + PrevectorJob(FastRandomContext& insecure_rand){ + p.resize(insecure_rand.rand32() % (PREVECTOR_SIZE*2)); + } + bool operator()() + { + return true; + } + void swap(PrevectorJob& x){p.swap(x.p);}; + }; + CCheckQueue<PrevectorJob> queue {QUEUE_BATCH_SIZE}; + boost::thread_group tg; + for (auto x = 0; x < std::max(MIN_CORES, GetNumCores()); ++x) { + tg.create_thread([&]{queue.Thread();}); + } + while (state.KeepRunning()) { + // Make insecure_rand here so that each iteration is identical. + FastRandomContext insecure_rand(true); + CCheckQueueControl<PrevectorJob> control(&queue); + std::vector<std::vector<PrevectorJob>> vBatches(BATCHES); + for (auto& vChecks : vBatches) { + vChecks.reserve(BATCH_SIZE); + for (size_t x = 0; x < BATCH_SIZE; ++x) + vChecks.emplace_back(insecure_rand); + control.Add(vChecks); + } + // control waits for completion by RAII, but + // it is done explicitly here for clarity + control.Wait(); + } + tg.interrupt_all(); + tg.join_all(); +} +BENCHMARK(CCheckQueueSpeed); +BENCHMARK(CCheckQueueSpeedPrevectorJob); diff --git a/src/bench/coin_selection.cpp b/src/bench/coin_selection.cpp index 29fbd34631..06882f1514 100644 --- a/src/bench/coin_selection.cpp +++ b/src/bench/coin_selection.cpp @@ -20,7 +20,7 @@ static void addCoin(const CAmount& nValue, const CWallet& wallet, std::vector<CO CWalletTx* wtx = new CWalletTx(&wallet, MakeTransactionRef(std::move(tx))); int nAge = 6 * 24; - COutput output(wtx, nInput, nAge, true, true); + COutput output(wtx, nInput, nAge, true /* spendable */, true /* solvable */, true /* safe */); vCoins.push_back(output); } diff --git a/src/bench/lockedpool.cpp b/src/bench/lockedpool.cpp index 5df5b1ac6e..43a1422795 100644 --- a/src/bench/lockedpool.cpp +++ b/src/bench/lockedpool.cpp @@ -13,7 +13,7 @@ #define BITER 5000 #define MSIZE 2048 -static void LockedPool(benchmark::State& state) +static void BenchLockedPool(benchmark::State& state) { void *synth_base = reinterpret_cast<void*>(0x08000000); const size_t synth_size = 1024*1024; @@ -43,5 +43,5 @@ static void LockedPool(benchmark::State& state) addr.clear(); } -BENCHMARK(LockedPool); +BENCHMARK(BenchLockedPool); diff --git a/src/bench/mempool_eviction.cpp b/src/bench/mempool_eviction.cpp index 5790d51a82..073bbde016 100644 --- a/src/bench/mempool_eviction.cpp +++ b/src/bench/mempool_eviction.cpp @@ -12,14 +12,13 @@ static void AddTx(const CTransaction& tx, const CAmount& nFee, CTxMemPool& pool) { int64_t nTime = 0; - double dPriority = 10.0; unsigned int nHeight = 1; bool spendsCoinbase = false; unsigned int sigOpCost = 4; LockPoints lp; pool.addUnchecked(tx.GetHash(), CTxMemPoolEntry( - MakeTransactionRef(tx), nFee, nTime, dPriority, nHeight, - tx.GetValueOut(), spendsCoinbase, sigOpCost, lp)); + MakeTransactionRef(tx), nFee, nTime, nHeight, + spendsCoinbase, sigOpCost, lp)); } // Right now this is only testing eviction performance in an extremely small @@ -97,7 +96,7 @@ static void MempoolEviction(benchmark::State& state) tx7.vout[1].scriptPubKey = CScript() << OP_7 << OP_EQUAL; tx7.vout[1].nValue = 10 * COIN; - CTxMemPool pool(CFeeRate(1000)); + CTxMemPool pool; while (state.KeepRunning()) { AddTx(tx1, 10000LL, pool); diff --git a/src/bench/perf.cpp b/src/bench/perf.cpp index 1f43e5d3ac..a549ec29ea 100644 --- a/src/bench/perf.cpp +++ b/src/bench/perf.cpp @@ -6,7 +6,7 @@ #if defined(__i386__) || defined(__x86_64__) -/* These architectures support quering the cycle counter +/* These architectures support querying the cycle counter * from user space, no need for any syscall overhead. */ void perf_init(void) { } diff --git a/src/bitcoin-cli.cpp b/src/bitcoin-cli.cpp index e9b530114c..ed8ca7e14c 100644 --- a/src/bitcoin-cli.cpp +++ b/src/bitcoin-cli.cpp @@ -25,6 +25,7 @@ static const char DEFAULT_RPCCONNECT[] = "127.0.0.1"; static const int DEFAULT_HTTP_CLIENT_TIMEOUT=900; +static const bool DEFAULT_NAMED=false; static const int CONTINUE_EXECUTION=-1; std::string HelpMessageCli() @@ -35,12 +36,13 @@ std::string HelpMessageCli() strUsage += HelpMessageOpt("-conf=<file>", strprintf(_("Specify configuration file (default: %s)"), BITCOIN_CONF_FILENAME)); strUsage += HelpMessageOpt("-datadir=<dir>", _("Specify data directory")); AppendParamsHelpMessages(strUsage); + strUsage += HelpMessageOpt("-named", strprintf(_("Pass named instead of positional arguments (default: %s)"), DEFAULT_NAMED)); strUsage += HelpMessageOpt("-rpcconnect=<ip>", strprintf(_("Send commands to node running on <ip> (default: %s)"), DEFAULT_RPCCONNECT)); strUsage += HelpMessageOpt("-rpcport=<port>", strprintf(_("Connect to JSON-RPC on <port> (default: %u or testnet: %u)"), BaseParams(CBaseChainParams::MAIN).RPCPort(), BaseParams(CBaseChainParams::TESTNET).RPCPort())); strUsage += HelpMessageOpt("-rpcwait", _("Wait for RPC server to start")); strUsage += HelpMessageOpt("-rpcuser=<user>", _("Username for JSON-RPC connections")); strUsage += HelpMessageOpt("-rpcpassword=<pw>", _("Password for JSON-RPC connections")); - strUsage += HelpMessageOpt("-rpcclienttimeout=<n>", strprintf(_("Timeout during HTTP requests (default: %d)"), DEFAULT_HTTP_CLIENT_TIMEOUT)); + strUsage += HelpMessageOpt("-rpcclienttimeout=<n>", strprintf(_("Timeout in seconds during HTTP requests, or 0 for no timeout. (default: %d)"), DEFAULT_HTTP_CLIENT_TIMEOUT)); strUsage += HelpMessageOpt("-stdin", _("Read extra arguments from standard input, one per line until EOF/Ctrl-D (recommended for sensitive information such as passphrases)")); return strUsage; @@ -80,6 +82,7 @@ static int AppInitRPC(int argc, char* argv[]) if (!IsArgSet("-version")) { strUsage += "\n" + _("Usage:") + "\n" + " bitcoin-cli [options] <command> [params] " + strprintf(_("Send command to %s"), _(PACKAGE_NAME)) + "\n" + + " bitcoin-cli [options] -named <command> [name=value] ... " + strprintf(_("Send command to %s (with named arguments)"), _(PACKAGE_NAME)) + "\n" + " bitcoin-cli [options] help " + _("List commands") + "\n" + " bitcoin-cli [options] help <command> " + _("Get help for a command") + "\n"; @@ -278,7 +281,14 @@ int CommandLineRPC(int argc, char *argv[]) if (args.size() < 1) throw std::runtime_error("too few parameters (need at least command)"); std::string strMethod = args[0]; - UniValue params = RPCConvertValues(strMethod, std::vector<std::string>(args.begin()+1, args.end())); + args.erase(args.begin()); // Remove trailing method name from arguments vector + + UniValue params; + if(GetBoolArg("-named", DEFAULT_NAMED)) { + params = RPCConvertNamedValues(strMethod, args); + } else { + params = RPCConvertValues(strMethod, args); + } // Execute and handle connection failures with -rpcwait const bool fWait = GetBoolArg("-rpcwait", false); diff --git a/src/bitcoin-tx.cpp b/src/bitcoin-tx.cpp index 24a53b65a0..3c3646523a 100644 --- a/src/bitcoin-tx.cpp +++ b/src/bitcoin-tx.cpp @@ -78,8 +78,16 @@ static int AppInitRawTx(int argc, char* argv[]) strUsage += HelpMessageOpt("locktime=N", _("Set TX lock time to N")); strUsage += HelpMessageOpt("nversion=N", _("Set TX version to N")); strUsage += HelpMessageOpt("outaddr=VALUE:ADDRESS", _("Add address-based output to TX")); + strUsage += HelpMessageOpt("outpubkey=VALUE:PUBKEY[:FLAGS]", _("Add pay-to-pubkey output to TX") + ". " + + _("Optionally add the \"W\" flag to produce a pay-to-witness-pubkey-hash output") + ". " + + _("Optionally add the \"S\" flag to wrap the output in a pay-to-script-hash.")); strUsage += HelpMessageOpt("outdata=[VALUE:]DATA", _("Add data-based output to TX")); - strUsage += HelpMessageOpt("outscript=VALUE:SCRIPT", _("Add raw script output to TX")); + strUsage += HelpMessageOpt("outscript=VALUE:SCRIPT[:FLAGS]", _("Add raw script output to TX") + ". " + + _("Optionally add the \"W\" flag to produce a pay-to-witness-script-hash output") + ". " + + _("Optionally add the \"S\" flag to wrap the output in a pay-to-script-hash.")); + strUsage += HelpMessageOpt("outmultisig=VALUE:REQUIRED:PUBKEYS:PUBKEY1:PUBKEY2:....[:FLAGS]", _("Add Pay To n-of-m Multi-sig output to TX. n = REQUIRED, m = PUBKEYS") + ". " + + _("Optionally add the \"W\" flag to produce a pay-to-witness-script-hash output") + ". " + + _("Optionally add the \"S\" flag to wrap the output in a pay-to-script-hash.")); strUsage += HelpMessageOpt("sign=SIGHASH-FLAGS", _("Add zero or more signatures to transaction") + ". " + _("This command requires JSON registers:") + _("prevtxs=JSON object") + ", " + @@ -168,6 +176,14 @@ static void RegisterLoad(const std::string& strInput) RegisterSetJson(key, valStr); } +static CAmount ExtractAndValidateValue(const std::string& strValue) +{ + CAmount value; + if (!ParseMoney(strValue, value)) + throw std::runtime_error("invalid TX output value"); + return value; +} + static void MutateTxVersion(CMutableTransaction& tx, const std::string& cmdVal) { int64_t newVersion = atoi64(cmdVal); @@ -222,25 +238,18 @@ static void MutateTxAddInput(CMutableTransaction& tx, const std::string& strInpu static void MutateTxAddOutAddr(CMutableTransaction& tx, const std::string& strInput) { - // separate VALUE:ADDRESS in string - size_t pos = strInput.find(':'); - if ((pos == std::string::npos) || - (pos == 0) || - (pos == (strInput.size() - 1))) - throw std::runtime_error("TX output missing separator"); + // Separate into VALUE:ADDRESS + std::vector<std::string> vStrInputParts; + boost::split(vStrInputParts, strInput, boost::is_any_of(":")); - // extract and validate VALUE - std::string strValue = strInput.substr(0, pos); - CAmount value; - if (!ParseMoney(strValue, value)) - throw std::runtime_error("invalid TX output value"); + // Extract and validate VALUE + CAmount value = ExtractAndValidateValue(vStrInputParts[0]); // extract and validate ADDRESS - std::string strAddr = strInput.substr(pos + 1, std::string::npos); + std::string strAddr = vStrInputParts[1]; CBitcoinAddress addr(strAddr); if (!addr.IsValid()) throw std::runtime_error("invalid TX output address"); - // build standard output script via GetScriptForDestination() CScript scriptPubKey = GetScriptForDestination(addr.Get()); @@ -249,6 +258,114 @@ static void MutateTxAddOutAddr(CMutableTransaction& tx, const std::string& strIn tx.vout.push_back(txout); } +static void MutateTxAddOutPubKey(CMutableTransaction& tx, const std::string& strInput) +{ + // Separate into VALUE:PUBKEY[:FLAGS] + std::vector<std::string> vStrInputParts; + boost::split(vStrInputParts, strInput, boost::is_any_of(":")); + + // Extract and validate VALUE + CAmount value = ExtractAndValidateValue(vStrInputParts[0]); + + // Extract and validate PUBKEY + CPubKey pubkey(ParseHex(vStrInputParts[1])); + if (!pubkey.IsFullyValid()) + throw std::runtime_error("invalid TX output pubkey"); + CScript scriptPubKey = GetScriptForRawPubKey(pubkey); + CBitcoinAddress addr(scriptPubKey); + + // Extract and validate FLAGS + bool bSegWit = false; + bool bScriptHash = false; + if (vStrInputParts.size() == 3) { + std::string flags = vStrInputParts[2]; + bSegWit = (flags.find("W") != std::string::npos); + bScriptHash = (flags.find("S") != std::string::npos); + } + + if (bSegWit) { + // Call GetScriptForWitness() to build a P2WSH scriptPubKey + scriptPubKey = GetScriptForWitness(scriptPubKey); + } + if (bScriptHash) { + // Get the address for the redeem script, then call + // GetScriptForDestination() to construct a P2SH scriptPubKey. + CBitcoinAddress redeemScriptAddr(scriptPubKey); + scriptPubKey = GetScriptForDestination(redeemScriptAddr.Get()); + } + + // construct TxOut, append to transaction output list + CTxOut txout(value, scriptPubKey); + tx.vout.push_back(txout); +} + +static void MutateTxAddOutMultiSig(CMutableTransaction& tx, const std::string& strInput) +{ + // Separate into VALUE:REQUIRED:NUMKEYS:PUBKEY1:PUBKEY2:....[:FLAGS] + std::vector<std::string> vStrInputParts; + boost::split(vStrInputParts, strInput, boost::is_any_of(":")); + + // Check that there are enough parameters + if (vStrInputParts.size()<3) + throw std::runtime_error("Not enough multisig parameters"); + + // Extract and validate VALUE + CAmount value = ExtractAndValidateValue(vStrInputParts[0]); + + // Extract REQUIRED + uint32_t required = stoul(vStrInputParts[1]); + + // Extract NUMKEYS + uint32_t numkeys = stoul(vStrInputParts[2]); + + // Validate there are the correct number of pubkeys + if (vStrInputParts.size() < numkeys + 3) + throw std::runtime_error("incorrect number of multisig pubkeys"); + + if (required < 1 || required > 20 || numkeys < 1 || numkeys > 20 || numkeys < required) + throw std::runtime_error("multisig parameter mismatch. Required " \ + + std::to_string(required) + " of " + std::to_string(numkeys) + "signatures."); + + // extract and validate PUBKEYs + std::vector<CPubKey> pubkeys; + for(int pos = 1; pos <= int(numkeys); pos++) { + CPubKey pubkey(ParseHex(vStrInputParts[pos + 2])); + if (!pubkey.IsFullyValid()) + throw std::runtime_error("invalid TX output pubkey"); + pubkeys.push_back(pubkey); + } + + // Extract FLAGS + bool bSegWit = false; + bool bScriptHash = false; + if (vStrInputParts.size() == numkeys + 4) { + std::string flags = vStrInputParts.back(); + bSegWit = (flags.find("W") != std::string::npos); + bScriptHash = (flags.find("S") != std::string::npos); + } + else if (vStrInputParts.size() > numkeys + 4) { + // Validate that there were no more parameters passed + throw std::runtime_error("Too many parameters"); + } + + CScript scriptPubKey = GetScriptForMultisig(required, pubkeys); + + if (bSegWit) { + // Call GetScriptForWitness() to build a P2WSH scriptPubKey + scriptPubKey = GetScriptForWitness(scriptPubKey); + } + if (bScriptHash) { + // Get the address for the redeem script, then call + // GetScriptForDestination() to construct a P2SH scriptPubKey. + CBitcoinAddress addr(scriptPubKey); + scriptPubKey = GetScriptForDestination(addr.Get()); + } + + // construct TxOut, append to transaction output list + CTxOut txout(value, scriptPubKey); + tx.vout.push_back(txout); +} + static void MutateTxAddOutData(CMutableTransaction& tx, const std::string& strInput) { CAmount value = 0; @@ -260,10 +377,8 @@ static void MutateTxAddOutData(CMutableTransaction& tx, const std::string& strIn throw std::runtime_error("TX output value not specified"); if (pos != std::string::npos) { - // extract and validate VALUE - std::string strValue = strInput.substr(0, pos); - if (!ParseMoney(strValue, value)) - throw std::runtime_error("invalid TX output value"); + // Extract and validate VALUE + value = ExtractAndValidateValue(strInput.substr(0, pos)); } // extract and validate DATA @@ -280,21 +395,35 @@ static void MutateTxAddOutData(CMutableTransaction& tx, const std::string& strIn static void MutateTxAddOutScript(CMutableTransaction& tx, const std::string& strInput) { - // separate VALUE:SCRIPT in string - size_t pos = strInput.find(':'); - if ((pos == std::string::npos) || - (pos == 0)) + // separate VALUE:SCRIPT[:FLAGS] + std::vector<std::string> vStrInputParts; + boost::split(vStrInputParts, strInput, boost::is_any_of(":")); + if (vStrInputParts.size() < 2) throw std::runtime_error("TX output missing separator"); - // extract and validate VALUE - std::string strValue = strInput.substr(0, pos); - CAmount value; - if (!ParseMoney(strValue, value)) - throw std::runtime_error("invalid TX output value"); + // Extract and validate VALUE + CAmount value = ExtractAndValidateValue(vStrInputParts[0]); // extract and validate script - std::string strScript = strInput.substr(pos + 1, std::string::npos); - CScript scriptPubKey = ParseScript(strScript); // throws on err + std::string strScript = vStrInputParts[1]; + CScript scriptPubKey = ParseScript(strScript); + + // Extract FLAGS + bool bSegWit = false; + bool bScriptHash = false; + if (vStrInputParts.size() == 3) { + std::string flags = vStrInputParts.back(); + bSegWit = (flags.find("W") != std::string::npos); + bScriptHash = (flags.find("S") != std::string::npos); + } + + if (bSegWit) { + scriptPubKey = GetScriptForWitness(scriptPubKey); + } + if (bScriptHash) { + CBitcoinAddress addr(scriptPubKey); + scriptPubKey = GetScriptForDestination(addr.Get()); + } // construct TxOut, append to transaction output list CTxOut txout(value, scriptPubKey); @@ -538,10 +667,14 @@ static void MutateTx(CMutableTransaction& tx, const std::string& command, MutateTxDelOutput(tx, commandVal); else if (command == "outaddr") MutateTxAddOutAddr(tx, commandVal); - else if (command == "outdata") - MutateTxAddOutData(tx, commandVal); + else if (command == "outpubkey") + MutateTxAddOutPubKey(tx, commandVal); + else if (command == "outmultisig") + MutateTxAddOutMultiSig(tx, commandVal); else if (command == "outscript") MutateTxAddOutScript(tx, commandVal); + else if (command == "outdata") + MutateTxAddOutData(tx, commandVal); else if (command == "sign") { if (!ecc) { ecc.reset(new Secp256k1Init()); } diff --git a/src/bitcoind.cpp b/src/bitcoind.cpp index 9bab3a2026..a3d02afcdb 100644 --- a/src/bitcoind.cpp +++ b/src/bitcoind.cpp @@ -136,17 +136,17 @@ bool AppInit(int argc, char* argv[]) if (!AppInitBasicSetup()) { // InitError will have been called with detailed error, which ends up on console - exit(1); + exit(EXIT_FAILURE); } if (!AppInitParameterInteraction()) { // InitError will have been called with detailed error, which ends up on console - exit(1); + exit(EXIT_FAILURE); } if (!AppInitSanityChecks()) { // InitError will have been called with detailed error, which ends up on console - exit(1); + exit(EXIT_FAILURE); } if (GetBoolArg("-daemon", false)) { diff --git a/src/blockencodings.cpp b/src/blockencodings.cpp index 72fe17bdc7..4a311cbba2 100644 --- a/src/blockencodings.cpp +++ b/src/blockencodings.cpp @@ -47,7 +47,7 @@ uint64_t CBlockHeaderAndShortTxIDs::GetShortID(const uint256& txhash) const { -ReadStatus PartiallyDownloadedBlock::InitData(const CBlockHeaderAndShortTxIDs& cmpctblock) { +ReadStatus PartiallyDownloadedBlock::InitData(const CBlockHeaderAndShortTxIDs& cmpctblock, const std::vector<std::pair<uint256, CTransactionRef>>& extra_txn) { if (cmpctblock.header.IsNull() || (cmpctblock.shorttxids.empty() && cmpctblock.prefilledtxn.empty())) return READ_STATUS_INVALID; if (cmpctblock.shorttxids.size() + cmpctblock.prefilledtxn.size() > MAX_BLOCK_BASE_SIZE / MIN_TRANSACTION_BASE_SIZE) @@ -104,6 +104,7 @@ ReadStatus PartiallyDownloadedBlock::InitData(const CBlockHeaderAndShortTxIDs& c return READ_STATUS_FAILED; // Short ID collision std::vector<bool> have_txn(txn_available.size()); + { LOCK(pool->cs); const std::vector<std::pair<uint256, CTxMemPool::txiter> >& vTxHashes = pool->vTxHashes; for (size_t i = 0; i < vTxHashes.size(); i++) { @@ -130,6 +131,38 @@ ReadStatus PartiallyDownloadedBlock::InitData(const CBlockHeaderAndShortTxIDs& c if (mempool_count == shorttxids.size()) break; } + } + + for (size_t i = 0; i < extra_txn.size(); i++) { + uint64_t shortid = cmpctblock.GetShortID(extra_txn[i].first); + std::unordered_map<uint64_t, uint16_t>::iterator idit = shorttxids.find(shortid); + if (idit != shorttxids.end()) { + if (!have_txn[idit->second]) { + txn_available[idit->second] = extra_txn[i].second; + have_txn[idit->second] = true; + mempool_count++; + extra_count++; + } else { + // If we find two mempool/extra txn that match the short id, just + // request it. + // This should be rare enough that the extra bandwidth doesn't matter, + // but eating a round-trip due to FillBlock failure would be annoying + // Note that we dont want duplication between extra_txn and mempool to + // trigger this case, so we compare witness hashes first + if (txn_available[idit->second] && + txn_available[idit->second]->GetWitnessHash() != extra_txn[i].second->GetWitnessHash()) { + txn_available[idit->second].reset(); + mempool_count--; + extra_count--; + } + } + } + // Though ideally we'd continue scanning for the two-txn-match-shortid case, + // the performance win of an early exit here is too good to pass up and worth + // the extra risk. + if (mempool_count == shorttxids.size()) + break; + } LogPrint("cmpctblock", "Initialized PartiallyDownloadedBlock for block %s using a cmpctblock of size %lu\n", cmpctblock.header.GetHash().ToString(), GetSerializeSize(cmpctblock, SER_NETWORK, PROTOCOL_VERSION)); @@ -176,7 +209,7 @@ ReadStatus PartiallyDownloadedBlock::FillBlock(CBlock& block, const std::vector< return READ_STATUS_CHECKBLOCK_FAILED; } - LogPrint("cmpctblock", "Successfully reconstructed block %s with %lu txn prefilled, %lu txn from mempool and %lu txn requested\n", hash.ToString(), prefilled_count, mempool_count, vtx_missing.size()); + LogPrint("cmpctblock", "Successfully reconstructed block %s with %lu txn prefilled, %lu txn from mempool (incl at least %lu from extra pool) and %lu txn requested\n", hash.ToString(), prefilled_count, mempool_count, extra_count, vtx_missing.size()); if (vtx_missing.size() < 5) { for (const auto& tx : vtx_missing) LogPrint("cmpctblock", "Reconstructed block %s required tx %s\n", hash.ToString(), tx->GetHash().ToString()); diff --git a/src/blockencodings.h b/src/blockencodings.h index 809ccbf936..5a1d80d421 100644 --- a/src/blockencodings.h +++ b/src/blockencodings.h @@ -99,7 +99,7 @@ public: } }; -// Dumb serialization/storage-helper for CBlockHeaderAndShortTxIDs and PartiallyDownlaodedBlock +// Dumb serialization/storage-helper for CBlockHeaderAndShortTxIDs and PartiallyDownloadedBlock struct PrefilledTransaction { // Used as an offset since last prefilled tx in CBlockHeaderAndShortTxIDs, // as a proper transaction-in-block-index in PartiallyDownloadedBlock @@ -194,13 +194,14 @@ public: class PartiallyDownloadedBlock { protected: std::vector<CTransactionRef> txn_available; - size_t prefilled_count = 0, mempool_count = 0; + size_t prefilled_count = 0, mempool_count = 0, extra_count = 0; CTxMemPool* pool; public: CBlockHeader header; PartiallyDownloadedBlock(CTxMemPool* poolIn) : pool(poolIn) {} - ReadStatus InitData(const CBlockHeaderAndShortTxIDs& cmpctblock); + // extra_txn is a list of extra transactions to look at, in <witness hash, reference> form + ReadStatus InitData(const CBlockHeaderAndShortTxIDs& cmpctblock, const std::vector<std::pair<uint256, CTransactionRef>>& extra_txn); bool IsTxAvailable(size_t index) const; ReadStatus FillBlock(CBlock& block, const std::vector<CTransactionRef>& vtx_missing); }; diff --git a/src/bloom.cpp b/src/bloom.cpp index 520e10cdc8..ac3e565721 100644 --- a/src/bloom.cpp +++ b/src/bloom.cpp @@ -19,15 +19,13 @@ #define LN2SQUARED 0.4804530139182014246671025263266649717305529515945455 #define LN2 0.6931471805599453094172321214581765680755001343602552 -using namespace std; - CBloomFilter::CBloomFilter(unsigned int nElements, double nFPRate, unsigned int nTweakIn, unsigned char nFlagsIn) : /** * The ideal size for a bloom filter with a given number of elements and false positive rate is: * - nElements * log(fp rate) / ln(2)^2 * We ignore filter parameters which will create a bloom filter larger than the protocol limits */ - vData(min((unsigned int)(-1 / LN2SQUARED * nElements * log(nFPRate)), MAX_BLOOM_FILTER_SIZE * 8) / 8), + vData(std::min((unsigned int)(-1 / LN2SQUARED * nElements * log(nFPRate)), MAX_BLOOM_FILTER_SIZE * 8) / 8), /** * The ideal number of hash functions is filter size * ln(2) / number of elements * Again, we ignore filter parameters which will create a bloom filter with more hash functions than the protocol limits @@ -35,7 +33,7 @@ CBloomFilter::CBloomFilter(unsigned int nElements, double nFPRate, unsigned int */ isFull(false), isEmpty(true), - nHashFuncs(min((unsigned int)(vData.size() * 8 / nElements * LN2), MAX_HASH_FUNCS)), + nHashFuncs(std::min((unsigned int)(vData.size() * 8 / nElements * LN2), MAX_HASH_FUNCS)), nTweak(nTweakIn), nFlags(nFlagsIn) { @@ -58,7 +56,7 @@ inline unsigned int CBloomFilter::Hash(unsigned int nHashNum, const std::vector< return MurmurHash3(nHashNum * 0xFBA4C795 + nTweak, vDataToHash) % (vData.size() * 8); } -void CBloomFilter::insert(const vector<unsigned char>& vKey) +void CBloomFilter::insert(const std::vector<unsigned char>& vKey) { if (isFull) return; @@ -75,17 +73,17 @@ void CBloomFilter::insert(const COutPoint& outpoint) { CDataStream stream(SER_NETWORK, PROTOCOL_VERSION); stream << outpoint; - vector<unsigned char> data(stream.begin(), stream.end()); + std::vector<unsigned char> data(stream.begin(), stream.end()); insert(data); } void CBloomFilter::insert(const uint256& hash) { - vector<unsigned char> data(hash.begin(), hash.end()); + std::vector<unsigned char> data(hash.begin(), hash.end()); insert(data); } -bool CBloomFilter::contains(const vector<unsigned char>& vKey) const +bool CBloomFilter::contains(const std::vector<unsigned char>& vKey) const { if (isFull) return true; @@ -105,13 +103,13 @@ bool CBloomFilter::contains(const COutPoint& outpoint) const { CDataStream stream(SER_NETWORK, PROTOCOL_VERSION); stream << outpoint; - vector<unsigned char> data(stream.begin(), stream.end()); + std::vector<unsigned char> data(stream.begin(), stream.end()); return contains(data); } bool CBloomFilter::contains(const uint256& hash) const { - vector<unsigned char> data(hash.begin(), hash.end()); + std::vector<unsigned char> data(hash.begin(), hash.end()); return contains(data); } @@ -154,7 +152,7 @@ bool CBloomFilter::IsRelevantAndUpdate(const CTransaction& tx) // This means clients don't have to update the filter themselves when a new relevant tx // is discovered in order to find spending transactions, which avoids round-tripping and race conditions. CScript::const_iterator pc = txout.scriptPubKey.begin(); - vector<unsigned char> data; + std::vector<unsigned char> data; while (pc < txout.scriptPubKey.end()) { opcodetype opcode; @@ -168,7 +166,7 @@ bool CBloomFilter::IsRelevantAndUpdate(const CTransaction& tx) else if ((nFlags & BLOOM_UPDATE_MASK) == BLOOM_UPDATE_P2PUBKEY_ONLY) { txnouttype type; - vector<vector<unsigned char> > vSolutions; + std::vector<std::vector<unsigned char> > vSolutions; if (Solver(txout.scriptPubKey, type, vSolutions) && (type == TX_PUBKEY || type == TX_MULTISIG)) insert(COutPoint(hash, i)); @@ -189,7 +187,7 @@ bool CBloomFilter::IsRelevantAndUpdate(const CTransaction& tx) // Match if the filter contains any arbitrary script data element in any scriptSig in tx CScript::const_iterator pc = txin.scriptSig.begin(); - vector<unsigned char> data; + std::vector<unsigned char> data; while (pc < txin.scriptSig.end()) { opcodetype opcode; @@ -256,8 +254,8 @@ void CRollingBloomFilter::insert(const std::vector<unsigned char>& vKey) if (nGeneration == 4) { nGeneration = 1; } - uint64_t nGenerationMask1 = -(uint64_t)(nGeneration & 1); - uint64_t nGenerationMask2 = -(uint64_t)(nGeneration >> 1); + uint64_t nGenerationMask1 = 0 - (uint64_t)(nGeneration & 1); + uint64_t nGenerationMask2 = 0 - (uint64_t)(nGeneration >> 1); /* Wipe old entries that used this generation number. */ for (uint32_t p = 0; p < data.size(); p += 2) { uint64_t p1 = data[p], p2 = data[p + 1]; @@ -280,7 +278,7 @@ void CRollingBloomFilter::insert(const std::vector<unsigned char>& vKey) void CRollingBloomFilter::insert(const uint256& hash) { - vector<unsigned char> vData(hash.begin(), hash.end()); + std::vector<unsigned char> vData(hash.begin(), hash.end()); insert(vData); } @@ -300,7 +298,7 @@ bool CRollingBloomFilter::contains(const std::vector<unsigned char>& vKey) const bool CRollingBloomFilter::contains(const uint256& hash) const { - vector<unsigned char> vData(hash.begin(), hash.end()); + std::vector<unsigned char> vData(hash.begin(), hash.end()); return contains(vData); } diff --git a/src/chain.cpp b/src/chain.cpp index 3cd7b33920..a5b369c4fc 100644 --- a/src/chain.cpp +++ b/src/chain.cpp @@ -5,8 +5,6 @@ #include "chain.h" -using namespace std; - /** * CChain implementation */ @@ -61,10 +59,10 @@ const CBlockIndex *CChain::FindFork(const CBlockIndex *pindex) const { return pindex; } -CBlockIndex* CChain::FindLatestBefore(int64_t nTime) const +CBlockIndex* CChain::FindEarliestAtLeast(int64_t nTime) const { std::vector<CBlockIndex*>::const_iterator lower = std::lower_bound(vChain.begin(), vChain.end(), nTime, - [](CBlockIndex* pBlock, const int64_t& time) -> bool { return pBlock->GetBlockTime() < time; }); + [](CBlockIndex* pBlock, const int64_t& time) -> bool { return pBlock->GetBlockTimeMax() < time; }); return (lower == vChain.end() ? NULL : *lower); } diff --git a/src/chain.h b/src/chain.h index 989a71958c..de120d2d75 100644 --- a/src/chain.h +++ b/src/chain.h @@ -14,6 +14,20 @@ #include <vector> +/** + * Maximum amount of time that a block timestamp is allowed to exceed the + * current network-adjusted time before the block will be accepted. + */ +static const int64_t MAX_FUTURE_BLOCK_TIME = 2 * 60 * 60; + +/** + * Timestamp window used as a grace period by code that compares external + * timestamps (such as timestamps passed to RPCs, or wallet key creation times) + * to block timestamps. This should be set at least as high as + * MAX_FUTURE_BLOCK_TIME. + */ +static const int64_t TIMESTAMP_WINDOW = MAX_FUTURE_BLOCK_TIME; + class CBlockFileInfo { public: @@ -202,6 +216,9 @@ public: //! (memory only) Sequential id assigned to distinguish order in which blocks are received. int32_t nSequenceId; + //! (memory only) Maximum nTime in the chain upto and including this block. + unsigned int nTimeMax; + void SetNull() { phashBlock = NULL; @@ -216,6 +233,7 @@ public: nChainTx = 0; nStatus = 0; nSequenceId = 0; + nTimeMax = 0; nVersion = 0; hashMerkleRoot = uint256(); @@ -281,6 +299,11 @@ public: return (int64_t)nTime; } + int64_t GetBlockTimeMax() const + { + return (int64_t)nTimeMax; + } + enum { nMedianTimeSpan=11 }; int64_t GetMedianTimePast() const @@ -358,9 +381,9 @@ public: template <typename Stream, typename Operation> inline void SerializationOp(Stream& s, Operation ser_action) { - int nVersion = s.GetVersion(); + int _nVersion = s.GetVersion(); if (!(s.GetType() & SER_GETHASH)) - READWRITE(VARINT(nVersion)); + READWRITE(VARINT(_nVersion)); READWRITE(VARINT(nHeight)); READWRITE(VARINT(nStatus)); @@ -461,8 +484,8 @@ public: /** Find the last common block between this chain and a block index entry. */ const CBlockIndex *FindFork(const CBlockIndex *pindex) const; - /** Find the most recent block with timestamp lower than the given. */ - CBlockIndex* FindLatestBefore(int64_t nTime) const; + /** Find the earliest block with timestamp equal or greater than the given. */ + CBlockIndex* FindEarliestAtLeast(int64_t nTime) const; }; #endif // BITCOIN_CHAIN_H diff --git a/src/chainparams.cpp b/src/chainparams.cpp index 1e294da9f4..8c38558829 100644 --- a/src/chainparams.cpp +++ b/src/chainparams.cpp @@ -97,7 +97,10 @@ public: consensus.vDeployments[Consensus::DEPLOYMENT_SEGWIT].nTimeout = 1510704000; // November 15th, 2017. // The best chain should have at least this much work. - consensus.nMinimumChainWork = uint256S("0x0000000000000000000000000000000000000000002cb971dd56d1c583c20f90"); + consensus.nMinimumChainWork = uint256S("0x0000000000000000000000000000000000000000003f94d1ad391682fe038bf5"); + + // By default assume that the signatures in ancestors of this block are valid. + consensus.defaultAssumeValid = uint256S("0x00000000000000000013176bf8d7dfeab4e1db31dc93bc311b436e82ab226b90"); //453354 /** * The message start string is designed to be unlikely to occur in normal data. @@ -121,8 +124,8 @@ public: vSeeds.push_back(CDNSSeedData("bluematt.me", "dnsseed.bluematt.me", true)); // Matt Corallo, only supports x9 vSeeds.push_back(CDNSSeedData("dashjr.org", "dnsseed.bitcoin.dashjr.org")); // Luke Dashjr vSeeds.push_back(CDNSSeedData("bitcoinstats.com", "seed.bitcoinstats.com", true)); // Christian Decker, supports x1 - xf - vSeeds.push_back(CDNSSeedData("xf2.org", "bitseed.xf2.org")); // Jeff Garzik vSeeds.push_back(CDNSSeedData("bitcoin.jonasschnelli.ch", "seed.bitcoin.jonasschnelli.ch", true)); // Jonas Schnelli, only supports x1, x5, x9, and xd + vSeeds.push_back(CDNSSeedData("petertodd.org", "seed.btc.petertodd.org", true)); // Peter Todd, only supports x1, x5, x9, and xd base58Prefixes[PUBKEY_ADDRESS] = std::vector<unsigned char>(1,0); base58Prefixes[SCRIPT_ADDRESS] = std::vector<unsigned char>(1,5); @@ -151,11 +154,15 @@ public: (225430, uint256S("0x00000000000001c108384350f74090433e7fcf79a606b8e797f065b130575932")) (250000, uint256S("0x000000000000003887df1f29024b06fc2200b55f8af8f35453d7be294df2d214")) (279000, uint256S("0x0000000000000001ae8c72a0b0c301f67e3afca10e819efa9041e458e9bd7e40")) - (295000, uint256S("0x00000000000000004d9b4ef50f0f9d686fd69db2e03af35a100370c64632a983")), - 1397080064, // * UNIX timestamp of last checkpoint block - 36544669, // * total number of transactions between genesis and last checkpoint + (295000, uint256S("0x00000000000000004d9b4ef50f0f9d686fd69db2e03af35a100370c64632a983")) + }; + + chainTxData = ChainTxData{ + // Data as of block 00000000000000000166d612d5595e2b1cd88d71d695fc580af64d8da8658c23 (height 446482). + 1483472411, // * UNIX timestamp of last known number of transactions + 184495391, // * total number of transactions between genesis and that timestamp // (the tx=... number in the SetBestChain debug.log lines) - 60000.0 // * estimated number of transactions per day after checkpoint + 3.2 // * estimated number of transactions per second after that timestamp }; } }; @@ -195,7 +202,10 @@ public: consensus.vDeployments[Consensus::DEPLOYMENT_SEGWIT].nTimeout = 1493596800; // May 1st 2017 // The best chain should have at least this much work. - consensus.nMinimumChainWork = uint256S("0x0000000000000000000000000000000000000000000000198b4def2baa9338d6"); + consensus.nMinimumChainWork = uint256S("0x00000000000000000000000000000000000000000000001f057509eba81aed91"); + + // By default assume that the signatures in ancestors of this block are valid. + consensus.defaultAssumeValid = uint256S("0x00000000000128796ee387cf110ccb9d2f36cffaf7f73079c995377c65ac0dcc"); //1079274 pchMessageStart[0] = 0x0b; pchMessageStart[1] = 0x11; @@ -234,9 +244,13 @@ public: checkpointData = (CCheckpointData) { boost::assign::map_list_of ( 546, uint256S("000000002a936ca763904c3c35fce2f3556c559c0214345d31b1bcebf76acb70")), - 1337966069, - 1488, - 300 + }; + + chainTxData = ChainTxData{ + // Data as of block 00000000c2872f8f8a8935c8e3c5862be9038c97d4de2cf37ed496991166928a (height 1063660) + 1483546230, + 12834668, + 0.15 }; } @@ -275,6 +289,9 @@ public: // The best chain should have at least this much work. consensus.nMinimumChainWork = uint256S("0x00"); + // By default assume that the signatures in ancestors of this block are valid. + consensus.defaultAssumeValid = uint256S("0x00"); + pchMessageStart[0] = 0xfa; pchMessageStart[1] = 0xbf; pchMessageStart[2] = 0xb5; @@ -297,11 +314,15 @@ public: checkpointData = (CCheckpointData){ boost::assign::map_list_of - ( 0, uint256S("0f9188f13cb7b2c71f2a335e3a4fc328bf5beb436012afca590b1a11466e2206")), + ( 0, uint256S("0f9188f13cb7b2c71f2a335e3a4fc328bf5beb436012afca590b1a11466e2206")) + }; + + chainTxData = ChainTxData{ 0, 0, 0 }; + base58Prefixes[PUBKEY_ADDRESS] = std::vector<unsigned char>(1,111); base58Prefixes[SCRIPT_ADDRESS] = std::vector<unsigned char>(1,196); base58Prefixes[SECRET_KEY] = std::vector<unsigned char>(1,239); diff --git a/src/chainparams.h b/src/chainparams.h index 381bac12f9..db524e8f8e 100644 --- a/src/chainparams.h +++ b/src/chainparams.h @@ -28,9 +28,12 @@ typedef std::map<int, uint256> MapCheckpoints; struct CCheckpointData { MapCheckpoints mapCheckpoints; - int64_t nTimeLastCheckpoint; - int64_t nTransactionsLastCheckpoint; - double fTransactionsPerDay; +}; + +struct ChainTxData { + int64_t nTime; + int64_t nTxCount; + double dTxRate; }; /** @@ -73,6 +76,7 @@ public: const std::vector<unsigned char>& Base58Prefix(Base58Type type) const { return base58Prefixes[type]; } const std::vector<SeedSpec6>& FixedSeeds() const { return vFixedSeeds; } const CCheckpointData& Checkpoints() const { return checkpointData; } + const ChainTxData& TxData() const { return chainTxData; } protected: CChainParams() {} @@ -90,6 +94,7 @@ protected: bool fRequireStandard; bool fMineBlocksOnDemand; CCheckpointData checkpointData; + ChainTxData chainTxData; }; /** diff --git a/src/chainparamsseeds.h b/src/chainparamsseeds.h index 1406e86805..396a411689 100644 --- a/src/chainparamsseeds.h +++ b/src/chainparamsseeds.h @@ -8,943 +8,1174 @@ * IPv4 as well as onion addresses are wrapped inside a IPv6 address accordingly. */ static SeedSpec6 pnSeed6_main[] = { - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x05,0x02,0x91,0xc9}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x05,0x16,0x8e,0xd6}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x05,0x35,0xac,0xc5}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x05,0xbd,0xa1,0xa4}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x05,0xe6,0x8c,0xa6}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x05,0xe7,0x03,0x82}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x05,0xff,0x50,0x67}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x0e,0xca,0xe6,0x31}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x12,0x55,0x0b,0x82}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x17,0x5b,0x61,0x19}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x17,0x5e,0x64,0x7a}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x17,0x5f,0x63,0x84}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x18,0x73,0x08,0xce}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x18,0x7f,0x80,0xbf}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x18,0x9a,0xb2,0x19}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x18,0xcf,0x67,0x2b}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x18,0xcf,0x68,0x69}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x18,0xd2,0xe6,0x96}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x18,0xe0,0x12,0x54}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x18,0xf6,0xa8,0x6a}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x1b,0xfe,0x40,0x2f}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x1f,0x06,0x47,0x7b}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x1f,0x06,0x47,0x7c}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x1f,0x0e,0x86,0x0d}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x1f,0x1e,0x24,0xdc}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x1f,0xa4,0x06,0x68}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x02,0x07,0x08,0x0c}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x02,0xe4,0x46,0xc6}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x05,0x27,0x40,0x07}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x05,0x2d,0x50,0x22}, 38333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x05,0x33,0xa0,0x26}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x05,0x3d,0x21,0x21}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x05,0x3d,0x25,0x0c}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x05,0x5f,0x50,0x2f}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x05,0x66,0xa4,0xad}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x05,0xaf,0x47,0x82}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x05,0xbd,0xa5,0x16}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x05,0xc7,0x82,0xe4}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x05,0xe4,0x64,0xde}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x05,0xff,0x40,0xe7}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x0d,0x5d,0x06,0x85}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x12,0x55,0x22,0x0a}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x12,0xf1,0x00,0x3f}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x17,0x1c,0x80,0x41}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x17,0xf8,0x71,0x34}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x17,0xfd,0x97,0x49}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x18,0x04,0x60,0x79}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x18,0x45,0x41,0xbf}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x18,0x57,0x08,0x2b}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x18,0x96,0xe0,0x6e}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x18,0xe3,0x45,0x92}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x1b,0x00,0xeb,0x21}, 8333}, {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x1f,0xaa,0x6a,0xcb}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x1f,0xb9,0x86,0xc9}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x1f,0xcc,0x80,0x63}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x1f,0xcc,0x80,0xdb}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x25,0x01,0xdb,0x58}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x25,0x61,0x84,0x6d}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x25,0x78,0xa0,0x37}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x1f,0xb8,0xc5,0x60}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x1f,0xd6,0xf0,0x38}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x25,0x01,0xca,0x86}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x25,0x12,0x4a,0xe8}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x25,0x22,0x30,0x11}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x25,0x30,0x40,0x8c}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x25,0x61,0x8d,0x74}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x25,0x78,0xa4,0x10}, 8333}, {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x25,0x78,0xa9,0x7b}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x25,0x8b,0x20,0x2e}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x25,0xdd,0xa3,0xda}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x26,0x82,0xc0,0x48}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x29,0x4b,0x60,0x50}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2d,0x03,0x00,0x31}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2d,0x21,0x48,0xb9}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2d,0x21,0x60,0x81}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2d,0x38,0x04,0x3f}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2d,0x4f,0x00,0x7f}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2d,0x4f,0x50,0x66}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2d,0x4f,0x61,0x1e}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2d,0x4f,0x84,0xdb}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2e,0x15,0x61,0x87}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2e,0x1c,0xcd,0x43}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2e,0x1c,0xce,0xbc}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2e,0x1d,0x14,0xd1}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2e,0x32,0xea,0xb3}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2e,0x65,0xa0,0xa8}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2e,0xa6,0xa1,0x23}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2e,0xa6,0xa1,0x67}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2e,0xb6,0x84,0x64}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2e,0xda,0xe3,0x5c}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2e,0xe2,0x6d,0x14}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2e,0xe3,0x42,0x84}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2e,0xe3,0x42,0x8a}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2e,0xe5,0xa5,0x9a}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2e,0xe5,0xa5,0x9b}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x25,0x8f,0x09,0x80}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x25,0x99,0xac,0xe3}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x25,0xc1,0xe3,0x10}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x25,0xcd,0x08,0x4e}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x25,0xdc,0x00,0x72}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x25,0xe8,0xda,0xc7}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x26,0x8c,0xa1,0x35}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x28,0x57,0x46,0x78}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x29,0xa2,0xa3,0x5d}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2a,0x02,0xc6,0x30}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2d,0x14,0x43,0x01}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2d,0x37,0xc5,0x4d}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2d,0x38,0x61,0x3f}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2d,0x3a,0x26,0xa2}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2d,0x3f,0x01,0x21}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2d,0x4f,0x02,0x46}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2e,0x10,0xf0,0x62}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2e,0x13,0x89,0x4a}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2e,0x1c,0xce,0x92}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2e,0x20,0xfc,0xc5}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2e,0x3b,0x0d,0x3b}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2e,0x3b,0x27,0xc3}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2e,0x94,0x10,0xd2}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2e,0xa0,0xc3,0x79}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2e,0xa6,0x8e,0x15}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2e,0xa6,0xa0,0x1d}, 8330}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2e,0xbc,0x2c,0x14}, 8333}, {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2e,0xe5,0xee,0xbb}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2e,0xea,0x68,0x30}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2e,0xef,0x6b,0x4a}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2e,0xf4,0x00,0x8a}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2e,0xfe,0x48,0xc3}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x32,0x05,0x0d,0x2c}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x32,0x07,0x25,0x72}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x32,0x1e,0x25,0x67}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x32,0x27,0x69,0x3c}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x32,0x6a,0x28,0xe7}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x34,0x1d,0x00,0x25}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x34,0x4c,0xc0,0xf6}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x36,0x98,0xc0,0xb3}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x36,0xa9,0x40,0xae}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x36,0xaf,0xa0,0x16}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x36,0xc7,0x80,0x00}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x3a,0x60,0xab,0x81}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x3a,0xa1,0xee,0x39}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x3c,0xfb,0xc3,0xdd}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x3d,0x23,0xe1,0x13}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2e,0xe7,0x10,0x95}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2f,0x58,0x64,0x82}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2f,0x59,0xc0,0x86}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2f,0xb9,0xc2,0xa0}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2f,0xbd,0x81,0xda}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x31,0x41,0x02,0x8c}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x32,0x03,0x48,0x81}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x32,0x1f,0x63,0xe1}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x33,0xaf,0x21,0x5f}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x34,0x01,0xa5,0xdb}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x34,0x0a,0xaa,0xba}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x34,0x33,0x80,0xd8}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x36,0xc5,0x82,0xf4}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x3a,0x3b,0x02,0x16}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x3a,0x54,0x06,0x51}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x3b,0x7d,0x08,0x8f}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x3b,0xa7,0x82,0x8b}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x3d,0x2f,0x02,0x14}, 8333}, {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x3e,0x2b,0x82,0xb2}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x3e,0x41,0x27,0x0c}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x3e,0x4c,0x60,0x06}, 8333}, {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x3e,0x6b,0xc8,0x1e}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x3e,0x85,0x0f,0x3a}, 8333}, {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x3e,0x85,0xc2,0x02}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x3e,0xb5,0xee,0xba}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x3e,0xb7,0x16,0x32}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x3e,0xd2,0x55,0x78}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x3e,0xd2,0xa2,0x59}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x3e,0x85,0xc2,0x9c}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x3e,0x8a,0x01,0x5f}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x3e,0xd8,0xee,0x03}, 8333}, {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x3e,0xee,0x22,0x7d}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x40,0x19,0xab,0x49}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x40,0x1b,0xa6,0x1e}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x40,0x35,0x89,0x65}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x40,0x47,0x48,0x2c}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x3f,0x89,0x28,0xcf}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x3f,0xe7,0x60,0x6d}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x40,0x4e,0xf0,0x96}, 8333}, {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x40,0x53,0xe1,0x92}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x40,0x79,0x03,0xa3}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x40,0xcb,0x66,0x56}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x41,0x5e,0x83,0x3b}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x41,0xbc,0x88,0xe9}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x42,0x0b,0xa2,0xda}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x42,0x17,0xe4,0x85}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x42,0x5a,0x89,0x59}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x42,0x72,0x21,0x31}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x42,0x96,0x69,0x4d}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x40,0x89,0xec,0x44}, 8833}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x40,0x9c,0xc1,0x78}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x42,0x4f,0xa0,0x52}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x42,0x5b,0xe6,0xe7}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x42,0x87,0x80,0x79}, 8333}, {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x42,0xac,0x0a,0x04}, 8333}, {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x42,0xc2,0x26,0xfa}, 8333}, {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x42,0xc2,0x26,0xfd}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x42,0xc2,0x26,0xfe}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x42,0xe7,0x61,0xac}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x42,0xd7,0x22,0x1a}, 8333}, {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x42,0xf0,0xed,0x9b}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x43,0x9f,0x0d,0x22}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x43,0xcd,0x4a,0xce}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x43,0xcd,0x60,0x6c}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x43,0xcd,0x80,0x05}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x43,0xdb,0xe9,0x8c}, 8333}, {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x43,0xdd,0xc1,0x37}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x43,0xe3,0x48,0x11}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x44,0x41,0x78,0x35}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x44,0x41,0xcd,0xe2}, 9000}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x44,0x90,0x04,0x22}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x45,0x27,0x31,0xc7}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x44,0x64,0xc4,0x76}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x44,0x84,0xc1,0xde}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x44,0xa8,0x76,0xea}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x45,0x0b,0x61,0x2b}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x45,0x1e,0xe5,0x0a}, 8333}, {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x45,0x32,0xab,0xcd}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x45,0x41,0x29,0x15}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x45,0x71,0x62,0x3d}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x45,0x77,0x61,0x27}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x45,0x92,0x46,0x7c}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x45,0xc1,0x47,0x02}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x46,0x2e,0x0a,0xed}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x46,0x50,0xc8,0xbb}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x46,0xb9,0x61,0x75}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x47,0xfe,0xa0,0x19}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x48,0x1c,0xcb,0x05}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x48,0x34,0x82,0x6e}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x48,0x53,0xc2,0x7a}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x48,0x80,0x20,0xa7}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x48,0xb3,0x88,0x50}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x48,0xeb,0x26,0x46}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x4a,0x32,0x2c,0xc1}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x4a,0x48,0x3c,0x53}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x4a,0x50,0xea,0x74}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x4a,0xcf,0xe9,0xc1}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x4b,0x70,0xe9,0x80}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x4b,0x76,0xa6,0xc5}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x4b,0x8c,0x00,0xf1}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x4b,0x9f,0xf0,0x42}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x4b,0xae,0x05,0x1a}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x4c,0x48,0xa0,0xfc}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x4c,0x48,0xa0,0xfe}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x4c,0x4a,0xaa,0x70}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x4c,0x4f,0xc9,0x36}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x4c,0xaf,0xa6,0xa4}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x4c,0xb3,0x69,0x1b}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x4d,0x44,0x25,0xc8}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x4d,0xea,0x31,0xc4}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x4d,0xf7,0xe5,0x5d}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x4e,0x18,0x48,0x4e}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x4e,0x2f,0x20,0x93}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x4e,0x54,0x64,0x5f}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x4e,0x79,0x45,0x17}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x4e,0x81,0xa7,0x05}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x4e,0xc1,0x60,0x9b}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x4f,0x13,0x25,0xb3}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x45,0x7d,0xc1,0x91}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x45,0xa2,0x8b,0x7d}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x46,0x23,0x62,0x27}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x46,0x70,0x20,0x1d}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x47,0x7e,0xb5,0x92}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x48,0xb4,0x20,0x69}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x49,0xe2,0x40,0x91}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x4a,0x53,0x8c,0xf2}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x4a,0x54,0x80,0x9e}, 9333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x4a,0x7a,0xed,0x7c}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x4a,0xd7,0x85,0x91}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x4b,0x4c,0x65,0xa9}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x4b,0x55,0x0d,0x08}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x4b,0x56,0xa8,0x0d}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x4b,0xaa,0x61,0x19}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x4b,0xb1,0x89,0x86}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x4c,0x4c,0xe3,0x88}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x4d,0x35,0x88,0x06}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x4d,0x6e,0x0b,0x34}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x4e,0x19,0x20,0xce}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x4e,0x22,0x08,0x78}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x4e,0x2e,0x20,0x63}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x4e,0x38,0x09,0xd6}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x4e,0x38,0xe5,0xb1}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x4e,0x81,0xed,0xf5}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x4e,0xc4,0xac,0x2d}, 8333}, {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x4f,0x84,0xe6,0x90}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x4f,0x85,0x2b,0x3f}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x4f,0x86,0xc9,0x42}, 8333}, {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x4f,0xa9,0x23,0xeb}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x50,0x39,0xe3,0x0e}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x4f,0xac,0xc2,0xdb}, 8333}, {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x50,0x40,0x41,0x57}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x50,0x56,0x5c,0x46}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x50,0x64,0xcb,0x97}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x50,0x65,0x20,0x79}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x50,0xa1,0xb2,0x49}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x50,0xf0,0x81,0xaa}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x51,0x07,0x0b,0x32}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x51,0x07,0x0b,0x37}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x51,0x11,0x11,0x28}, 9333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x51,0x1e,0x27,0x53}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x51,0x5a,0x24,0x07}, 9444}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x51,0x88,0xe0,0x4d}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x51,0xa2,0xe7,0xd3}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x51,0xb8,0x00,0x8f}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x51,0xc6,0x80,0x56}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x50,0x59,0x89,0x73}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x50,0x5d,0x24,0xad}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x50,0x65,0xa7,0x64}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x50,0x72,0x22,0x9e}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x50,0x7f,0x88,0x32}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x50,0xbc,0x8b,0x52}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x50,0xde,0x27,0x4d}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x50,0xdf,0x69,0x45}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x50,0xe5,0x97,0xbb}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x50,0xf0,0x81,0xdd}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x51,0x07,0x0a,0xee}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x51,0x07,0x0d,0x54}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x51,0x1b,0x60,0x5c}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x51,0x23,0x8f,0x62}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x51,0x52,0xc9,0x05}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x51,0x53,0x60,0x05}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x51,0xa9,0xe3,0x24}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x51,0xab,0x02,0x77}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x51,0xab,0x26,0x82}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x51,0xaf,0xff,0x76}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x51,0xcf,0x08,0x31}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x51,0xe4,0xc2,0xbb}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x52,0x09,0x01,0x4d}, 8333}, {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x52,0x0b,0x21,0xe5}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x52,0x4f,0x80,0x86}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x52,0x76,0xe9,0x6f}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x52,0x87,0x8b,0x1e}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x52,0x66,0x0d,0x75}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x52,0x74,0xcb,0xf0}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x52,0x82,0x67,0x10}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x52,0x88,0x41,0xe3}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x52,0x9e,0xe3,0xee}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x52,0xc5,0xd4,0x19}, 8333}, {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x52,0xc7,0x66,0x0a}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x52,0xdd,0x6a,0x11}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x52,0xdd,0x6c,0x15}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x52,0xc8,0xcc,0x29}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x52,0xc8,0xcc,0x77}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x52,0xdd,0x69,0xdf}, 8333}, {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x52,0xdd,0x6c,0x1b}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x53,0x89,0x29,0x03}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x53,0x8e,0xc5,0xa8}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x52,0xdd,0x6f,0x88}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x52,0xdd,0x8b,0x61}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x53,0x89,0x29,0x0a}, 8333}, {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x53,0x8f,0x82,0x13}, 8333}, {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x53,0x96,0x09,0xc4}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x53,0xb7,0x11,0xbf}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x53,0xe3,0xad,0x53}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x53,0xe6,0x05,0x0f}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x53,0xe9,0x69,0x97}, 443}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x53,0xf6,0x4b,0x08}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x53,0xfa,0x85,0x9e}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x53,0xff,0x42,0x76}, 8334}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x54,0x18,0x45,0x3b}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x53,0xa9,0x02,0x2b}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x53,0xd9,0xcb,0x82}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x53,0xf9,0x58,0x34}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x54,0x1a,0xa2,0x5c}, 8333}, {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x54,0x2a,0xc1,0x06}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x54,0x2d,0x62,0x57}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x54,0x36,0x80,0x0b}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x54,0xd4,0xc8,0x18}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x54,0xd7,0xc6,0x6d}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x54,0xe6,0x04,0xb1}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x55,0x5f,0xe4,0x53}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x55,0x5f,0xe4,0x7b}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x55,0x72,0x80,0x86}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x55,0xd6,0x42,0xa8}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x55,0xd6,0x93,0xa2}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x55,0xf3,0xa8,0x04}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x56,0x01,0x00,0x12}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x57,0x4f,0x4d,0x6a}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x57,0x5b,0x9c,0x6e}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x57,0xec,0xc4,0xde}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x58,0x55,0x4b,0x98}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x58,0x57,0x01,0xe6}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x58,0x57,0x5c,0x66}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x58,0x59,0x45,0xca}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x58,0x61,0x48,0xe5}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x58,0xa4,0x75,0x63}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x58,0xc6,0x20,0x83}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x54,0x86,0xc2,0x73}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x54,0xc9,0x20,0x73}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x54,0xd4,0xe8,0x47}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x54,0xee,0x8c,0xb0}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x55,0x0a,0x68,0x22}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x55,0x15,0x90,0xe2}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x55,0x19,0xc2,0x0c}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x55,0x90,0x4f,0xbe}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x55,0x91,0xe4,0xc0}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x55,0xc2,0xee,0x82}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x55,0xe4,0xc9,0x50}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x55,0xe5,0xe4,0xae}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x55,0xec,0xe9,0x57}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x56,0x50,0xcc,0xb9}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x56,0x69,0xe3,0xbe}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x56,0x87,0x27,0x28}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x57,0x6a,0x8b,0x7f}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x57,0x78,0x08,0x05}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x57,0x78,0x25,0xe6}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x57,0xef,0x65,0x66}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x57,0xf3,0xc5,0x52}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x58,0x70,0x70,0xad}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x58,0x96,0xc0,0x11}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x58,0xb9,0x9b,0x86}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x58,0xca,0xca,0xdd}, 8333}, {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x58,0xca,0xe6,0x57}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x58,0xd6,0xc1,0x9a}, 8343}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x58,0xd6,0xc2,0xe2}, 8343}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x59,0x0a,0x9b,0x58}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x59,0x2e,0x65,0x2c}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x59,0xa3,0xe0,0xd4}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x59,0xae,0xf8,0x14}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x59,0xca,0xe7,0xc6}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x59,0xd4,0x4b,0x06}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x58,0xd0,0x27,0xb6}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x59,0x22,0x63,0x29}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x59,0xa3,0xe0,0xbb}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x59,0xa9,0xe9,0x96}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x59,0xb8,0x41,0x55}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x59,0xd4,0x5b,0xdb}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x59,0xf9,0xb2,0x24}, 8333}, {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5a,0x95,0x26,0xac}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5a,0xa9,0x6a,0x8b}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5b,0x40,0x65,0x96}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5b,0x41,0xc4,0xb3}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5b,0x79,0x50,0x11}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5b,0x7e,0x4d,0x4d}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5b,0x91,0x4c,0x9c}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5b,0x98,0x96,0x23}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5b,0xc0,0x89,0x11}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5b,0xc4,0xaa,0x6e}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5b,0x41,0x61,0x9d}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5b,0x6b,0x40,0x8f}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5b,0x72,0x23,0x6b}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5b,0x87,0x00,0xbb}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5b,0x91,0x6e,0x5f}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5b,0x9d,0x26,0x97}, 8333}, {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5b,0xc5,0x2c,0x85}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5b,0xcf,0x44,0x90}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5b,0xd2,0x69,0x1c}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5b,0xd3,0x66,0x65}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5b,0xd3,0x6a,0x22}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5b,0xd6,0xc8,0xcd}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5b,0xdc,0x2b,0x92}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5b,0xde,0x47,0x59}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5b,0xe0,0x8c,0xf2}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5b,0xe5,0x4c,0x0e}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5b,0xcd,0xb0,0x36}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5b,0xce,0xcb,0x0a}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5b,0xce,0xcb,0x12}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5b,0xd7,0x23,0x82}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5b,0xdb,0xef,0x9f}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5b,0xdf,0x85,0x02}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5b,0xdf,0x85,0x28}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5b,0xe2,0x0a,0x5a}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5b,0xf0,0x8d,0xa9}, 8333}, {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5c,0x1b,0x07,0xd1}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5c,0x33,0xa7,0x58}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5c,0xf7,0xe5,0xa3}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5d,0x54,0x72,0x6a}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5d,0x71,0x24,0xac}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5c,0x59,0x43,0xcf}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5c,0xdd,0xc9,0x8a}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5d,0x5f,0xbb,0x7a}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5d,0x67,0x49,0xbb}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5d,0x7b,0x50,0x2f}, 8333}, {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5d,0xbc,0xe0,0xfd}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5e,0x4b,0xef,0x45}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5e,0xbe,0xe3,0x70}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5e,0xd6,0x02,0x4a}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5e,0xe0,0xa2,0x41}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5e,0xec,0xc6,0xfd}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5d,0xbe,0x45,0xf2}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5e,0x13,0x0c,0xf4}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5e,0x9c,0x80,0x74}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5e,0xb1,0xab,0x49}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5e,0xb5,0x2c,0x68}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5e,0xed,0x1a,0xad}, 8333}, {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5e,0xf2,0xe5,0x9e}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5f,0x54,0x8a,0x63}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5f,0x5f,0xa8,0x57}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5e,0xff,0x80,0x62}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5f,0x4f,0x23,0x32}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5f,0x5b,0x29,0x27}, 8333}, {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5f,0x6e,0xea,0x5d}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5f,0x82,0x09,0xc8}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5f,0xa5,0xa8,0xa8}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5f,0xaa,0xeb,0xfe}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5f,0xd3,0x82,0x9a}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x60,0x2e,0x44,0x68}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x60,0x7f,0xca,0x94}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x61,0x4c,0xab,0x23}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x62,0xa0,0xa0,0x43}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x63,0x7e,0xc5,0xbb}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x63,0xc6,0xad,0x01}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x65,0x64,0xae,0x8a}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x65,0xa4,0xc9,0xd0}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x67,0xe0,0xa5,0x30}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x68,0x80,0xe1,0xdf}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5f,0x80,0x30,0xd1}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5f,0xb7,0x30,0x47}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x60,0x17,0x43,0x55}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x61,0x40,0xb1,0x0a}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x61,0x68,0xc9,0x5f}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x62,0x1d,0xc5,0x95}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x62,0xa9,0x02,0x6b}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x63,0xe8,0x30,0x48}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x65,0x64,0x8d,0x37}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x67,0x07,0x20,0x28}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x67,0x35,0xe1,0x45}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x67,0xf9,0x6a,0x4a}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x68,0x80,0xe0,0x0d}, 8333}, {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x68,0x80,0xe4,0xfc}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x68,0x83,0xc0,0x5e}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x68,0x9b,0x2d,0xc9}, 8334}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x68,0xc2,0x1c,0xc3}, 8663}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x68,0xd3,0x01,0x1b}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x68,0xdd,0x26,0xb1}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x68,0xec,0x09,0x4f}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x68,0xec,0x81,0xb2}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x68,0xec,0xba,0xf9}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x68,0xec,0xc2,0x0f}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x68,0xee,0x80,0xd6}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x68,0x9b,0x01,0x9e}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x68,0xa8,0x80,0x32}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x68,0xc7,0xa0,0xe4}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x68,0xcc,0x6d,0x0b}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x68,0xdb,0xfb,0x76}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x68,0xdf,0x03,0x81}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x68,0xdf,0x03,0xdb}, 8333}, {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x68,0xee,0x82,0xb6}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x6a,0x26,0xea,0x54}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x6a,0xb9,0x24,0xcc}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x6a,0xb9,0x26,0x43}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x6b,0x06,0x04,0x91}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x6b,0x96,0x02,0x06}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x6b,0x96,0x28,0xea}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x6b,0xaa,0x0d,0xb8}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x6b,0xb5,0xfa,0xd8}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x6b,0xbf,0x65,0x6f}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x6b,0xbf,0x6a,0x73}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x68,0xf5,0x63,0xe3}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x6a,0x26,0xea,0x59}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x6a,0x68,0x86,0xda}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x6b,0x88,0x06,0x47}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x6b,0x96,0x2d,0xd2}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x6b,0x97,0x90,0x67}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x6b,0xaa,0x2c,0x63}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x6b,0xb5,0x89,0x85}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x6b,0xbf,0x66,0x0d}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x6c,0x3a,0xfc,0x52}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x6c,0x3b,0x09,0xa7}, 8333}, {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x6c,0x3b,0x0c,0xa3}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x6c,0xa1,0x81,0xf7}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x6d,0xc1,0xa0,0x8c}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x6d,0xc5,0x0d,0x36}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x6d,0xe6,0x07,0xf8}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x6d,0xea,0x6a,0xbf}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x6d,0xec,0x89,0x50}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x6d,0xfb,0xa1,0x79}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x70,0x41,0xe7,0xe2}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x73,0x46,0xa6,0x39}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x73,0x9f,0x2a,0x50}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x75,0x12,0x49,0x22}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x76,0x43,0xc9,0x28}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x76,0x64,0x56,0xf6}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x76,0x6e,0x68,0x98}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x77,0xe0,0x40,0x8d}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x6c,0xa2,0x6a,0xd7}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x6c,0xa8,0x85,0xa4}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x6c,0xad,0xca,0x65}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x6c,0xb4,0x6e,0xbe}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x6d,0x1d,0x4b,0x28}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x6d,0x78,0xc2,0x88}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x6d,0xe6,0xe6,0x58}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x6d,0xeb,0x43,0x73}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x6d,0xeb,0x45,0x78}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x6d,0xec,0x5a,0xc7}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x6d,0xff,0x00,0x6b}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x6e,0x0a,0x82,0x0c}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x6e,0x0a,0xb0,0x5e}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x6e,0x84,0xac,0xfb}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x6f,0x5a,0x9e,0x11}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x73,0x42,0xcd,0xab}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x74,0x1f,0x7b,0x8b}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x76,0xc0,0x30,0x2e}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x76,0xc1,0xa4,0x62}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x77,0x1d,0x9c,0xe7}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x77,0x3f,0x2c,0x85}, 19980}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x77,0x51,0x63,0x1b}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x77,0x6a,0x0c,0xa9}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x77,0x93,0x89,0x9b}, 19980}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x77,0xb9,0x01,0xb6}, 8333}, {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x78,0x37,0xc1,0x88}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x7a,0x6a,0xa9,0xb2}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x7b,0xcb,0xae,0x0f}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x7b,0xff,0xe8,0x5e}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x7c,0x94,0xa5,0xa5}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x7c,0xe8,0x8d,0x1f}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x80,0x1e,0x5c,0x45}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x80,0x27,0x8d,0xb6}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x80,0x54,0xa7,0x14}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x80,0x6f,0x49,0x0a}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x80,0x7f,0x26,0xc3}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x79,0xfe,0xad,0x17}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x79,0xfe,0xad,0x28}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x7b,0x38,0x81,0x2d}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x7b,0xcb,0xa3,0x80}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x7b,0xce,0x20,0xc6}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x7c,0xbd,0xa0,0xdd}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x7c,0xbd,0xc0,0xe8}, 8333}, {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x80,0x8c,0xe0,0xa2}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x80,0xc7,0x65,0x68}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x80,0xe9,0xe0,0x23}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x80,0xfd,0x03,0xc1}, 20020}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x82,0xb4,0xe4,0x8a}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x82,0xb9,0x90,0xd5}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x82,0xff,0x49,0xcf}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x85,0xda,0xe9,0x0b}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x86,0xf9,0x80,0x17}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x88,0x9f,0xea,0xea}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x89,0x74,0xa0,0xb0}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x8b,0xa2,0x02,0x91}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x8b,0xa2,0x17,0x75}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x8d,0x86,0x45,0xfd}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x8d,0xff,0xa2,0xd7}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x90,0x7a,0xa3,0xbb}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x91,0x83,0x03,0x36}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x91,0xff,0x04,0x5e}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x92,0x00,0x20,0x65}, 8337}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x93,0x53,0x48,0x5b}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x94,0x67,0x1c,0x44}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x95,0x05,0x20,0x66}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x95,0xd2,0xa4,0xc3}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x96,0x65,0xa3,0xf1}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x97,0xec,0x0b,0xbd}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x98,0x03,0x88,0x38}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x9a,0x14,0xd0,0x19}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x9e,0xb5,0x68,0x95}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x9f,0xfd,0x60,0xe2}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xa0,0x24,0x82,0xb4}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x80,0xc7,0x44,0xcd}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x82,0xea,0xcf,0x73}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x83,0x71,0x29,0x7b}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x83,0x72,0x48,0x68}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x84,0xcc,0x6c,0x9b}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x86,0x77,0x0d,0xe6}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x86,0xd5,0x85,0xce}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x86,0xd5,0x85,0xcf}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x87,0x17,0x05,0x03}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x89,0x4a,0x00,0x42}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x8a,0x44,0x01,0x2d}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x8a,0x44,0x02,0xc2}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x8a,0x44,0x40,0x13}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x8a,0x44,0x40,0x1c}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x8b,0x3b,0x2a,0xf8}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x8b,0xdc,0xf0,0x99}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x8c,0x70,0x6b,0x76}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x8c,0xba,0xe0,0x70}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x8d,0x34,0x40,0x8d}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x8e,0x44,0xed,0x6b}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x8e,0xd9,0x0c,0x6a}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x92,0x3c,0xcc,0x5c}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x92,0xb9,0xa1,0xd1}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x94,0x67,0x07,0x77}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x95,0xd2,0x85,0xf4}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x96,0xe5,0x00,0x8f}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x97,0xe7,0xee,0x19}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x97,0xf8,0xa0,0xe3}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x99,0xe6,0xe4,0x0f}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x9b,0x85,0x2b,0xf9}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x9e,0x3a,0xee,0x91}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x9e,0x6d,0x4f,0x0d}, 34821}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x9f,0xcb,0x46,0xd0}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xa0,0x10,0xce,0x1f}, 8333}, {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xa2,0xd1,0x01,0xe9}, 8333}, {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xa2,0xd1,0x04,0x7d}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xa2,0xd1,0x6a,0x7b}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xa2,0xd2,0xc6,0xb8}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xa2,0xf8,0x63,0xa4}, 53011}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xa2,0xd8,0xc0,0xe7}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xa2,0xf3,0x64,0x6f}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xa2,0xf6,0x0b,0xc2}, 8333}, {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xa2,0xf8,0x66,0x75}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xa2,0xfb,0x6c,0x35}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xa3,0x2c,0x02,0x30}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xa3,0x9e,0x24,0x11}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xa6,0xe6,0x47,0x43}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xa7,0xa0,0x24,0x3e}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xa7,0xa0,0xa9,0x5c}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xa8,0x5d,0x81,0xdc}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xa9,0x37,0x63,0x54}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xa9,0xe4,0x42,0x2b}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xac,0x09,0xa9,0xf2}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xad,0x20,0x0b,0xc2}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xad,0xe6,0xe4,0x88}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xad,0xf6,0x6b,0x22}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xad,0xfe,0xeb,0x22}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xae,0x00,0x80,0xde}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xae,0x19,0x82,0x94}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xae,0x32,0x40,0x65}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xaf,0x8c,0xe8,0x8d}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb0,0x24,0x25,0x3e}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb0,0x2e,0x09,0x60}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb0,0x7c,0x6e,0x1b}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb1,0x27,0x10,0x66}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb2,0x11,0xad,0x02}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb2,0x3e,0x05,0xf8}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb2,0x3e,0x46,0x10}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xa2,0xfc,0x2e,0x53}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xa3,0xac,0x21,0x4e}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xa3,0xac,0xc2,0x1e}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xa9,0xe5,0xc6,0x6a}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xaa,0x4b,0xc3,0xa8}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xac,0x67,0xcd,0xc5}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xac,0xf5,0xe1,0x7e}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xad,0xb3,0x25,0x08}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xad,0xd0,0xcb,0x4a}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xad,0xfc,0x2e,0x10}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xae,0x75,0x8d,0x7c}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xaf,0x7e,0x26,0x9e}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xaf,0x7e,0x26,0xb1}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xaf,0x8b,0x6a,0x77}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xaf,0x8c,0xe8,0x42}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb0,0x09,0x75,0x64}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb0,0x24,0x21,0x79}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb0,0x24,0x63,0xde}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb0,0x38,0xe3,0x24}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb0,0x64,0x64,0xce}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb0,0x6a,0x90,0xb7}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb0,0x7b,0x07,0x94}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb0,0x7e,0xa7,0x0a}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb0,0xdf,0xc9,0xc6}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb2,0x3e,0x44,0x3e}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb2,0x3e,0x66,0x38}, 8333}, {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb2,0x3e,0xcb,0xb9}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb2,0x4f,0xa0,0x76}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb2,0xa9,0xce,0xf4}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb2,0xc1,0xea,0x3e}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb2,0xc7,0x60,0x6c}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb2,0xfe,0x12,0x60}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb2,0x7c,0xc5,0x65}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb2,0xaa,0x8a,0xca}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb2,0xaf,0x81,0x12}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb2,0xbc,0x2f,0x3e}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb2,0xc7,0xf0,0x16}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb2,0xda,0xd1,0xa2}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb2,0xed,0x23,0x22}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb2,0xee,0xe0,0xf2}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb2,0xfe,0x22,0x90}, 8333}, {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb2,0xfe,0x22,0xa1}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb2,0xff,0x29,0x7b}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb4,0xd2,0x22,0x3a}, 9801}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb6,0x5c,0xe2,0xd4}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb6,0xab,0xf6,0x8e}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb8,0x17,0x08,0x09}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb8,0x3a,0xa2,0x23}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb8,0x9a,0x09,0xaa}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0x08,0xee,0xa5}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb3,0x2b,0xb7,0x02}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb4,0xc8,0x80,0x3a}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb6,0x5d,0x22,0x82}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0x08,0xee,0xc5}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0x0b,0x8b,0xac}, 8333}, {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0x18,0x61,0x0b}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0x1f,0x89,0x8b}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0x26,0x2c,0x40}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0x35,0x80,0xb4}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0x35,0x81,0xf4}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0x4d,0x81,0x77}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0x4d,0x81,0x9c}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0x52,0xcb,0x5c}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xbc,0x14,0x61,0x12}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xbc,0x7e,0x08,0x0e}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xbc,0x8a,0x21,0xef}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xbc,0x9b,0x88,0x46}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0x18,0xe9,0x64}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0x19,0x30,0x47}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0x19,0x30,0x72}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0x1c,0x4c,0xb3}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0x46,0x69,0x98}, 8339}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0x4d,0x80,0x45}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0x4d,0x80,0xf1}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0x56,0x4f,0x57}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0x59,0x66,0x02}, 3333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0x59,0x66,0x35}, 3333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0x6d,0x90,0x9b}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0x75,0x4b,0x32}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0x79,0xad,0xdf}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0x80,0x29,0x9d}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0x82,0xe2,0x6a}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0x91,0x82,0x4c}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xbc,0x3f,0xc0,0x68}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xbc,0x71,0xa4,0xe7}, 8333}, {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xbc,0xa6,0xe5,0x70}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xbc,0xb6,0x6c,0x81}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xbc,0xe2,0xe1,0xae}, 8010}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xbc,0xf2,0xab,0x08}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xbc,0xf3,0x04,0x8b}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xbe,0x0a,0x09,0xea}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xbe,0x0a,0x0a,0x93}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xbc,0xd6,0x80,0x4d}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xbe,0x0a,0x08,0xd3}, 8333}, {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xbe,0x51,0xa0,0xb8}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xbe,0x55,0xc9,0x25}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc0,0x22,0xe3,0xe6}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc0,0x4d,0xbd,0xc8}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc0,0x7c,0xe0,0x07}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc0,0x92,0x89,0x01}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc0,0xcb,0xe4,0x47}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc0,0xce,0xca,0x14}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc1,0x00,0x6d,0x03}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc1,0x29,0xe5,0x82}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc1,0x29,0xe5,0x9c}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xbe,0x6f,0xe7,0x13}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc0,0x83,0x2c,0x5d}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc0,0xce,0xca,0x06}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc0,0xe3,0xf5,0x85}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc0,0xf1,0x4a,0x7b}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc0,0xf1,0x4a,0x7e}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc0,0xfe,0x47,0xde}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc1,0x0a,0x40,0x55}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc1,0x2e,0x50,0x65}, 8333}, {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc1,0x31,0x2b,0xdb}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc1,0x93,0x47,0x78}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc1,0xb3,0x41,0xe9}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc1,0x5d,0x4f,0xd7}, 8333}, {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc1,0xb7,0x63,0x2e}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc1,0xc0,0x25,0x87}, 8333}, {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc1,0xea,0xe0,0xc3}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc2,0x3a,0x6c,0xd5}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc2,0xbb,0x60,0x02}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc2,0xff,0x1f,0x3b}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc3,0x24,0x06,0x65}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc3,0x3a,0xee,0xf3}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc3,0xc5,0xaf,0xbe}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc3,0xef,0x01,0x42}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc6,0x30,0xc4,0xe6}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc6,0x32,0xc0,0xa0}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc6,0x39,0xd2,0x1b}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc6,0x54,0xc3,0xb3}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc6,0xa7,0x8c,0x08}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc1,0xef,0x50,0x9b}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc2,0x3f,0x8c,0xd0}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc2,0x57,0x01,0xe8}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc2,0xbb,0xe3,0x12}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc2,0xf7,0x0c,0x88}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc3,0x5b,0xb0,0x56}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc4,0x1c,0x62,0x14}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc6,0x2c,0xf9,0x23}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc6,0x54,0xac,0xfc}, 8333}, {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc6,0xcc,0xe0,0x6a}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc7,0x7f,0xe2,0xf5}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc7,0xc9,0x6e,0x08}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc7,0xe9,0xea,0x5a}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc6,0xd3,0x61,0x2e}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc7,0x42,0x40,0xc6}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc7,0x65,0x64,0x3a}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc7,0x65,0x64,0x3b}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc7,0x7f,0xe0,0x32}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc8,0x2e,0xf1,0x47}, 8333}, {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc8,0x74,0x62,0xb9}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xca,0x3c,0x46,0x12}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xcb,0x97,0x8c,0x0e}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xcc,0x70,0xcb,0x34}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xcb,0x09,0xe1,0x0d}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xcb,0xb1,0x8e,0x25}, 8333}, {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xcd,0xc8,0xf7,0x95}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xcf,0xe2,0x8d,0xfd}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xcf,0xff,0x2a,0xca}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd0,0x35,0xa4,0x13}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd0,0x42,0x44,0x7f}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd0,0x42,0x44,0x82}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd0,0x47,0xab,0xe8}, 8341}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd0,0x4c,0xc8,0xc8}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd0,0x52,0x62,0xbd}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd0,0x55,0xc1,0x1f}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd0,0x6f,0x30,0x29}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd0,0x6f,0x30,0x2d}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd1,0x22,0xe8,0x48}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd1,0x51,0x09,0xdf}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd1,0x5a,0xe0,0x02}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xcd,0xd1,0x83,0x96}, 13838}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xce,0x35,0x40,0x4a}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xce,0x48,0xc0,0x45}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xce,0x7b,0x70,0xb4}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd0,0x42,0xd0,0x99}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd0,0x44,0xae,0x4c}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd0,0x6b,0x61,0xf2}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd0,0x6f,0x30,0x84}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd0,0x76,0xeb,0xbe}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd1,0x06,0xcd,0x7e}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd1,0x28,0x60,0x79}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd1,0x3a,0x82,0x89}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd1,0x49,0x8e,0xe2}, 8333}, {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd1,0x5a,0xe0,0x04}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd1,0x7e,0x62,0xae}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd1,0x88,0x48,0x45}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd1,0xc3,0x04,0x4a}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd1,0xc5,0x0d,0x3e}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd3,0x48,0xe3,0x08}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd4,0x33,0x90,0x2a}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd4,0x47,0xe9,0x7f}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd4,0x7e,0x0e,0x7a}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd4,0x9f,0x2c,0x32}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd5,0x05,0x24,0x3a}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd5,0x39,0x21,0x0a}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd5,0x42,0xcd,0xc2}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd5,0x88,0x49,0x7d}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd5,0x9b,0x03,0xd8}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd5,0x9b,0x07,0x18}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd5,0xa7,0x11,0x06}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd5,0xdf,0x8a,0x0d}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd8,0x0f,0x4e,0xb6}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd8,0x26,0x81,0xa4}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd8,0x30,0xa8,0x08}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd8,0xa9,0x8d,0xa9}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd8,0xf5,0xce,0xb5}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd8,0xf9,0xcc,0xa1}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd8,0xfa,0x8a,0xe6}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd1,0x7e,0x45,0xf3}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd1,0x7e,0x6c,0x5b}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd1,0xc3,0x04,0x12}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd1,0xfa,0x06,0xbe}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd2,0x36,0x25,0xe1}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd2,0xdf,0x03,0x2c}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd3,0x95,0xea,0x6d}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd4,0x33,0x8c,0xb7}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd4,0x5a,0xb3,0xce}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd4,0x5d,0xe2,0x5a}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd4,0x6e,0xab,0x76}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd4,0xca,0x84,0x11}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd5,0x5b,0xcd,0x86}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd5,0xa5,0x44,0xda}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd5,0xc4,0xc8,0xd5}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd8,0x3b,0x04,0xd4}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd8,0x4a,0x20,0x6d}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd8,0x9e,0xe1,0x46}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd8,0xa4,0x8a,0x0d}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd8,0xa7,0xec,0xf7}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd8,0xc5,0x4f,0x4a}, 8333}, {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd9,0x0b,0xe1,0xbd}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd9,0x0c,0x22,0x9e}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd9,0x0c,0xca,0x21}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd9,0x14,0xab,0x2b}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd9,0x17,0x01,0x7e}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd9,0x17,0x0b,0x8a}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd9,0x0c,0xc7,0xcf}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd9,0x14,0x82,0x48}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd9,0x17,0x06,0x94}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd9,0x17,0x8c,0x67}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd9,0x1c,0x60,0xb4}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd9,0x23,0x82,0x2a}, 8333}, {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd9,0x6f,0x42,0x4f}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd9,0x9b,0xca,0xbf}, 8333}, {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd9,0x9e,0x09,0x66}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd9,0xac,0x20,0x12}, 20993}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xdc,0xf5,0xc4,0x25}, 8333}, - {{0x20,0x01,0x12,0x91,0x02,0xbf,0x00,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x00}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd9,0xa8,0x8f,0xa9}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd9,0xd1,0x20,0xdb}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xda,0xa1,0x21,0xa5}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xdd,0x79,0x90,0x8a}, 8333}, + {{0x20,0x01,0x00,0x00,0x41,0x37,0x9e,0x76,0x20,0x48,0x3a,0x84,0xbb,0x91,0xe8,0x46}, 8333}, + {{0x20,0x01,0x00,0x00,0x41,0x37,0x9e,0x76,0x20,0x66,0x0e,0x9e,0xb4,0x89,0xf8,0xb8}, 8333}, + {{0x20,0x01,0x00,0x00,0x41,0x37,0x9e,0x76,0x38,0x54,0x12,0x11,0xb5,0xac,0xa9,0x6b}, 8333}, + {{0x20,0x01,0x00,0x00,0x41,0x37,0x9e,0x76,0x04,0xe3,0x1f,0x66,0xcd,0x4c,0x82,0x9f}, 8333}, + {{0x20,0x01,0x00,0x00,0x41,0x37,0x9e,0x76,0x00,0xad,0x01,0xf4,0x9e,0xa9,0xfa,0x2e}, 8333}, + {{0x20,0x01,0x00,0x00,0x41,0x37,0x9e,0x76,0x00,0xe5,0x0b,0xaa,0xb6,0x6f,0xf4,0x18}, 8333}, + {{0x20,0x01,0x00,0x00,0x53,0xaa,0x06,0x4c,0x20,0xa2,0x59,0xc4,0xad,0x22,0x93,0xea}, 8333}, + {{0x20,0x01,0x00,0x00,0x53,0xaa,0x06,0x4c,0x00,0x59,0x61,0x7f,0xa1,0x0d,0x00,0xe0}, 8333}, + {{0x20,0x01,0x00,0x00,0x5e,0xf5,0x79,0xfb,0x20,0x0f,0x3a,0xe5,0x3c,0xbc,0x74,0xc9}, 8333}, + {{0x20,0x01,0x00,0x00,0x5e,0xf5,0x79,0xfb,0x38,0xf2,0x13,0xb4,0xb2,0x08,0x56,0x04}, 8333}, + {{0x20,0x01,0x00,0x00,0x5e,0xf5,0x79,0xfd,0x20,0x0b,0x22,0xa7,0xcc,0x50,0xf5,0x2d}, 8333}, + {{0x20,0x01,0x00,0x00,0x5e,0xf5,0x79,0xfd,0x24,0xef,0x1a,0xef,0xa9,0x94,0x30,0x3d}, 8333}, + {{0x20,0x01,0x00,0x00,0x5e,0xf5,0x79,0xfd,0x24,0xfc,0x0b,0x5d,0xad,0x4f,0x4d,0xb2}, 8333}, + {{0x20,0x01,0x00,0x00,0x5e,0xf5,0x79,0xfd,0x28,0xbf,0x2d,0x23,0xe0,0x2e,0xc3,0xef}, 8333}, + {{0x20,0x01,0x00,0x00,0x5e,0xf5,0x79,0xfd,0x3c,0xd0,0x3c,0x2e,0xda,0x44,0xa7,0x59}, 8333}, + {{0x20,0x01,0x00,0x00,0x5e,0xf5,0x79,0xfd,0x08,0x7e,0x0f,0xd7,0xb1,0xc2,0x01,0xb4}, 8333}, + {{0x20,0x01,0x00,0x00,0x9d,0x38,0x6a,0xb8,0x18,0xdb,0x3b,0xda,0xab,0x90,0xe8,0x1e}, 8333}, + {{0x20,0x01,0x00,0x00,0x9d,0x38,0x6a,0xb8,0x04,0xe7,0x16,0x60,0x86,0x2f,0xa6,0xd7}, 8333}, + {{0x20,0x01,0x00,0x00,0x9d,0x38,0x6a,0xb8,0x00,0x06,0x00,0x2b,0x50,0x74,0x95,0x88}, 8333}, + {{0x20,0x01,0x00,0x00,0x9d,0x38,0x6a,0xbd,0x10,0xf8,0xa7,0xd7,0xbb,0x90,0xf5,0x24}, 8333}, + {{0x20,0x01,0x13,0xd8,0x1c,0x01,0x10,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x11}, 8333}, + {{0x20,0x01,0x15,0xc0,0x65,0xff,0x06,0x10,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, + {{0x20,0x01,0x16,0x08,0x00,0x10,0x01,0x56,0x00,0xae,0x00,0x00,0x00,0x00,0x4a,0xdb}, 8333}, + {{0x20,0x01,0x16,0x20,0x0b,0x1b,0x88,0x88,0x02,0x0d,0xb9,0xff,0xfe,0x41,0x67,0x10}, 8333}, + {{0x20,0x01,0x16,0x20,0x0b,0x1b,0xfa,0xce,0x02,0x0d,0xb9,0xff,0xfe,0x41,0x67,0x10}, 8333}, {{0x20,0x01,0x16,0x20,0x0f,0x00,0x02,0x82,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, {{0x20,0x01,0x16,0x20,0x0f,0x00,0x82,0x82,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, - {{0x20,0x01,0x19,0xf0,0x50,0x00,0x8d,0xe8,0x54,0x00,0x00,0xff,0xfe,0x12,0x55,0xe4}, 8333}, - {{0x20,0x01,0x19,0xf0,0x6c,0x00,0x91,0x03,0x54,0x00,0x00,0xff,0xfe,0x10,0xa8,0xd3}, 8333}, - {{0x20,0x01,0x1b,0x60,0x00,0x03,0x01,0x72,0x14,0x2b,0x6d,0xff,0xfe,0x7a,0x01,0x17}, 8333}, - {{0x20,0x01,0x04,0x10,0xa0,0x00,0x40,0x50,0x84,0x63,0x90,0xb0,0xff,0xfb,0x4e,0x58}, 8333}, + {{0x20,0x01,0x16,0x80,0x01,0x01,0x01,0xae,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, + {{0x20,0x01,0x16,0xd8,0xff,0x00,0x85,0xde,0x02,0x0c,0x29,0xff,0xfe,0x52,0x95,0x94}, 8333}, + {{0x20,0x01,0x19,0xf0,0x44,0x00,0x43,0x4d,0x54,0x00,0x00,0xff,0xfe,0x42,0x26,0x78}, 8333}, + {{0x20,0x01,0x19,0xf0,0x50,0x00,0x8c,0x8b,0x54,0x00,0x00,0xff,0xfe,0x1f,0xc0,0x23}, 8333}, + {{0x20,0x01,0x19,0xf0,0x50,0x00,0x8c,0xe6,0x54,0x00,0x00,0xff,0xfe,0x1b,0x24,0xa9}, 8333}, + {{0x20,0x01,0x19,0xf0,0x00,0x05,0x03,0x14,0x54,0x00,0x00,0xff,0xfe,0x2c,0x42,0xe8}, 8333}, + {{0x20,0x01,0x19,0xf0,0x00,0x05,0x05,0x1b,0x54,0x00,0x00,0xff,0xfe,0x49,0xfe,0x5b}, 8333}, + {{0x20,0x01,0x19,0xf0,0x00,0x05,0x00,0xbc,0x54,0x00,0x00,0xff,0xfe,0x3b,0x93,0x39}, 8333}, + {{0x20,0x01,0x1a,0xf8,0x40,0x20,0xa0,0x20,0x00,0x05,0x00,0x00,0x00,0x00,0x00,0x00}, 8333}, + {{0x20,0x01,0x1b,0xc8,0x01,0xa0,0x59,0x0e,0x02,0xe0,0xf4,0xff,0xfe,0x16,0x3a,0x39}, 8333}, + {{0x20,0x01,0x1c,0x04,0x14,0x01,0x8f,0x00,0xf4,0xfe,0x4f,0xff,0xfe,0x0c,0xdf,0x40}, 8333}, + {{0x20,0x01,0x41,0x28,0x61,0x35,0x00,0x10,0x02,0x0c,0x29,0xff,0xfe,0x69,0x9e,0x81}, 8333}, {{0x20,0x01,0x41,0x28,0x61,0x35,0x20,0x10,0x02,0x1e,0x0b,0xff,0xfe,0xe8,0xa3,0xc0}, 8333}, - {{0x20,0x01,0x41,0xd0,0x10,0x08,0x07,0x61,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x7c}, 8333}, + {{0x20,0x01,0x41,0x28,0x61,0x35,0xe0,0x01,0x50,0x54,0x00,0xff,0xfe,0x37,0xe9,0xeb}, 8333}, + {{0x20,0x01,0x41,0xd0,0x10,0x00,0x10,0x24,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, 8333}, + {{0x20,0x01,0x41,0xd0,0x10,0x00,0x14,0x33,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, 8333}, + {{0x20,0x01,0x41,0xd0,0x10,0x04,0x22,0xae,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, 8333}, + {{0x20,0x01,0x41,0xd0,0x10,0x04,0x29,0x96,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, 8333}, + {{0x20,0x01,0x41,0xd0,0x10,0x08,0x11,0xe0,0x00,0x00,0x00,0x00,0x1a,0x5c,0x6d,0x9d}, 8333}, + {{0x20,0x01,0x41,0xd0,0x10,0x08,0x11,0xe0,0x00,0x00,0x00,0x00,0x0b,0x74,0xba,0xf7}, 8333}, + {{0x20,0x01,0x41,0xd0,0x10,0x08,0x23,0x7a,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, 8333}, + {{0x20,0x01,0x41,0xd0,0x10,0x08,0x27,0x52,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, 8333}, + {{0x20,0x01,0x41,0xd0,0x10,0x08,0x04,0x94,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, 8333}, {{0x20,0x01,0x41,0xd0,0x00,0x01,0x45,0xd8,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, - {{0x20,0x01,0x41,0xd0,0x00,0x01,0x6c,0xd3,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, 8333}, + {{0x20,0x01,0x41,0xd0,0x00,0x01,0x56,0x30,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, + {{0x20,0x01,0x41,0xd0,0x00,0x01,0x6f,0x57,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, + {{0x20,0x01,0x41,0xd0,0x00,0x01,0x80,0x1e,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, + {{0x20,0x01,0x41,0xd0,0x00,0x01,0x88,0x52,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, {{0x20,0x01,0x41,0xd0,0x00,0x01,0x8b,0x26,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, - {{0x20,0x01,0x41,0xd0,0x00,0x01,0xaf,0xda,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, 8200}, + {{0x20,0x01,0x41,0xd0,0x00,0x01,0xa5,0xb8,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, {{0x20,0x01,0x41,0xd0,0x00,0x01,0xb2,0x6b,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, {{0x20,0x01,0x41,0xd0,0x00,0x01,0xc1,0x39,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, {{0x20,0x01,0x41,0xd0,0x00,0x01,0xc8,0xd7,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, - {{0x20,0x01,0x41,0xd0,0x00,0x01,0xf5,0x9f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x33}, 8333}, - {{0x20,0x01,0x41,0xd0,0x00,0x01,0xf7,0xcc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, - {{0x20,0x01,0x41,0xd0,0x00,0x02,0x10,0x21,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, - {{0x20,0x01,0x41,0xd0,0x00,0x02,0x37,0xc3,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, 8200}, - {{0x20,0x01,0x41,0xd0,0x00,0x02,0x47,0x97,0x23,0x23,0x23,0x23,0x23,0x23,0x23,0x23}, 8333}, - {{0x20,0x01,0x41,0xd0,0x00,0x02,0x53,0xdf,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, 8333}, + {{0x20,0x01,0x41,0xd0,0x00,0x01,0xd2,0x27,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, 8333}, + {{0x20,0x01,0x41,0xd0,0x00,0x01,0xdb,0xc4,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, + {{0x20,0x01,0x41,0xd0,0x00,0x01,0xdc,0x5d,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, + {{0x20,0x01,0x41,0xd0,0x00,0x01,0xe1,0x3b,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, + {{0x20,0x01,0x41,0xd0,0x00,0x01,0xef,0x5b,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, + {{0x20,0x01,0x41,0xd0,0x00,0x02,0x16,0xbe,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, + {{0x20,0x01,0x41,0xd0,0x00,0x02,0x20,0x3c,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, + {{0x20,0x01,0x41,0xd0,0x00,0x02,0x38,0xc5,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, + {{0x20,0x01,0x41,0xd0,0x00,0x02,0x05,0x19,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, 8333}, {{0x20,0x01,0x41,0xd0,0x00,0x02,0x9c,0x94,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, - {{0x20,0x01,0x41,0xd0,0x00,0x02,0x9d,0x3e,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, - {{0x20,0x01,0x41,0xd0,0x00,0x02,0xa2,0x4f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, 8333}, - {{0x20,0x01,0x41,0xd0,0x00,0x02,0xa3,0x5a,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, 8333}, - {{0x20,0x01,0x41,0xd0,0x00,0x02,0xb2,0xb8,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, 8333}, - {{0x20,0x01,0x41,0xd0,0x00,0x02,0xc1,0xd9,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, 8333}, - {{0x20,0x01,0x41,0xd0,0x00,0x02,0x0c,0x6e,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, 8333}, + {{0x20,0x01,0x41,0xd0,0x00,0x02,0xb7,0x92,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, 8333}, + {{0x20,0x01,0x41,0xd0,0x00,0x02,0xbf,0x2a,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, 8333}, + {{0x20,0x01,0x41,0xd0,0x00,0x02,0xc7,0x93,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, 8333}, {{0x20,0x01,0x41,0xd0,0x00,0x02,0xc9,0xbf,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, 8333}, - {{0x20,0x01,0x41,0xd0,0x00,0x02,0xf1,0xa5,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, 8333}, - {{0x20,0x01,0x41,0xd0,0x00,0x52,0x0a,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x10,0x5f}, 8333}, - {{0x20,0x01,0x41,0xd0,0x00,0x52,0x0c,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x06,0xf5}, 8333}, - {{0x20,0x01,0x41,0xd0,0x00,0x52,0x0d,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x06,0xe2}, 8333}, - {{0x20,0x01,0x41,0xd0,0x00,0x08,0x3e,0x75,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, - {{0x20,0x01,0x41,0xd0,0x00,0x08,0x62,0xab,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, + {{0x20,0x01,0x41,0xd0,0x03,0x03,0x04,0xf0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, 8333}, + {{0x20,0x01,0x41,0xd0,0x00,0x08,0x1a,0x8a,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, + {{0x20,0x01,0x41,0xd0,0x00,0x08,0x3f,0xa9,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, + {{0x20,0x01,0x41,0xd0,0x00,0x08,0x46,0x70,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, + {{0x20,0x01,0x41,0xd0,0x00,0x08,0x4f,0x48,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, {{0x20,0x01,0x41,0xd0,0x00,0x08,0x67,0x28,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, 8333}, - {{0x20,0x01,0x41,0xd0,0x00,0x08,0xb3,0x0a,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, - {{0x20,0x01,0x41,0xd0,0x00,0x08,0xbc,0x26,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, - {{0x20,0x01,0x41,0xd0,0x00,0x08,0xbe,0x9a,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, - {{0x20,0x01,0x41,0xd0,0x00,0x08,0xd9,0x84,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, 8333}, - {{0x20,0x01,0x41,0xd0,0x00,0x08,0xeb,0x8b,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, 8333}, - {{0x20,0x01,0x41,0xd0,0x00,0x0a,0x13,0xa2,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, - {{0x20,0x01,0x41,0xd0,0x00,0x0a,0x2b,0x18,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, - {{0x20,0x01,0x41,0xd0,0x00,0x0a,0x2d,0x14,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, 8333}, - {{0x20,0x01,0x41,0xd0,0x00,0x0a,0x45,0x58,0x00,0x00,0x00,0x00,0x1d,0xf2,0x76,0xd3}, 8333}, - {{0x20,0x01,0x41,0xd0,0x00,0x0a,0x4a,0xaa,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, 8333}, - {{0x20,0x01,0x41,0xd0,0x00,0x0a,0x63,0x5b,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, - {{0x20,0x01,0x41,0xd0,0x00,0x0a,0x63,0xd8,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, + {{0x20,0x01,0x41,0xd0,0x00,0x08,0x72,0xc2,0x00,0x0d,0x02,0x42,0xac,0x11,0x00,0x02}, 8333}, + {{0x20,0x01,0x41,0xd0,0x00,0x08,0x80,0x07,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, 8333}, + {{0x20,0x01,0x41,0xd0,0x00,0x08,0xa7,0x1c,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, 8333}, + {{0x20,0x01,0x41,0xd0,0x00,0x08,0xbc,0xcc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, + {{0x20,0x01,0x41,0xd0,0x00,0x08,0xbd,0x45,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, + {{0x20,0x01,0x41,0xd0,0x00,0x08,0xc6,0x7c,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, 8333}, + {{0x20,0x01,0x41,0xd0,0x00,0x08,0xde,0x3d,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, + {{0x20,0x01,0x41,0xd0,0x00,0x08,0xe2,0x57,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, + {{0x20,0x01,0x41,0xd0,0x00,0x08,0xe3,0xe4,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, + {{0x20,0x01,0x41,0xd0,0x00,0x0a,0x14,0xcc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, + {{0x20,0x01,0x41,0xd0,0x00,0x0a,0x15,0xb2,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, + {{0x20,0x01,0x41,0xd0,0x00,0x0a,0x1a,0xc9,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, + {{0x20,0x01,0x41,0xd0,0x00,0x0a,0x24,0x96,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, + {{0x20,0x01,0x41,0xd0,0x00,0x0a,0x30,0x8c,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, 8333}, + {{0x20,0x01,0x41,0xd0,0x00,0x0a,0x58,0x79,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, 8333}, + {{0x20,0x01,0x41,0xd0,0x00,0x0a,0x68,0x10,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, + {{0x20,0x01,0x41,0xd0,0x00,0x0a,0x68,0x2d,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, {{0x20,0x01,0x41,0xd0,0x00,0x0a,0x6c,0x29,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, - {{0x20,0x01,0x41,0xd0,0x00,0x0a,0xf9,0xcd,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, - {{0x20,0x01,0x41,0xd0,0x00,0x0d,0x20,0xa4,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, 8333}, + {{0x20,0x01,0x41,0xd0,0x00,0x0a,0xf5,0x2a,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, + {{0x20,0x01,0x41,0xd0,0x00,0x0d,0x11,0x1c,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, 8333}, + {{0x20,0x01,0x41,0xd0,0x00,0x0e,0x13,0x88,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, {{0x20,0x01,0x41,0xd0,0x00,0x0e,0x02,0x6b,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, + {{0x20,0x01,0x41,0xd0,0x00,0x0e,0x0f,0x73,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, {{0x20,0x01,0x41,0xd0,0xfc,0x8c,0xa2,0x00,0x7a,0x24,0xaf,0xff,0xfe,0x9d,0xc6,0x9b}, 8333}, + {{0x20,0x01,0x41,0xf0,0x00,0x61,0x00,0x00,0x72,0xf3,0x95,0xff,0xfe,0x09,0x75,0x21}, 8333}, {{0x20,0x01,0x41,0xf0,0x00,0x61,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x07}, 8333}, - {{0x20,0x01,0x41,0xf0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, - {{0x20,0x01,0x44,0xb8,0x41,0xbd,0x61,0x01,0x14,0x8e,0x40,0x22,0x49,0x50,0xe8,0x61}, 8333}, - {{0x20,0x01,0x04,0x70,0x00,0x01,0x02,0xf9,0x00,0x00,0x00,0x01,0x10,0x7a,0xa3,0x01}, 8333}, - {{0x20,0x01,0x04,0x70,0x1f,0x0b,0x0a,0xd6,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, - {{0x20,0x01,0x04,0x70,0x1f,0x11,0x12,0xd5,0x00,0x00,0x00,0x00,0x0a,0xe1,0x56,0x11}, 8333}, + {{0x20,0x01,0x44,0x28,0x02,0x00,0x81,0x71,0x0d,0xb6,0x2f,0xf4,0x9c,0x0e,0xa2,0xda}, 8333}, + {{0x20,0x01,0x04,0x70,0x1f,0x07,0x15,0x1c,0xba,0xac,0x6f,0xff,0xfe,0xb7,0x3b,0xa9}, 8333}, + {{0x20,0x01,0x04,0x70,0x1f,0x0b,0x0a,0xd6,0x0a,0x60,0x6e,0xff,0xfe,0xc6,0x23,0x23}, 8333}, + {{0x20,0x01,0x04,0x70,0x1f,0x11,0x06,0x17,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x0f}, 8333}, + {{0x20,0x01,0x04,0x70,0x1f,0x14,0x07,0x3e,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, {{0x20,0x01,0x04,0x70,0x1f,0x14,0x00,0x7d,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, - {{0x20,0x01,0x04,0x70,0x00,0x27,0x00,0xce,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, + {{0x20,0x01,0x04,0x70,0x1f,0x15,0x11,0xf8,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x10}, 8333}, + {{0x20,0x01,0x04,0x70,0x1f,0x15,0x1b,0x95,0x2c,0x3e,0x8a,0x9a,0x24,0xe1,0x70,0x84}, 8333}, + {{0x20,0x01,0x04,0x70,0x1f,0x15,0x0e,0x9b,0x00,0x00,0x00,0x00,0x00,0x00,0x03,0xef}, 8333}, + {{0x20,0x01,0x04,0x70,0x1f,0x1d,0x03,0xa9,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x10}, 8333}, + {{0x20,0x01,0x04,0x70,0x00,0x25,0x04,0x82,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, + {{0x20,0x01,0x04,0x70,0x00,0x27,0x01,0x9f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, + {{0x20,0x01,0x04,0x70,0x00,0x27,0x06,0x65,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, + {{0x20,0x01,0x04,0x70,0x00,0x28,0x03,0x65,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x04}, 8333}, {{0x20,0x01,0x04,0x70,0x00,0x41,0x00,0x06,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, - {{0x20,0x01,0x04,0x70,0x50,0x7d,0x00,0x00,0x6a,0xb5,0x99,0xff,0xfe,0x73,0xac,0x18}, 8333}, - {{0x20,0x01,0x04,0x70,0x58,0x3e,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x2a}, 8333}, - {{0x20,0x01,0x04,0x70,0x00,0x5f,0x00,0x5f,0x00,0x00,0x00,0x00,0x00,0x00,0x02,0x32}, 8333}, - {{0x20,0x01,0x04,0x70,0x00,0x66,0x01,0x19,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, - {{0x20,0x01,0x04,0x70,0x6c,0x4f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xca,0xfe}, 8333}, - {{0x20,0x01,0x04,0x70,0x00,0x6f,0x03,0x27,0x91,0x3b,0x07,0xfe,0x85,0x45,0xa4,0xf5}, 8333}, - {{0x20,0x01,0x04,0x70,0x7d,0xda,0x00,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, - {{0x20,0x01,0x04,0x70,0x95,0xc1,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, - {{0x20,0x01,0x04,0x70,0xb1,0xd0,0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x10,0x00}, 8333}, - {{0x20,0x01,0x04,0x70,0xd0,0x0d,0x00,0x00,0x36,0x64,0xa9,0xff,0xfe,0x9a,0x51,0x50}, 8333}, - {{0x20,0x01,0x04,0x70,0xfa,0xb7,0x00,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, - {{0x20,0x01,0x48,0x00,0x78,0x19,0x01,0x04,0xbe,0x76,0x4e,0xff,0xfe,0x05,0xc8,0x28}, 8333}, - {{0x20,0x01,0x48,0x00,0x78,0x19,0x01,0x04,0xbe,0x76,0x4e,0xff,0xfe,0x05,0xc9,0xa0}, 8333}, + {{0x20,0x01,0x04,0x70,0x72,0x7b,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x11,0x00,0x14}, 8333}, + {{0x20,0x01,0x04,0x70,0x00,0x07,0x02,0xf0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, + {{0x20,0x01,0x04,0x70,0x00,0x07,0x00,0x65,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, + {{0x20,0x01,0x04,0x70,0x7f,0x85,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, + {{0x20,0x01,0x04,0x70,0x00,0x08,0x02,0xe1,0x58,0x25,0x39,0xdf,0x3e,0x4c,0x54,0xa8}, 8333}, + {{0x20,0x01,0x04,0x70,0x00,0x08,0x02,0xe1,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x43}, 8333}, + {{0x20,0x01,0x04,0x70,0x00,0x08,0x02,0xe1,0xae,0x2a,0xe2,0x57,0x44,0x70,0x63,0x50}, 8333}, + {{0x20,0x01,0x04,0x70,0x00,0x0a,0x0c,0x13,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, {{0x20,0x01,0x48,0x01,0x78,0x19,0x00,0x74,0xb7,0x45,0xb9,0xd5,0xff,0x10,0xa6,0x1a}, 8333}, {{0x20,0x01,0x48,0x01,0x78,0x19,0x00,0x74,0xb7,0x45,0xb9,0xd5,0xff,0x10,0xaa,0xec}, 8333}, {{0x20,0x01,0x48,0x01,0x78,0x28,0x01,0x04,0xbe,0x76,0x4e,0xff,0xfe,0x10,0x13,0x25}, 8333}, - {{0x20,0x01,0x48,0x02,0x78,0x00,0x00,0x01,0xbe,0x76,0x4e,0xff,0xfe,0x20,0xf0,0x23}, 8333}, {{0x20,0x01,0x48,0x02,0x78,0x00,0x00,0x02,0x30,0xd7,0x17,0x75,0xff,0x20,0x18,0x58}, 8333}, - {{0x20,0x01,0x48,0x02,0x78,0x00,0x00,0x02,0xbe,0x76,0x4e,0xff,0xfe,0x20,0x6c,0x26}, 8333}, - {{0x20,0x01,0x48,0x02,0x78,0x02,0x01,0x01,0xbe,0x76,0x4e,0xff,0xfe,0x20,0x02,0x56}, 8333}, - {{0x20,0x01,0x48,0x02,0x78,0x02,0x01,0x03,0xbe,0x76,0x4e,0xff,0xfe,0x20,0x2d,0xe8}, 8333}, - {{0x20,0x01,0x48,0x30,0x11,0x00,0x02,0xe8,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, - {{0x20,0x01,0x4b,0x98,0x0d,0xc2,0x00,0x41,0x02,0x16,0x3e,0xff,0xfe,0x56,0xf6,0x59}, 8333}, - {{0x20,0x01,0x4b,0xa0,0xff,0xfa,0x00,0x5d,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x93}, 8333}, - {{0x20,0x01,0x4b,0xa0,0xff,0xff,0x01,0xbe,0x00,0x01,0x10,0x05,0x00,0x00,0x00,0x01}, 8333}, - {{0x20,0x01,0x4d,0xd0,0xff,0x00,0x86,0x7f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x03}, 8333}, + {{0x20,0x01,0x4b,0xa0,0xba,0xbe,0x08,0x32,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, 8333}, + {{0x20,0x01,0x4b,0xa0,0xca,0xfe,0x03,0x79,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, + {{0x20,0x01,0x4b,0xa0,0xff,0xee,0x00,0x33,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x10}, 8333}, {{0x20,0x01,0x4d,0xd0,0xff,0x00,0x9a,0x67,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x09}, 8333}, - {{0x20,0x01,0x05,0xc0,0x14,0x00,0x00,0x0b,0x00,0x00,0x00,0x00,0x00,0x00,0x3c,0xc7}, 8333}, {{0x20,0x01,0x06,0x10,0x1b,0x19,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x03}, 8333}, {{0x20,0x01,0x06,0x10,0x06,0x00,0x0a,0x41,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, - {{0x20,0x01,0x06,0x7c,0x26,0xb4,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, 8333}, - {{0x20,0x01,0x08,0xd8,0x08,0x40,0x05,0x00,0x00,0x00,0x00,0x00,0x00,0x39,0x01,0xae}, 8333}, - {{0x20,0x01,0x08,0xd8,0x09,0x65,0x4a,0x00,0x00,0x00,0x00,0x00,0x00,0x10,0x93,0x43}, 8333}, - {{0x20,0x01,0x09,0x80,0x46,0x50,0x00,0x01,0x02,0xe0,0x53,0xff,0xfe,0x13,0x24,0x49}, 8333}, + {{0x20,0x01,0x06,0x78,0x01,0x74,0x40,0x21,0x00,0x00,0x00,0x00,0x00,0x02,0x83,0x33}, 8333}, + {{0x20,0x01,0x06,0x7c,0x16,0xdc,0x12,0x01,0x50,0x54,0x00,0xff,0xfe,0x17,0x4d,0xac}, 8333}, + {{0x20,0x01,0x06,0x7c,0x21,0x28,0xff,0xff,0x60,0x62,0x36,0xff,0xfe,0x30,0x65,0x32}, 8333}, + {{0x20,0x01,0x06,0x7c,0x25,0x64,0x03,0x31,0x35,0x47,0x6e,0x28,0x85,0xa4,0xfb,0x27}, 8333}, + {{0x20,0x01,0x06,0xa0,0x02,0x00,0x03,0x68,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, + {{0x20,0x01,0x07,0x18,0x08,0x01,0x03,0x11,0x50,0x54,0x00,0xff,0xfe,0x19,0xc4,0x83}, 8333}, + {{0x20,0x01,0x07,0xb8,0x02,0xff,0x00,0x8f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, + {{0x20,0x01,0x08,0xd8,0x08,0xa6,0x44,0x00,0x00,0x00,0x00,0x00,0x00,0x3f,0x08,0x6c}, 8333}, + {{0x20,0x01,0x08,0xd8,0x09,0x23,0x84,0x00,0x00,0x00,0x00,0x00,0x00,0x87,0x0e,0xbd}, 8333}, + {{0x20,0x01,0x09,0x60,0x06,0x6d,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, {{0x20,0x01,0x09,0x81,0x00,0x46,0x00,0x01,0xba,0x27,0xeb,0xff,0xfe,0x5b,0xed,0xee}, 8333}, - {{0x20,0x01,0x09,0xc8,0x53,0xe9,0x36,0x9a,0x02,0x26,0x2d,0xff,0xfe,0x1b,0x74,0x72}, 8333}, - {{0x20,0x01,0x09,0xd8,0xca,0xfe,0x00,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x87}, 8333}, - {{0x20,0x01,0x0b,0x10,0x00,0x11,0x00,0x21,0x3e,0x07,0x54,0xff,0xfe,0x48,0x72,0x48}, 8333}, - {{0x20,0x01,0x0b,0xa8,0x01,0xf1,0xf3,0x4c,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, - {{0x20,0x01,0x0b,0xc8,0x23,0x10,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, - {{0x20,0x01,0x0b,0xc8,0x34,0x27,0x01,0x01,0x7a,0x4f,0x08,0xbe,0x26,0x11,0x6e,0x79}, 8333}, - {{0x20,0x01,0x0b,0xc8,0x35,0x05,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, - {{0x20,0x01,0x0c,0xc0,0xa0,0x04,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x30,0x00,0x1d}, 8333}, - {{0x20,0x01,0x0e,0x42,0x01,0x02,0x12,0x09,0x01,0x53,0x01,0x21,0x00,0x76,0x01,0x71}, 8333}, - {{0x20,0x02,0x17,0xea,0x14,0xeb,0x00,0x00,0x00,0x00,0x00,0x00,0x17,0xea,0x14,0xeb}, 8333}, - {{0x20,0x02,0x02,0xf8,0x2b,0xc5,0x00,0x00,0x00,0x00,0x00,0x00,0x02,0xf8,0x2b,0xc5}, 8333}, - {{0x20,0x02,0x40,0x47,0x48,0x2c,0x00,0x00,0x00,0x00,0x00,0x00,0x40,0x47,0x48,0x2c}, 8333}, - {{0x20,0x02,0x45,0xc3,0x8c,0xca,0x00,0x00,0x00,0x00,0x00,0x00,0x45,0xc3,0x8c,0xca}, 8333}, - {{0x20,0x02,0x46,0xbb,0x8a,0x41,0x00,0x00,0x02,0x26,0xb0,0xff,0xfe,0xed,0x5f,0x12}, 8888}, - {{0x20,0x02,0x46,0xbb,0x8c,0x3c,0x00,0x00,0x8d,0x55,0x8f,0xbb,0x15,0xfa,0xf4,0xe0}, 8765}, - {{0x20,0x02,0x4c,0x48,0xa0,0xfe,0x00,0x00,0x00,0x00,0x00,0x00,0x4c,0x48,0xa0,0xfe}, 8333}, - {{0x20,0x02,0x4d,0x44,0x25,0xc8,0x00,0x00,0x00,0x00,0x00,0x00,0x4d,0x44,0x25,0xc8}, 8333}, - {{0x20,0x02,0x50,0x5f,0xaa,0xa2,0x00,0x00,0x00,0x00,0x00,0x00,0x50,0x5f,0xaa,0xa2}, 8333}, - {{0x20,0x02,0x5b,0xc1,0x79,0x9d,0x00,0x00,0x00,0x00,0x00,0x00,0x5b,0xc1,0x79,0x9d}, 8333}, - {{0x20,0x02,0x6d,0xec,0x54,0x72,0x00,0x00,0x00,0x00,0x00,0x00,0x6d,0xec,0x54,0x72}, 8333}, - {{0x20,0x02,0x8c,0x6d,0x65,0x21,0x96,0x17,0x12,0xbf,0x48,0xff,0xfe,0xd8,0x17,0x24}, 8333}, - {{0x20,0x02,0xac,0x52,0x94,0xe2,0x00,0x00,0x00,0x00,0x00,0x00,0xac,0x52,0x94,0xe2}, 8333}, - {{0x20,0x02,0xaf,0x7e,0x3e,0xca,0x00,0x00,0x00,0x00,0x00,0x00,0xaf,0x7e,0x3e,0xca}, 8333}, - {{0x20,0x02,0xb0,0x09,0x20,0xc5,0x00,0x00,0x00,0x00,0x00,0x00,0xb0,0x09,0x20,0xc5}, 8333}, - {{0x20,0x02,0xc0,0x6f,0x39,0xa0,0x00,0x00,0x00,0x00,0x00,0x00,0xc0,0x6f,0x39,0xa0}, 8333}, - {{0x20,0x02,0xc2,0x3a,0x73,0x8a,0x00,0x00,0x00,0x00,0x00,0x00,0xc2,0x3a,0x73,0x8a}, 8333}, - {{0x20,0x02,0xc7,0x0f,0x74,0x42,0x00,0x00,0x00,0x00,0x00,0x00,0xc7,0x0f,0x74,0x42}, 8333}, - {{0x20,0x02,0xce,0xc5,0xbe,0x4f,0x00,0x00,0x00,0x00,0x00,0x00,0xce,0xc5,0xbe,0x4f}, 8333}, - {{0x20,0x02,0xd1,0x49,0x9e,0x3a,0x00,0x00,0x00,0x00,0x00,0x00,0xd1,0x49,0x9e,0x3a}, 8333}, + {{0x20,0x01,0x0b,0xa8,0x01,0xf1,0xf0,0x69,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, + {{0x20,0x01,0x0b,0xc8,0x22,0x5f,0x01,0x0e,0x05,0x05,0x65,0x73,0x75,0x73,0x0d,0x0a}, 8333}, + {{0x20,0x01,0x0b,0xc8,0x27,0x06,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, + {{0x20,0x01,0x0b,0xc8,0x32,0x3c,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x53}, 8333}, + {{0x20,0x01,0x0b,0xc8,0x32,0x3c,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0x00,0x04}, 8333}, + {{0x20,0x01,0x0b,0xc8,0x32,0x3c,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xca,0xfe}, 8333}, + {{0x20,0x01,0x0b,0xc8,0x36,0x80,0x42,0x42,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, + {{0x20,0x01,0x0b,0xc8,0x39,0x9f,0xf0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, + {{0x20,0x01,0x0b,0xc8,0x3c,0xbf,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x05}, 8333}, + {{0x20,0x01,0x0b,0xc8,0x47,0x00,0x23,0x00,0x00,0x00,0x00,0x00,0x00,0x19,0x08,0x07}, 8333}, + {{0x20,0x01,0x0e,0x42,0x01,0x02,0x18,0x05,0x01,0x60,0x00,0x16,0x02,0x06,0x00,0x31}, 8333}, + {{0x20,0x02,0x12,0xf1,0x00,0x3f,0x00,0x00,0x00,0x00,0x00,0x00,0x12,0xf1,0x00,0x3f}, 8333}, + {{0x20,0x02,0x01,0xe2,0x53,0x49,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0xe2,0x53,0x49}, 8333}, + {{0x20,0x02,0x01,0xe2,0x55,0x88,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0xe2,0x55,0x88}, 8333}, + {{0x20,0x02,0x25,0x01,0xcf,0x62,0x00,0x00,0x00,0x00,0x00,0x00,0x25,0x01,0xcf,0x62}, 8333}, + {{0x20,0x02,0x26,0x8c,0xa1,0x35,0x00,0x00,0x00,0x00,0x00,0x00,0x26,0x8c,0xa1,0x35}, 8333}, + {{0x20,0x02,0x2a,0x33,0x99,0xdb,0x00,0x00,0x00,0x00,0x00,0x00,0x2a,0x33,0x99,0xdb}, 8332}, + {{0x20,0x02,0x2e,0xbc,0x2c,0x14,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x07}, 8333}, + {{0x20,0x02,0x2f,0x59,0x2c,0x9c,0x00,0x00,0x00,0x00,0x00,0x00,0x2f,0x59,0x2c,0x9c}, 11885}, + {{0x20,0x02,0x2f,0x5a,0x36,0x19,0x00,0x00,0x00,0x00,0x00,0x00,0x2f,0x5a,0x36,0x19}, 8333}, + {{0x20,0x02,0x2f,0x5a,0x36,0xa4,0x00,0x00,0x00,0x00,0x00,0x00,0x2f,0x5a,0x36,0xa4}, 8333}, + {{0x20,0x02,0x2f,0x5a,0x04,0x29,0x00,0x00,0x00,0x00,0x00,0x00,0x2f,0x5a,0x04,0x29}, 8333}, + {{0x20,0x02,0x2f,0x5a,0x56,0x2a,0x00,0x00,0x00,0x00,0x00,0x00,0x2f,0x5a,0x56,0x2a}, 8333}, + {{0x20,0x02,0x3a,0x3b,0x02,0x16,0x00,0x00,0x00,0x00,0x00,0x00,0x3a,0x3b,0x02,0x16}, 8333}, + {{0x20,0x02,0x3d,0xfa,0x5d,0x23,0x00,0x00,0x00,0x00,0x00,0x00,0x3d,0xfa,0x5d,0x23}, 8333}, + {{0x20,0x02,0x42,0x4f,0xa0,0x52,0x00,0x00,0x00,0x00,0x00,0x00,0x42,0x4f,0xa0,0x52}, 8333}, + {{0x20,0x02,0x45,0x1e,0xe9,0x22,0x00,0x00,0x00,0x00,0x00,0x00,0x45,0x1e,0xe9,0x22}, 8333}, + {{0x20,0x02,0x45,0x40,0x4b,0x30,0x00,0x00,0x00,0x00,0x00,0x00,0x45,0x40,0x4b,0x30}, 8333}, + {{0x20,0x02,0x51,0xab,0x07,0xcc,0x00,0x00,0x00,0x00,0x00,0x00,0x51,0xab,0x07,0xcc}, 8333}, + {{0x20,0x02,0x05,0x27,0xde,0x11,0x00,0x00,0x00,0x00,0x00,0x00,0x05,0x27,0xde,0x11}, 8333}, + {{0x20,0x02,0x53,0x95,0x7d,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x53,0x95,0x7d,0x01}, 8333}, + {{0x20,0x02,0x53,0x95,0x7d,0x2a,0x00,0x00,0x00,0x00,0x00,0x00,0x53,0x95,0x7d,0x2a}, 8333}, + {{0x20,0x02,0x56,0x69,0xe3,0xbe,0x00,0x00,0x00,0x00,0x00,0x00,0x56,0x69,0xe3,0xbe}, 8333}, + {{0x20,0x02,0x56,0x6a,0x5d,0x6d,0x00,0x00,0x00,0x00,0x00,0x00,0x56,0x6a,0x5d,0x6d}, 8333}, + {{0x20,0x02,0x59,0xb9,0xf8,0x20,0x00,0x00,0x00,0x00,0x00,0x00,0x59,0xb9,0xf8,0x20}, 8333}, + {{0x20,0x02,0x59,0xf8,0xac,0x69,0x00,0x00,0x00,0x00,0x00,0x00,0x59,0xf8,0xac,0x69}, 8333}, + {{0x20,0x02,0x5b,0xd4,0xb6,0x5a,0x00,0x00,0x00,0x00,0x00,0x00,0x5b,0xd4,0xb6,0x5a}, 8333}, + {{0x20,0x02,0x5c,0x3f,0x39,0xdb,0x00,0x00,0x00,0x00,0x00,0x00,0x5c,0x3f,0x39,0xdb}, 8333}, + {{0x20,0x02,0x5d,0x33,0x8d,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x5d,0x33,0x8d,0x03}, 8333}, + {{0x20,0x02,0x5d,0x67,0x49,0xbb,0x00,0x00,0x00,0x00,0x00,0x00,0x5d,0x67,0x49,0xbb}, 8333}, + {{0x20,0x02,0x5d,0xae,0x5d,0x5f,0x00,0x00,0x00,0x00,0x00,0x00,0x5d,0xae,0x5d,0x5f}, 8333}, + {{0x20,0x02,0x5d,0xbe,0x8c,0xc6,0x00,0x00,0x00,0x00,0x00,0x00,0x5d,0xbe,0x8c,0xc6}, 8333}, + {{0x20,0x02,0x5d,0xbe,0x95,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x5d,0xbe,0x95,0x03}, 8333}, + {{0x20,0x02,0x5f,0xd3,0x89,0x44,0x00,0x00,0x00,0x00,0x00,0x00,0x5f,0xd3,0x89,0x44}, 8333}, + {{0x20,0x02,0x5f,0xd3,0x94,0x67,0x00,0x00,0x00,0x00,0x00,0x00,0x5f,0xd3,0x94,0x67}, 8333}, + {{0x20,0x02,0x67,0xf9,0x6a,0x48,0x00,0x00,0x00,0x00,0x00,0x00,0x67,0xf9,0x6a,0x48}, 8333}, + {{0x20,0x02,0x67,0xf9,0x6a,0x4a,0x00,0x00,0x00,0x00,0x00,0x00,0x67,0xf9,0x6a,0x4a}, 8333}, + {{0x20,0x02,0x67,0xf9,0x6a,0x95,0x00,0x00,0x00,0x00,0x00,0x00,0x67,0xf9,0x6a,0x95}, 8333}, + {{0x20,0x02,0x6a,0x0e,0x3e,0xa8,0x00,0x00,0x00,0x00,0x00,0x00,0x6a,0x0e,0x3e,0xa8}, 10011}, + {{0x20,0x02,0x6b,0x96,0x37,0x5a,0x00,0x00,0x00,0x00,0x00,0x00,0x6b,0x96,0x37,0x5a}, 8333}, + {{0x20,0x02,0x6c,0xa8,0xcf,0xfb,0x00,0x00,0x00,0x00,0x00,0x00,0x6c,0xa8,0xcf,0xfb}, 8333}, + {{0x20,0x02,0x6c,0xaf,0x02,0x34,0x00,0x00,0x00,0x00,0x00,0x00,0x6c,0xaf,0x02,0x34}, 8333}, + {{0x20,0x02,0x6d,0xec,0x58,0xf5,0x00,0x00,0x00,0x00,0x00,0x00,0x6d,0xec,0x58,0xf5}, 8333}, + {{0x20,0x02,0x6d,0xec,0x5a,0xc7,0x00,0x00,0x00,0x00,0x00,0x00,0x6d,0xec,0x5a,0xc7}, 8333}, + {{0x20,0x02,0x72,0x37,0x4a,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x72,0x37,0x4a,0x02}, 20033}, + {{0x20,0x02,0x72,0x37,0x94,0xfd,0x00,0x00,0x00,0x00,0x00,0x00,0x72,0x37,0x94,0xfd}, 10011}, + {{0x20,0x02,0x72,0x37,0xe4,0x28,0x00,0x00,0x00,0x00,0x00,0x00,0x72,0x37,0xe4,0x28}, 8333}, + {{0x20,0x02,0x72,0x37,0xfc,0xf6,0x00,0x00,0x00,0x00,0x00,0x00,0x72,0x37,0xfc,0xf6}, 20188}, + {{0x20,0x02,0x76,0xc0,0x96,0xe6,0x00,0x00,0x00,0x00,0x00,0x00,0x76,0xc0,0x96,0xe6}, 8333}, + {{0x20,0x02,0x78,0x19,0x7e,0x80,0x00,0x00,0x00,0x00,0x00,0x00,0x78,0x19,0x7e,0x80}, 7743}, + {{0x20,0x02,0x78,0x1a,0xea,0x86,0x00,0x00,0x00,0x00,0x00,0x00,0x78,0x1a,0xea,0x86}, 8333}, + {{0x20,0x02,0x78,0x1a,0xf3,0xc2,0x00,0x00,0x00,0x00,0x00,0x00,0x78,0x1a,0xf3,0xc2}, 14475}, + {{0x20,0x02,0x78,0x4c,0xc2,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x78,0x4c,0xc2,0xc0}, 8333}, + {{0x20,0x02,0x78,0x4c,0xec,0x97,0x00,0x00,0x00,0x00,0x00,0x00,0x78,0x4c,0xec,0x97}, 8333}, + {{0x20,0x02,0x79,0x2b,0x26,0x1a,0x00,0x00,0x00,0x00,0x00,0x00,0x79,0x2b,0x26,0x1a}, 8333}, + {{0x20,0x02,0x88,0xf3,0x8c,0xca,0x00,0x00,0x00,0x00,0x00,0x00,0x88,0xf3,0x8c,0xca}, 8333}, + {{0x20,0x02,0x88,0xf3,0xa8,0x3c,0x00,0x00,0x00,0x00,0x00,0x00,0x88,0xf3,0xa8,0x3c}, 8333}, + {{0x20,0x02,0x8a,0xc9,0x51,0x6f,0x00,0x00,0x00,0x00,0x00,0x00,0x8a,0xc9,0x51,0x6f}, 8333}, + {{0x20,0x02,0x8b,0x81,0x6d,0x78,0x00,0x00,0x00,0x00,0x00,0x00,0x8b,0x81,0x6d,0x78}, 50344}, + {{0x20,0x02,0x8b,0x81,0x6e,0x5c,0x00,0x00,0x00,0x00,0x00,0x00,0x8b,0x81,0x6e,0x5c}, 38176}, + {{0x20,0x02,0x8b,0xc4,0x90,0xa6,0x00,0x00,0x00,0x00,0x00,0x00,0x8b,0xc4,0x90,0xa6}, 8333}, + {{0x20,0x02,0xac,0x52,0xb8,0x54,0x00,0x00,0x00,0x00,0x00,0x00,0xac,0x52,0xb8,0x54}, 8333}, + {{0x20,0x02,0xad,0xd0,0xc1,0x4a,0x00,0x00,0x00,0x00,0x00,0x00,0xad,0xd0,0xc1,0x4a}, 8333}, + {{0x20,0x02,0xb0,0x7e,0xa7,0x0a,0x00,0x00,0x00,0x00,0x00,0x00,0xb0,0x7e,0xa7,0x0a}, 8333}, + {{0x20,0x02,0xb2,0x7c,0xc5,0x65,0x00,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x02,0x50}, 8333}, + {{0x20,0x02,0xb2,0x7c,0xc5,0x65,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, + {{0x20,0x02,0xb9,0x4d,0x80,0xf1,0x00,0x00,0x00,0x00,0x00,0x00,0xb9,0x4d,0x80,0xf1}, 8333}, + {{0x20,0x02,0xb9,0x82,0xe2,0x6a,0x00,0x00,0x00,0x00,0x00,0x00,0xb9,0x82,0xe2,0x6a}, 8333}, + {{0x20,0x02,0xbc,0xd5,0x31,0x45,0x00,0x00,0x00,0x00,0x00,0x00,0xbc,0xd5,0x31,0x45}, 8333}, + {{0x20,0x02,0xc0,0x8a,0xd2,0x2b,0x00,0x00,0x00,0x00,0x00,0x00,0xc0,0x8a,0xd2,0x2b}, 8333}, + {{0x20,0x02,0xc0,0xc7,0xf8,0xe3,0x00,0x00,0x00,0x00,0x00,0x00,0xc0,0xc7,0xf8,0xe3}, 32771}, + {{0x20,0x02,0xc1,0xa9,0xfc,0x5a,0x00,0x00,0x00,0x00,0x00,0x00,0xc1,0xa9,0xfc,0x5a}, 8333}, + {{0x20,0x02,0xc2,0x3f,0x8f,0xc5,0x00,0x00,0x00,0x00,0x00,0x00,0xc2,0x3f,0x8f,0xc5}, 8333}, + {{0x20,0x02,0xd3,0x95,0xea,0x6d,0x00,0x00,0x00,0x00,0x00,0x00,0xd3,0x95,0xea,0x6d}, 8333}, {{0x20,0x02,0xd9,0x17,0x0c,0xa5,0x00,0x00,0x00,0x00,0x00,0x00,0xd9,0x17,0x0c,0xa5}, 8333}, - {{0x24,0x00,0x89,0x00,0x00,0x00,0x00,0x00,0xf0,0x3c,0x91,0xff,0xfe,0x50,0x15,0x3f}, 8333}, - {{0x24,0x00,0x89,0x00,0x00,0x00,0x00,0x00,0xf0,0x3c,0x91,0xff,0xfe,0x6e,0x82,0x3e}, 8333}, - {{0x24,0x00,0x89,0x00,0x00,0x00,0x00,0x00,0xf0,0x3c,0x91,0xff,0xfe,0xa8,0x19,0x34}, 8333}, - {{0x24,0x00,0x89,0x01,0x00,0x00,0x00,0x00,0xf0,0x3c,0x91,0xff,0xfe,0x26,0xc4,0xd6}, 8333}, + {{0x20,0x02,0xd9,0x17,0x0e,0x91,0x00,0x00,0x00,0x00,0x00,0x00,0xd9,0x17,0x0e,0x91}, 8333}, + {{0x20,0x02,0xdb,0x71,0xf4,0x34,0x00,0x00,0x00,0x00,0x00,0x00,0xdb,0x71,0xf4,0x34}, 8333}, + {{0x24,0x00,0x26,0x51,0x01,0x61,0x10,0x00,0x68,0x47,0xd4,0x0f,0xaa,0xa3,0x48,0x48}, 8333}, {{0x24,0x00,0x89,0x01,0x00,0x00,0x00,0x00,0xf0,0x3c,0x91,0xff,0xfe,0xc8,0x42,0x80}, 8333}, - {{0x24,0x00,0x89,0x01,0x00,0x00,0x00,0x00,0xf0,0x3c,0x91,0xff,0xfe,0xc8,0x66,0x0f}, 8333}, - {{0x24,0x01,0x18,0x00,0x78,0x00,0x01,0x02,0xbe,0x76,0x4e,0xff,0xfe,0x1c,0x05,0x59}, 8333}, {{0x24,0x01,0x18,0x00,0x78,0x00,0x01,0x02,0xbe,0x76,0x4e,0xff,0xfe,0x1c,0x0a,0x7d}, 8333}, + {{0x24,0x01,0x25,0x00,0x02,0x03,0x00,0x10,0x01,0x53,0x01,0x20,0x01,0x56,0x00,0x83}, 8333}, + {{0x24,0x01,0xa4,0x00,0x32,0x00,0x56,0x00,0x14,0xee,0xf3,0x61,0x4b,0xdc,0x1f,0x7c}, 8333}, + {{0x24,0x03,0x42,0x00,0x04,0x03,0x00,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff}, 8333}, {{0x24,0x05,0xaa,0x00,0x00,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x40}, 8333}, - {{0x26,0x00,0x3c,0x00,0x00,0x00,0x00,0x00,0xf0,0x3c,0x91,0xff,0xfe,0x18,0x59,0xb2}, 8333}, - {{0x26,0x00,0x3c,0x00,0x00,0x00,0x00,0x00,0xf0,0x3c,0x91,0xff,0xfe,0x26,0xbf,0xb6}, 8333}, - {{0x26,0x00,0x3c,0x00,0x00,0x00,0x00,0x00,0xf0,0x3c,0x91,0xff,0xfe,0x33,0x88,0xe3}, 8333}, - {{0x26,0x00,0x3c,0x00,0x00,0x00,0x00,0x00,0xf0,0x3c,0x91,0xff,0xfe,0x6e,0x72,0x97}, 8333}, - {{0x26,0x00,0x3c,0x00,0x00,0x00,0x00,0x00,0xf0,0x3c,0x91,0xff,0xfe,0x84,0x8a,0x6e}, 8333}, + {{0x24,0x0b,0x00,0x10,0xca,0x20,0x00,0xf0,0x02,0x24,0xe8,0xff,0xfe,0x1f,0x60,0xd9}, 8333}, + {{0x24,0x0b,0x02,0x50,0x01,0xe0,0x24,0x00,0xb9,0xef,0x8f,0xe3,0xa6,0x9a,0x73,0x78}, 8333}, + {{0x24,0x0d,0x00,0x1a,0x03,0x02,0x86,0x00,0x88,0x76,0xa3,0x6d,0x12,0xee,0xf2,0x85}, 8333}, + {{0x26,0x00,0x3c,0x00,0x00,0x00,0x00,0x00,0xf0,0x3c,0x91,0xff,0xfe,0x91,0x3e,0x49}, 8333}, + {{0x26,0x00,0x3c,0x00,0x00,0x00,0x00,0x00,0xf0,0x3c,0x91,0xff,0xfe,0xbb,0x98,0x1e}, 8333}, {{0x26,0x00,0x3c,0x01,0x00,0x00,0x00,0x00,0xf0,0x3c,0x91,0xff,0xfe,0x18,0x6a,0xdf}, 8333}, - {{0x26,0x00,0x3c,0x01,0x00,0x00,0x00,0x00,0xf0,0x3c,0x91,0xff,0xfe,0x26,0xc4,0xb8}, 8333}, - {{0x26,0x00,0x3c,0x01,0x00,0x00,0x00,0x00,0xf0,0x3c,0x91,0xff,0xfe,0x3b,0x1f,0x76}, 8333}, - {{0x26,0x00,0x3c,0x01,0x00,0x00,0x00,0x00,0xf0,0x3c,0x91,0xff,0xfe,0x50,0x5e,0x06}, 8333}, - {{0x26,0x00,0x3c,0x01,0x00,0x00,0x00,0x00,0xf0,0x3c,0x91,0xff,0xfe,0x61,0x28,0x9b}, 8333}, {{0x26,0x00,0x3c,0x01,0x00,0x00,0x00,0x00,0xf0,0x3c,0x91,0xff,0xfe,0x69,0x89,0xe9}, 8333}, - {{0x26,0x00,0x3c,0x01,0x00,0x00,0x00,0x00,0xf0,0x3c,0x91,0xff,0xfe,0x84,0xac,0x15}, 8333}, - {{0x26,0x00,0x3c,0x01,0x00,0x00,0x00,0x00,0xf0,0x3c,0x91,0xff,0xfe,0x98,0x68,0xbb}, 8333}, - {{0x26,0x00,0x3c,0x02,0x00,0x00,0x00,0x00,0xf0,0x3c,0x91,0xff,0xfe,0x26,0x07,0x13}, 8333}, - {{0x26,0x00,0x3c,0x02,0x00,0x00,0x00,0x00,0xf0,0x3c,0x91,0xff,0xfe,0x26,0xc4,0x9e}, 8333}, - {{0x26,0x00,0x3c,0x02,0x00,0x00,0x00,0x00,0xf0,0x3c,0x91,0xff,0xfe,0x84,0x97,0xd8}, 8333}, - {{0x26,0x00,0x3c,0x02,0x00,0x00,0x00,0x00,0xf0,0x3c,0x91,0xff,0xfe,0xc8,0x8f,0xeb}, 8333}, + {{0x26,0x00,0x3c,0x01,0x00,0x00,0x00,0x00,0xf0,0x3c,0x91,0xff,0xfe,0x91,0x6a,0x29}, 8333}, + {{0x26,0x00,0x3c,0x01,0x00,0x00,0x00,0x00,0xf0,0x3c,0x91,0xff,0xfe,0xf1,0x1e,0xaa}, 8333}, {{0x26,0x00,0x3c,0x03,0x00,0x00,0x00,0x00,0xf0,0x3c,0x91,0xff,0xfe,0x18,0xda,0x80}, 8333}, - {{0x26,0x00,0x3c,0x03,0x00,0x00,0x00,0x00,0xf0,0x3c,0x91,0xff,0xfe,0x26,0xc4,0x9b}, 8333}, - {{0x26,0x00,0x3c,0x03,0x00,0x00,0x00,0x00,0xf0,0x3c,0x91,0xff,0xfe,0x50,0x5f,0xa7}, 8333}, + {{0x26,0x00,0x3c,0x03,0x00,0x00,0x00,0x00,0xf0,0x3c,0x91,0xff,0xfe,0x28,0x14,0x45}, 8333}, {{0x26,0x00,0x3c,0x03,0x00,0x00,0x00,0x00,0xf0,0x3c,0x91,0xff,0xfe,0x67,0x0d,0x2e}, 8333}, - {{0x26,0x00,0x3c,0x03,0x00,0x00,0x00,0x00,0xf0,0x3c,0x91,0xff,0xfe,0x6e,0x18,0x03}, 8333}, - {{0x26,0x00,0x3c,0x03,0x00,0x00,0x00,0x00,0xf0,0x3c,0x91,0xff,0xfe,0xc8,0x4b,0xbe}, 8333}, - {{0x26,0x00,0x3c,0x03,0x00,0x00,0x00,0x00,0xf0,0x3c,0x91,0xff,0xfe,0xe4,0x4e,0x16}, 8333}, - {{0x26,0x01,0x01,0x8d,0x83,0x00,0x58,0xa6,0x00,0x00,0x00,0x00,0x00,0x00,0x02,0xe4}, 8333}, - {{0x26,0x01,0x02,0x40,0x46,0x00,0x40,0xc0,0x02,0x50,0x56,0xff,0xfe,0xa4,0x63,0x05}, 8333}, - {{0x26,0x01,0x05,0x81,0xc2,0x00,0xa7,0x19,0x54,0x2c,0x9c,0xd5,0x48,0x52,0xf7,0xd9}, 8333}, - {{0x26,0x01,0x06,0x47,0x49,0x00,0x85,0xf1,0xca,0x2a,0x14,0xff,0xfe,0x51,0xbb,0x35}, 8333}, - {{0x26,0x01,0x00,0xc2,0xc0,0x02,0xb3,0x00,0x54,0xa0,0x15,0xb5,0x19,0xf7,0x53,0x0d}, 8333}, - {{0x26,0x02,0x03,0x06,0xcc,0xff,0xad,0x7f,0xb1,0x16,0x52,0xbe,0x64,0xba,0xdb,0x3a}, 8333}, - {{0x26,0x02,0x00,0xae,0x19,0x82,0x94,0x00,0x08,0x46,0xf7,0x8c,0x0f,0xec,0x4d,0x57}, 8333}, + {{0x26,0x00,0x3c,0x03,0x00,0x00,0x00,0x00,0xf0,0x3c,0x91,0xff,0xfe,0x89,0x11,0x6f}, 8333}, + {{0x26,0x00,0x3c,0x03,0x00,0x00,0x00,0x00,0xf0,0x3c,0x91,0xff,0xfe,0xb0,0x5f,0xc4}, 8333}, + {{0x26,0x00,0x3c,0x03,0x00,0x00,0x00,0x00,0xf0,0x3c,0x91,0xff,0xfe,0xe0,0x23,0x3e}, 8333}, + {{0x26,0x00,0x3c,0x03,0x00,0x00,0x00,0x00,0xf0,0x3c,0x91,0xff,0xfe,0xe0,0x00,0x51}, 8333}, + {{0x26,0x00,0x88,0x05,0x24,0x00,0x01,0x4e,0x02,0x26,0x4a,0xff,0xfe,0x02,0x2b,0xa4}, 8333}, + {{0x26,0x00,0x88,0x07,0x50,0x80,0x33,0x01,0x14,0x87,0x83,0xb7,0x33,0xd7,0xeb,0x97}, 8333}, + {{0x26,0x01,0x01,0x86,0xc1,0x00,0x6b,0xcd,0x16,0xbd,0xce,0xa1,0x23,0x5d,0x1c,0x19}, 8333}, + {{0x26,0x01,0x01,0x8c,0x42,0x00,0x28,0xd0,0x0e,0x4d,0xe9,0xff,0xfe,0xc5,0x76,0xd0}, 8333}, + {{0x26,0x01,0x02,0x47,0x82,0x01,0x62,0x51,0x30,0xe6,0x7b,0x95,0x69,0xbf,0x92,0x48}, 8333}, + {{0x26,0x01,0x06,0x02,0x99,0x80,0x0f,0x78,0x02,0x11,0x11,0xff,0xfe,0xc5,0x01,0xae}, 8333}, + {{0x26,0x02,0x00,0xae,0x19,0x93,0xde,0x00,0x2c,0x50,0x9a,0x44,0x8f,0x11,0x77,0xa5}, 8333}, + {{0x26,0x02,0xff,0x68,0x00,0x00,0x00,0x01,0x02,0x1e,0x0b,0xff,0xfe,0xca,0xdb,0x72}, 8333}, + {{0x26,0x02,0xff,0x68,0x00,0x00,0x00,0x01,0x02,0xbd,0x27,0xff,0xfe,0xb0,0xad,0xf8}, 8333}, + {{0x26,0x02,0xff,0x68,0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x05}, 8333}, + {{0x26,0x02,0xff,0x68,0x00,0x00,0x00,0x05,0x02,0xbd,0x27,0xff,0xfe,0xb0,0xad,0xf8}, 8333}, {{0x26,0x02,0xff,0xc5,0x00,0x1f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x1f,0x2d,0x61}, 8333}, {{0x26,0x02,0xff,0xc5,0x00,0x1f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x1f,0x92,0x11}, 8333}, - {{0x26,0x02,0xff,0xc5,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x75,0xd5,0xc1,0xc3}, 8333}, + {{0x26,0x02,0xff,0xc5,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x9e,0x63,0x27,0xa2}, 8333}, + {{0x26,0x02,0xff,0xc5,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x0c,0x30,0x1c,0x75}, 8333}, {{0x26,0x02,0xff,0xc5,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xc5,0xb8,0x44}, 8333}, {{0x26,0x02,0xff,0xe8,0x01,0x00,0x00,0x02,0x00,0x00,0x00,0x00,0x04,0x57,0x93,0x6b}, 8333}, - {{0x26,0x02,0xff,0xe8,0x01,0x00,0x00,0x02,0x00,0x00,0x00,0x00,0x9d,0x20,0x2e,0x3c}, 8333}, - {{0x26,0x02,0xff,0xea,0x10,0x01,0x07,0x2b,0x00,0x00,0x00,0x00,0x00,0x00,0x57,0x8b}, 8333}, - {{0x26,0x02,0xff,0xea,0x00,0x0a,0x00,0x00,0x00,0x00,0x00,0x00,0x24,0xc4,0xd9,0xfd}, 8333}, - {{0x26,0x04,0x00,0x00,0x00,0xc1,0x01,0x00,0x1e,0xc1,0xde,0xff,0xfe,0x54,0x22,0x35}, 8333}, - {{0x26,0x04,0x01,0x80,0x00,0x01,0x01,0xaf,0x00,0x00,0x00,0x00,0x00,0x00,0x42,0xa9}, 8333}, - {{0x26,0x04,0x01,0x80,0x00,0x03,0x07,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0xc9,0xde}, 8333}, - {{0x26,0x04,0x40,0x80,0x11,0x14,0x00,0x00,0x32,0x85,0xa9,0xff,0xfe,0x93,0x85,0x0c}, 8333}, - {{0x26,0x04,0x60,0x00,0xff,0xc0,0x00,0x3c,0x64,0xa3,0x94,0xd0,0x4f,0x1d,0x1d,0xa8}, 8333}, - {{0x26,0x05,0x60,0x00,0xf3,0x80,0x9a,0x01,0xba,0x09,0x8a,0xff,0xfe,0xd4,0x35,0x11}, 8333}, - {{0x26,0x05,0x60,0x01,0xe0,0x0f,0x7b,0x00,0xc5,0x87,0x6d,0x91,0x6e,0xff,0xee,0xba}, 8333}, - {{0x26,0x05,0xf7,0x00,0x00,0xc0,0x00,0x01,0x00,0x00,0x00,0x00,0x25,0xc3,0x2a,0x3e}, 8333}, - {{0x26,0x06,0x60,0x00,0xa4,0x41,0x99,0x03,0x50,0x54,0x00,0xff,0xfe,0x78,0x66,0xff}, 8333}, - {{0x26,0x07,0x53,0x00,0x01,0x00,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x1c,0x83}, 9334}, - {{0x26,0x07,0x53,0x00,0x00,0x10,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xa1}, 8333}, - {{0x26,0x07,0x53,0x00,0x00,0x60,0x1c,0x2f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, - {{0x26,0x07,0x53,0x00,0x00,0x60,0x2b,0x90,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, - {{0x26,0x07,0x53,0x00,0x00,0x60,0x33,0x20,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, - {{0x26,0x07,0x53,0x00,0x00,0x60,0x03,0x85,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, - {{0x26,0x07,0x53,0x00,0x00,0x60,0x4a,0x85,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, 8333}, - {{0x26,0x07,0x53,0x00,0x00,0x60,0x65,0xe4,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, 8333}, - {{0x26,0x07,0x53,0x00,0x00,0x60,0x69,0x18,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, 8333}, - {{0x26,0x07,0x53,0x00,0x00,0x60,0x71,0x1a,0x00,0x78,0x00,0x00,0x00,0x00,0xa7,0xb5}, 8333}, - {{0x26,0x07,0x53,0x00,0x00,0x60,0x07,0x14,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, - {{0x26,0x07,0x53,0x00,0x00,0x60,0x08,0x70,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, - {{0x26,0x07,0x53,0x00,0x00,0x60,0x95,0x2e,0x37,0x33,0x00,0x00,0x00,0x00,0x14,0x14}, 8333}, - {{0x26,0x07,0xf1,0xc0,0x08,0x48,0x10,0x00,0x00,0x00,0x00,0x00,0x00,0x48,0x94,0x3c}, 8333}, - {{0x26,0x07,0xf2,0xe0,0x00,0x0f,0x05,0xdf,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, - {{0x26,0x07,0xf7,0x48,0x12,0x00,0x00,0xf8,0x02,0x1e,0x67,0xff,0xfe,0x99,0x8f,0x07}, 8333}, - {{0x26,0x07,0xf9,0x48,0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x07}, 8333}, - {{0x26,0x07,0xff,0x68,0x01,0x00,0x00,0x36,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x31}, 8333}, - {{0x28,0x03,0x69,0x00,0x00,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x17}, 8333}, - {{0x2a,0x00,0x10,0x98,0x00,0x00,0x00,0x80,0x10,0x00,0x00,0x25,0x00,0x00,0x00,0x01}, 8333}, - {{0x2a,0x00,0x11,0x78,0x00,0x02,0x00,0x43,0x50,0x54,0x00,0xff,0xfe,0x84,0xf8,0x6f}, 8333}, - {{0x2a,0x00,0x11,0x78,0x00,0x02,0x00,0x43,0x50,0x54,0x00,0xff,0xfe,0xe7,0x2e,0xb6}, 8333}, - {{0x2a,0x00,0x11,0x78,0x00,0x02,0x00,0x43,0x89,0x83,0xcc,0x27,0x0d,0x72,0xd9,0x7a}, 8333}, - {{0x2a,0x00,0x13,0x28,0xe1,0x00,0xcc,0x42,0x02,0x30,0x48,0xff,0xfe,0x92,0x05,0x5c}, 8333}, + {{0x26,0x04,0x01,0x80,0x00,0x02,0x0e,0xee,0x00,0x00,0x00,0x00,0x00,0x00,0xca,0x46}, 8333}, + {{0x26,0x04,0x08,0x80,0x00,0x0d,0x00,0x85,0x00,0x00,0x00,0x00,0x00,0x00,0xbe,0x37}, 8333}, + {{0x26,0x04,0x9a,0x00,0x21,0x00,0xa0,0x09,0x00,0x02,0x00,0x00,0x00,0x00,0x00,0x00}, 8333}, + {{0x26,0x04,0xa8,0x80,0x00,0x02,0x00,0xd0,0x00,0x00,0x00,0x00,0x03,0x01,0x80,0x01}, 8333}, + {{0x26,0x04,0xa8,0x80,0x00,0x02,0x00,0xd0,0x00,0x00,0x00,0x00,0x04,0xa9,0x10,0x01}, 8333}, + {{0x26,0x04,0xa8,0x80,0x00,0x02,0x00,0xd0,0x00,0x00,0x00,0x00,0x05,0x3a,0xc0,0x01}, 8333}, + {{0x26,0x04,0xa8,0x80,0x04,0x00,0x00,0xd0,0x00,0x00,0x00,0x00,0x0a,0xd7,0xe0,0x01}, 8333}, + {{0x26,0x04,0xa8,0x80,0x04,0x00,0x00,0xd0,0x00,0x00,0x00,0x00,0x0d,0xcf,0xf0,0x01}, 8333}, + {{0x26,0x05,0x4d,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x50}, 8333}, + {{0x26,0x05,0x60,0x00,0xed,0xc8,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xdd,0xfe}, 8333}, + {{0x26,0x05,0x60,0x00,0xff,0xc0,0x00,0x70,0x74,0xd5,0x22,0x5c,0xf5,0x53,0x5b,0xb8}, 8333}, + {{0x26,0x06,0x60,0x00,0xc1,0x48,0x70,0x03,0x50,0x54,0x00,0xff,0xfe,0x78,0x66,0xff}, 8333}, + {{0x26,0x06,0x60,0x00,0xe6,0xd6,0xd7,0x01,0xd4,0x28,0x5e,0x44,0xa2,0xc9,0x3f,0xf6}, 8333}, + {{0x26,0x06,0xc6,0x80,0x00,0x01,0x00,0x4a,0x20,0x16,0xd1,0xff,0xfe,0x93,0x52,0xa7}, 8333}, + {{0x26,0x07,0x53,0x00,0x02,0x03,0x01,0x18,0x37,0x33,0x00,0x00,0x00,0x00,0x14,0x14}, 8333}, + {{0x26,0x07,0x53,0x00,0x00,0x60,0x13,0xbb,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, + {{0x26,0x07,0x53,0x00,0x00,0x60,0x19,0x66,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, + {{0x26,0x07,0x53,0x00,0x00,0x60,0x22,0x18,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, 8333}, + {{0x26,0x07,0x53,0x00,0x00,0x60,0x37,0x75,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, 8333}, + {{0x26,0x07,0x53,0x00,0x00,0x60,0x3d,0xdf,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, 8333}, + {{0x26,0x07,0x53,0x00,0x00,0x60,0xa6,0x54,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, 8333}, + {{0x26,0x07,0x53,0x00,0x00,0x60,0xa7,0xa3,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, 8333}, + {{0x26,0x07,0x53,0x00,0x00,0x60,0x0a,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, + {{0x26,0x07,0x53,0x00,0x00,0x60,0xcf,0x97,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, 8333}, + {{0x26,0x07,0xf0,0xd0,0x19,0x01,0x00,0x19,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x06}, 8333}, + {{0x26,0x07,0xf1,0x28,0x00,0x40,0x12,0x02,0x00,0x69,0x01,0x62,0x01,0x39,0x01,0x25}, 8333}, + {{0x26,0x07,0xf1,0x28,0x00,0x40,0x17,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, + {{0x26,0x07,0xf1,0x78,0x00,0x00,0x00,0x08,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x06}, 8333}, + {{0x26,0x07,0xf1,0xc0,0x08,0x4d,0x89,0x00,0x00,0x00,0x00,0x00,0x00,0x7e,0x0c,0xad}, 8333}, + {{0x26,0x07,0xf9,0x48,0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x00,0x00,0x01,0x00,0x40}, 8333}, + {{0x26,0x07,0xfc,0xd0,0x01,0x00,0x23,0x02,0x00,0x00,0x00,0x00,0x60,0x94,0x63,0x5a}, 8333}, + {{0x26,0x07,0xfc,0xd0,0x01,0x00,0x6a,0x00,0x00,0x00,0x00,0x00,0x3a,0x96,0x00,0x01}, 8333}, + {{0x26,0x07,0xfc,0xd0,0x01,0x00,0x6a,0x02,0x00,0x00,0x00,0x00,0x7f,0xf0,0x00,0x01}, 8333}, + {{0x26,0x07,0xfc,0xd0,0x01,0x00,0x82,0x03,0x00,0x00,0x00,0x00,0x8c,0x58,0x0d,0xbc}, 8333}, + {{0x26,0x07,0xfe,0xa8,0x13,0x60,0x09,0xc2,0x22,0x1a,0x06,0xff,0xfe,0x47,0x77,0x6d}, 8333}, + {{0x26,0x07,0xfe,0xa8,0x4d,0xa0,0x09,0xce,0x51,0x14,0xa8,0xec,0x20,0xf5,0xa5,0x0b}, 8333}, + {{0x26,0x07,0xfe,0xa8,0x05,0xdf,0xfd,0xa0,0xfe,0xaa,0x14,0xff,0xfe,0xda,0xc7,0x9a}, 8333}, + {{0x26,0x07,0xfe,0xa8,0x84,0xc0,0x01,0x63,0xf4,0x2c,0xba,0xff,0xfe,0xcc,0x6b,0xbf}, 8333}, + {{0x26,0x07,0xff,0x10,0x00,0xc5,0x05,0x02,0x02,0x25,0x90,0xff,0xfe,0x32,0xd4,0x46}, 8333}, + {{0x26,0x07,0xff,0x48,0xaa,0x81,0x08,0x00,0x00,0x00,0x00,0x00,0x96,0xcf,0x00,0x01}, 8333}, + {{0x26,0x20,0x01,0x1c,0x50,0x01,0x11,0x18,0xd2,0x67,0xe5,0xff,0xfe,0xe9,0xe6,0x73}, 8333}, + {{0x26,0x20,0x00,0xb8,0x40,0x00,0x10,0x00,0x00,0x00,0x00,0x00,0x00,0x93,0x00,0x01}, 8333}, + {{0x28,0x00,0x01,0xa0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x09}, 8333}, + {{0x2a,0x00,0x11,0x78,0x00,0x02,0x00,0x43,0x19,0xfd,0xd4,0x3e,0x0b,0x77,0xed,0xeb}, 8333}, + {{0x2a,0x00,0x11,0x78,0x00,0x02,0x00,0x43,0xb4,0xe3,0xe5,0x62,0xf8,0x11,0xd7,0x61}, 8333}, {{0x2a,0x00,0x14,0xf0,0xe0,0x00,0x80,0xd2,0xcd,0x1a,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, + {{0x2a,0x00,0x16,0x30,0x00,0x14,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x01}, 8333}, {{0x2a,0x00,0x16,0x30,0x00,0x02,0x18,0x02,0x01,0x88,0x01,0x22,0x00,0x91,0x00,0x11}, 8333}, - {{0x2a,0x00,0x18,0xe0,0x00,0x00,0x18,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, - {{0x2a,0x00,0x18,0xe0,0x00,0x00,0xdc,0xc5,0x01,0x09,0x02,0x34,0x01,0x06,0x01,0x91}, 8333}, - {{0x2a,0x00,0x1a,0x28,0x11,0x57,0x00,0x87,0x00,0x00,0x00,0x00,0x00,0x00,0x94,0xc7}, 8333}, + {{0x2a,0x00,0x16,0x30,0x00,0x02,0x05,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x04}, 8333}, + {{0x2a,0x00,0x17,0x68,0x20,0x01,0x00,0x24,0x00,0x00,0x00,0x00,0x01,0x48,0x02,0x18}, 8333}, + {{0x2a,0x00,0x17,0x68,0x20,0x01,0x00,0x27,0x00,0x00,0x00,0x00,0x01,0x42,0x00,0x21}, 8333}, + {{0x2a,0x00,0x1a,0x48,0x78,0x10,0x01,0x01,0xbe,0x76,0x4e,0xff,0xfe,0x08,0xc7,0x74}, 8333}, {{0x2a,0x00,0x1c,0xa8,0x00,0x37,0x00,0x00,0x00,0x00,0x00,0x00,0xa5,0xfc,0x40,0xd1}, 8333}, {{0x2a,0x00,0x1c,0xa8,0x00,0x37,0x00,0x00,0x00,0x00,0x00,0x00,0xab,0x6d,0xce,0x2c}, 8333}, - {{0x2a,0x00,0x71,0x43,0x01,0x00,0x00,0x00,0x02,0x16,0x3e,0xff,0xfe,0x2e,0x74,0xa3}, 8333}, - {{0x2a,0x00,0x71,0x43,0x01,0x00,0x00,0x00,0x02,0x16,0x3e,0xff,0xfe,0xd3,0x5c,0x21}, 8333}, - {{0x2a,0x00,0x7c,0x80,0x00,0x00,0x00,0x45,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x23}, 8333}, + {{0x2a,0x00,0x1d,0xc0,0x22,0x55,0x00,0x10,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, + {{0x2a,0x00,0x7c,0x80,0x00,0x00,0x00,0x71,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x08}, 8333}, + {{0x2a,0x00,0x7c,0x80,0x00,0x00,0x00,0x97,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x07}, 8333}, + {{0x2a,0x00,0xbb,0xe0,0x00,0x00,0x00,0x42,0x02,0x22,0x64,0xff,0xfe,0x9a,0xe2,0x06}, 8333}, + {{0x2a,0x00,0x0c,0x98,0x20,0x50,0xa0,0x20,0x00,0x03,0x00,0x00,0x00,0x00,0x01,0x10}, 8333}, + {{0x2a,0x00,0xdc,0xc0,0x0e,0xda,0x00,0x98,0x01,0x83,0x01,0x93,0x1d,0x24,0xb5,0x3a}, 8333}, {{0x2a,0x00,0xdc,0xc0,0x0e,0xda,0x00,0x98,0x01,0x83,0x01,0x93,0xc3,0x82,0x6b,0xdb}, 8333}, {{0x2a,0x00,0xdc,0xc0,0x0e,0xda,0x00,0x98,0x01,0x83,0x01,0x93,0xf7,0x2e,0xd9,0x43}, 8333}, - {{0x2a,0x00,0xf8,0x20,0x00,0x17,0x00,0x00,0x00,0x00,0x00,0x00,0x04,0xaf,0x00,0x01}, 8333}, - {{0x2a,0x00,0xf9,0x40,0x00,0x02,0x00,0x01,0x00,0x02,0x00,0x00,0x00,0x00,0x10,0x1d}, 8333}, - {{0x2a,0x00,0xf9,0x40,0x00,0x02,0x00,0x01,0x00,0x02,0x00,0x00,0x00,0x00,0x06,0xac}, 8333}, - {{0x2a,0x01,0x01,0xb0,0x79,0x99,0x04,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x31}, 8333}, - {{0x2a,0x01,0x02,0x38,0x42,0xdd,0xf9,0x00,0x7a,0x6c,0x2b,0xc6,0x40,0x41,0x0c,0x43}, 8333}, - {{0x2a,0x01,0x02,0x38,0x43,0x13,0x63,0x00,0x21,0x89,0x1c,0x97,0x69,0x6b,0x05,0xea}, 8333}, - {{0x2a,0x01,0x04,0x88,0x00,0x66,0x10,0x00,0x5c,0x33,0x91,0xf9,0x00,0x00,0x00,0x01}, 8333}, - {{0x2a,0x01,0x04,0x88,0x00,0x66,0x10,0x00,0xb0,0x1c,0x17,0x8d,0x00,0x00,0x00,0x01}, 8333}, + {{0x2a,0x00,0x0f,0x90,0x0f,0xf0,0xc1,0x00,0x53,0xc4,0x97,0xa7,0x8b,0x59,0x79,0x6a}, 8333}, + {{0x2a,0x01,0x02,0x38,0x43,0x5c,0xde,0x00,0xb1,0x10,0x38,0xcf,0x19,0x2d,0x0b,0x2c}, 28333}, + {{0x2a,0x01,0x03,0x48,0x00,0x06,0x07,0xcf,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, + {{0x2a,0x01,0x03,0x68,0xe0,0x12,0x88,0x88,0x02,0x16,0x3e,0xff,0xfe,0x24,0x11,0x62}, 8333}, + {{0x2a,0x01,0x04,0x88,0x00,0x66,0x10,0x00,0x53,0xa9,0x02,0x2b,0x00,0x00,0x00,0x01}, 8333}, + {{0x2a,0x01,0x04,0x88,0x00,0x67,0x10,0x00,0x05,0x23,0xff,0xa7,0x00,0x00,0x00,0x01}, 8333}, + {{0x2a,0x01,0x04,0x88,0x00,0x67,0x10,0x00,0xb0,0x1c,0x33,0x79,0x00,0x00,0x00,0x01}, 8333}, {{0x2a,0x01,0x04,0xf8,0x01,0x00,0x34,0xce,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, - {{0x2a,0x01,0x04,0xf8,0x01,0x00,0x34,0xe4,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, {{0x2a,0x01,0x04,0xf8,0x01,0x00,0x44,0xe7,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, - {{0x2a,0x01,0x04,0xf8,0x01,0x00,0x51,0x0e,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, - {{0x2a,0x01,0x04,0xf8,0x01,0x00,0x51,0x28,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, - {{0x2a,0x01,0x04,0xf8,0x01,0x10,0x51,0x05,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, - {{0x2a,0x01,0x04,0xf8,0x01,0x10,0x51,0x6c,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, + {{0x2a,0x01,0x04,0xf8,0x01,0x0a,0x02,0xe4,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, + {{0x2a,0x01,0x04,0xf8,0x01,0x0a,0x03,0x4e,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, + {{0x2a,0x01,0x04,0xf8,0x01,0x0a,0x05,0x1d,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, + {{0x2a,0x01,0x04,0xf8,0x01,0x0a,0x06,0x22,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, + {{0x2a,0x01,0x04,0xf8,0x01,0x0a,0x08,0x5f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, + {{0x2a,0x01,0x04,0xf8,0x01,0x0a,0x08,0x64,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, + {{0x2a,0x01,0x04,0xf8,0x01,0x0a,0x0d,0x04,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, + {{0x2a,0x01,0x04,0xf8,0x01,0x10,0x33,0x4c,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, + {{0x2a,0x01,0x04,0xf8,0x01,0x10,0x53,0x6e,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, {{0x2a,0x01,0x04,0xf8,0x01,0x20,0x43,0xe4,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, - {{0x2a,0x01,0x04,0xf8,0x01,0x20,0x62,0xe6,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, {{0x2a,0x01,0x04,0xf8,0x01,0x20,0x70,0x2e,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, - {{0x2a,0x01,0x04,0xf8,0x01,0x20,0x82,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, - {{0x2a,0x01,0x04,0xf8,0x01,0x21,0x23,0x4d,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, - {{0x2a,0x01,0x04,0xf8,0x01,0x21,0x02,0x61,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, - {{0x2a,0x01,0x04,0xf8,0x01,0x30,0x11,0xea,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, + {{0x2a,0x01,0x04,0xf8,0x01,0x21,0x43,0x46,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, {{0x2a,0x01,0x04,0xf8,0x01,0x30,0x33,0x32,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, - {{0x2a,0x01,0x04,0xf8,0x01,0x30,0x40,0xab,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, - {{0x2a,0x01,0x04,0xf8,0x01,0x30,0x63,0x2c,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, - {{0x2a,0x01,0x04,0xf8,0x01,0x30,0x63,0x66,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, - {{0x2a,0x01,0x04,0xf8,0x01,0x30,0x93,0x4f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, + {{0x2a,0x01,0x04,0xf8,0x01,0x31,0x33,0xad,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, {{0x2a,0x01,0x04,0xf8,0x01,0x31,0x33,0xad,0xfe,0xa1,0x00,0x00,0x00,0x00,0x06,0x66}, 8333}, - {{0x2a,0x01,0x04,0xf8,0x01,0x40,0x21,0x95,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, - {{0x2a,0x01,0x04,0xf8,0x01,0x40,0x63,0x33,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, - {{0x2a,0x01,0x04,0xf8,0x01,0x40,0x93,0x0d,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, + {{0x2a,0x01,0x04,0xf8,0x01,0x40,0x31,0xb0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, + {{0x2a,0x01,0x04,0xf8,0x01,0x40,0x40,0x88,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, + {{0x2a,0x01,0x04,0xf8,0x01,0x40,0x93,0x1a,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, {{0x2a,0x01,0x04,0xf8,0x01,0x40,0x93,0xb0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, - {{0x2a,0x01,0x04,0xf8,0x01,0x41,0x11,0x67,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, + {{0x2a,0x01,0x04,0xf8,0x01,0x41,0x13,0xad,0x00,0x00,0x00,0x00,0x00,0x00,0xc4,0x51}, 8333}, {{0x2a,0x01,0x04,0xf8,0x01,0x41,0x01,0x86,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, - {{0x2a,0x01,0x04,0xf8,0x01,0x41,0x53,0xf0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, - {{0x2a,0x01,0x04,0xf8,0x01,0x50,0x33,0x6a,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, - {{0x2a,0x01,0x04,0xf8,0x01,0x50,0x72,0xee,0x00,0x00,0x00,0x00,0x00,0x00,0x42,0x02}, 8333}, - {{0x2a,0x01,0x04,0xf8,0x01,0x50,0x83,0x24,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 9001}, - {{0x2a,0x01,0x04,0xf8,0x01,0x51,0x21,0xca,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, - {{0x2a,0x01,0x04,0xf8,0x01,0x51,0x41,0xc2,0x00,0x00,0x54,0x04,0xa6,0x7e,0xf2,0x50}, 8333}, - {{0x2a,0x01,0x04,0xf8,0x01,0x51,0x51,0x28,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, + {{0x2a,0x01,0x04,0xf8,0x01,0x41,0x22,0xae,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, + {{0x2a,0x01,0x04,0xf8,0x01,0x41,0x32,0x2c,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, + {{0x2a,0x01,0x04,0xf8,0x01,0x50,0x11,0xd4,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, + {{0x2a,0x01,0x04,0xf8,0x01,0x50,0x44,0x0f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, + {{0x2a,0x01,0x04,0xf8,0x01,0x50,0x61,0xee,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, + {{0x2a,0x01,0x04,0xf8,0x01,0x50,0x72,0x6b,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, + {{0x2a,0x01,0x04,0xf8,0x01,0x51,0x30,0xc9,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 15000}, + {{0x2a,0x01,0x04,0xf8,0x01,0x51,0x41,0xa2,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, + {{0x2a,0x01,0x04,0xf8,0x01,0x51,0x41,0xcc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, {{0x2a,0x01,0x04,0xf8,0x01,0x51,0x52,0xc6,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x54}, 8333}, - {{0x2a,0x01,0x04,0xf8,0x01,0x51,0x63,0x47,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 9001}, - {{0x2a,0x01,0x04,0xf8,0x01,0x60,0x51,0x36,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, - {{0x2a,0x01,0x04,0xf8,0x01,0x60,0x72,0xc5,0x00,0x00,0x00,0x00,0x28,0x58,0xe1,0xc5}, 8333}, - {{0x2a,0x01,0x04,0xf8,0x01,0x60,0x72,0xc5,0x00,0x00,0x00,0x00,0x59,0x3b,0x60,0xd5}, 8333}, + {{0x2a,0x01,0x04,0xf8,0x01,0x51,0x60,0x0b,0x00,0x00,0x00,0x00,0x00,0x01,0x00,0x01}, 8333}, + {{0x2a,0x01,0x04,0xf8,0x01,0x51,0x71,0x75,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, + {{0x2a,0x01,0x04,0xf8,0x01,0x60,0x41,0xf0,0x00,0x00,0x00,0x00,0x00,0x01,0x00,0x33}, 8333}, + {{0x2a,0x01,0x04,0xf8,0x01,0x60,0x53,0x28,0x00,0x00,0x00,0x00,0x27,0xf0,0x18,0x7a}, 8333}, {{0x2a,0x01,0x04,0xf8,0x01,0x60,0x81,0x4f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, - {{0x2a,0x01,0x04,0xf8,0x01,0x61,0x13,0xd0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, - {{0x2a,0x01,0x04,0xf8,0x01,0x61,0x22,0x8f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, - {{0x2a,0x01,0x04,0xf8,0x01,0x61,0x51,0xc4,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, - {{0x2a,0x01,0x04,0xf8,0x01,0x61,0x60,0xa7,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, + {{0x2a,0x01,0x04,0xf8,0x01,0x61,0x21,0xad,0x00,0x00,0x00,0x00,0x03,0x33,0x00,0x30}, 8333}, {{0x2a,0x01,0x04,0xf8,0x01,0x61,0x70,0x26,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, - {{0x2a,0x01,0x04,0xf8,0x01,0x61,0x91,0x84,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, - {{0x2a,0x01,0x04,0xf8,0x01,0x62,0x21,0x08,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, - {{0x2a,0x01,0x04,0xf8,0x01,0x62,0x21,0x8c,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, - {{0x2a,0x01,0x04,0xf8,0x01,0x62,0x44,0x43,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, - {{0x2a,0x01,0x04,0xf8,0x01,0x62,0x51,0xa3,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, + {{0x2a,0x01,0x04,0xf8,0x01,0x62,0x41,0x10,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, + {{0x2a,0x01,0x04,0xf8,0x01,0x62,0x43,0x48,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, + {{0x2a,0x01,0x04,0xf8,0x01,0x71,0x1c,0x1b,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, + {{0x2a,0x01,0x04,0xf8,0x01,0x71,0x01,0xc3,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, + {{0x2a,0x01,0x04,0xf8,0x01,0x71,0x22,0x58,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, + {{0x2a,0x01,0x04,0xf8,0x01,0x71,0x2a,0x70,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, + {{0x2a,0x01,0x04,0xf8,0x01,0x71,0x2e,0x1b,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, + {{0x2a,0x01,0x04,0xf8,0x01,0x71,0x2f,0x28,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, + {{0x2a,0x01,0x04,0xf8,0x01,0x71,0x32,0x48,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, + {{0x2a,0x01,0x04,0xf8,0x01,0x71,0x38,0x0c,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, {{0x2a,0x01,0x04,0xf8,0x01,0x71,0x0b,0x93,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, - {{0x2a,0x01,0x04,0xf8,0x01,0x90,0x14,0x83,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, - {{0x2a,0x01,0x04,0xf8,0x01,0x90,0x44,0x95,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, - {{0x2a,0x01,0x04,0xf8,0x01,0x90,0x64,0xc9,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, + {{0x2a,0x01,0x04,0xf8,0x01,0x71,0x0d,0x0a,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, + {{0x2a,0x01,0x04,0xf8,0x01,0x72,0x11,0x6c,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, + {{0x2a,0x01,0x04,0xf8,0x01,0x72,0x12,0x87,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, + {{0x2a,0x01,0x04,0xf8,0x01,0x72,0x17,0xa9,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, + {{0x2a,0x01,0x04,0xf8,0x01,0x72,0x1c,0xa7,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, + {{0x2a,0x01,0x04,0xf8,0x01,0x72,0x21,0x59,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, + {{0x2a,0x01,0x04,0xf8,0x01,0x72,0x3a,0x41,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, + {{0x2a,0x01,0x04,0xf8,0x01,0x72,0x3b,0x42,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, + {{0x2a,0x01,0x04,0xf8,0x01,0x72,0x3e,0xc1,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, + {{0x2a,0x01,0x04,0xf8,0x01,0x72,0x3e,0xc2,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, + {{0x2a,0x01,0x04,0xf8,0x01,0x72,0x0a,0xeb,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, + {{0x2a,0x01,0x04,0xf8,0x01,0x72,0x0a,0xec,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, + {{0x2a,0x01,0x04,0xf8,0x01,0x73,0x10,0xab,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, + {{0x2a,0x01,0x04,0xf8,0x01,0x73,0x15,0x51,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, + {{0x2a,0x01,0x04,0xf8,0x01,0x73,0x1b,0xca,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, + {{0x2a,0x01,0x04,0xf8,0x01,0x73,0x1e,0x2e,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, + {{0x2a,0x01,0x04,0xf8,0x01,0x73,0x21,0x62,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, + {{0x2a,0x01,0x04,0xf8,0x01,0x73,0x21,0xe6,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, + {{0x2a,0x01,0x04,0xf8,0x01,0x73,0x00,0x42,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, + {{0x2a,0x01,0x04,0xf8,0x01,0x73,0x0c,0xc1,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, + {{0x2a,0x01,0x04,0xf8,0x01,0x90,0x12,0x53,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, + {{0x2a,0x01,0x04,0xf8,0x01,0x90,0x24,0xeb,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, + {{0x2a,0x01,0x04,0xf8,0x01,0x90,0x34,0xf0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, + {{0x2a,0x01,0x04,0xf8,0x01,0x90,0x52,0x8d,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, {{0x2a,0x01,0x04,0xf8,0x01,0x90,0x91,0xce,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, {{0x2a,0x01,0x04,0xf8,0x01,0x91,0x21,0x94,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x83}, 8333}, {{0x2a,0x01,0x04,0xf8,0x01,0x91,0x40,0xe8,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, - {{0x2a,0x01,0x04,0xf8,0x01,0x91,0x44,0xb4,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, - {{0x2a,0x01,0x04,0xf8,0x01,0x91,0x82,0x42,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, - {{0x2a,0x01,0x04,0xf8,0x01,0x91,0x83,0xa2,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, - {{0x2a,0x01,0x04,0xf8,0x01,0x92,0x11,0xb2,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, + {{0x2a,0x01,0x04,0xf8,0x01,0x91,0x81,0x65,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 22556}, + {{0x2a,0x01,0x04,0xf8,0x01,0x91,0x81,0xb7,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, + {{0x2a,0x01,0x04,0xf8,0x01,0x91,0x83,0x28,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x03}, 8333}, + {{0x2a,0x01,0x04,0xf8,0x01,0x92,0x11,0xb2,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8343}, {{0x2a,0x01,0x04,0xf8,0x01,0x92,0x21,0x6c,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, - {{0x2a,0x01,0x04,0xf8,0x01,0x92,0x22,0xb3,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, + {{0x2a,0x01,0x04,0xf8,0x01,0x92,0x22,0xaf,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, + {{0x2a,0x01,0x04,0xf8,0x01,0x92,0x24,0x22,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, + {{0x2a,0x01,0x04,0xf8,0x01,0x92,0x34,0xd0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, {{0x2a,0x01,0x04,0xf8,0x01,0x92,0x44,0x0b,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, + {{0x2a,0x01,0x04,0xf8,0x01,0x92,0x52,0x30,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, {{0x2a,0x01,0x04,0xf8,0x01,0x92,0x00,0xdb,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, {{0x2a,0x01,0x04,0xf8,0x02,0x00,0x10,0x12,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, - {{0x2a,0x01,0x04,0xf8,0x02,0x00,0x23,0xd1,0x00,0x00,0x00,0x00,0xde,0xad,0xbe,0xef}, 8333}, - {{0x2a,0x01,0x04,0xf8,0x02,0x00,0x50,0x6d,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, - {{0x2a,0x01,0x04,0xf8,0x02,0x00,0x51,0xf0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, - {{0x2a,0x01,0x04,0xf8,0x02,0x00,0x53,0x89,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, - {{0x2a,0x01,0x04,0xf8,0x02,0x00,0x53,0xe3,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, - {{0x2a,0x01,0x04,0xf8,0x02,0x00,0x63,0x44,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, - {{0x2a,0x01,0x04,0xf8,0x02,0x00,0x63,0x96,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, - {{0x2a,0x01,0x04,0xf8,0x02,0x00,0x63,0xaf,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x19}, 8333}, - {{0x2a,0x01,0x04,0xf8,0x02,0x00,0x71,0xe3,0x78,0xb4,0xf3,0xff,0xfe,0xad,0xe8,0xcf}, 8333}, - {{0x2a,0x01,0x04,0xf8,0x02,0x01,0x21,0x4c,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, - {{0x2a,0x01,0x04,0xf8,0x02,0x01,0x02,0x33,0x00,0x01,0x00,0x00,0x00,0x00,0x00,0x03}, 8333}, - {{0x2a,0x01,0x04,0xf8,0x02,0x01,0x03,0xe3,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, + {{0x2a,0x01,0x04,0xf8,0x02,0x00,0x41,0x4e,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, + {{0x2a,0x01,0x04,0xf8,0x02,0x00,0x41,0x6a,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, + {{0x2a,0x01,0x04,0xf8,0x02,0x01,0x21,0xa7,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, + {{0x2a,0x01,0x04,0xf8,0x02,0x01,0x40,0x17,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x11}, 8333}, {{0x2a,0x01,0x04,0xf8,0x02,0x01,0x60,0x11,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x04}, 8333}, {{0x2a,0x01,0x04,0xf8,0x02,0x01,0x60,0xd5,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, - {{0x2a,0x01,0x04,0xf8,0x02,0x02,0x02,0x65,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, - {{0x2a,0x01,0x04,0xf8,0x02,0x02,0x31,0x15,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, + {{0x2a,0x01,0x04,0xf8,0x02,0x02,0x12,0xd6,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, {{0x2a,0x01,0x04,0xf8,0x02,0x02,0x31,0xe3,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, - {{0x2a,0x01,0x04,0xf8,0x02,0x02,0x31,0xef,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, - {{0x2a,0x01,0x04,0xf8,0x02,0x02,0x33,0x92,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, + {{0x2a,0x01,0x04,0xf8,0x02,0x02,0x32,0xc6,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, {{0x2a,0x01,0x04,0xf8,0x02,0x02,0x53,0xc3,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, - {{0x2a,0x01,0x04,0xf8,0x02,0x02,0x63,0xf4,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, - {{0x2a,0x01,0x04,0xf8,0x02,0x02,0x72,0x27,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, - {{0x2a,0x01,0x04,0xf8,0x02,0x10,0x22,0x27,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, - {{0x2a,0x01,0x04,0xf8,0x02,0x10,0x24,0xaa,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, {{0x2a,0x01,0x04,0xf8,0x02,0x11,0x14,0xcf,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, - {{0x2a,0x01,0x04,0xf8,0x02,0x11,0x18,0x1b,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, - {{0x2a,0x01,0x04,0xf8,0x02,0x12,0x28,0x9e,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, - {{0x2a,0x01,0x04,0xf8,0x02,0x12,0x33,0xdb,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 18333}, - {{0x2a,0x01,0x04,0xf8,0x00,0xa0,0x11,0x2f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, - {{0x2a,0x01,0x04,0xf8,0x00,0xa0,0x31,0x74,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, - {{0x2a,0x01,0x04,0xf8,0x00,0xa0,0x32,0x8c,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, - {{0x2a,0x01,0x04,0xf8,0x00,0xa0,0x52,0x43,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, - {{0x2a,0x01,0x04,0xf8,0x0c,0x17,0x19,0xb9,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, - {{0x2a,0x01,0x04,0xf8,0x0c,0x17,0x1a,0x41,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, - {{0x2a,0x01,0x04,0xf8,0x0c,0x17,0x1a,0x92,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, - {{0x2a,0x01,0x04,0xf8,0x0c,0x17,0x02,0x73,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, - {{0x2a,0x01,0x04,0xf8,0x0c,0x17,0x04,0x35,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, - {{0x2a,0x01,0x04,0xf8,0x0c,0x17,0x07,0x55,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, - {{0x2a,0x01,0x04,0xf8,0x0c,0x17,0x0b,0x54,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, - {{0x2a,0x01,0x04,0xf8,0x0d,0x16,0x93,0x84,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, + {{0x2a,0x01,0x04,0xf8,0x02,0x11,0x1e,0xc5,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, + {{0x2a,0x01,0x04,0xf8,0x02,0x11,0x04,0x83,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, + {{0x2a,0x01,0x04,0xf8,0x02,0x11,0x0d,0x99,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x08}, 8333}, + {{0x2a,0x01,0x04,0xf8,0x02,0x12,0x18,0x26,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, + {{0x2a,0x01,0x04,0xf8,0x02,0x12,0x27,0xa8,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, + {{0x2a,0x01,0x04,0xf8,0x02,0x21,0x08,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, + {{0x2a,0x01,0x04,0xf8,0x00,0xa0,0x12,0xcc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, + {{0x2a,0x01,0x04,0xf8,0x00,0xa0,0x74,0x6a,0x01,0x01,0x00,0x01,0x00,0x01,0x00,0x02}, 8333}, + {{0x2a,0x01,0x04,0xf8,0x00,0xa0,0x82,0x8a,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, + {{0x2a,0x01,0x04,0xf8,0x0c,0x17,0x2e,0xef,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, + {{0x2a,0x01,0x04,0xf8,0x0c,0x17,0x2f,0x3c,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 3333}, + {{0x2a,0x01,0x04,0xf8,0x0c,0x17,0x3b,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, + {{0x2a,0x01,0x04,0xf8,0x0c,0x17,0x42,0x45,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, + {{0x2a,0x01,0x04,0xf8,0x0c,0x17,0x46,0x4f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, + {{0x2a,0x01,0x04,0xf8,0x0c,0x17,0x4a,0x1c,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, + {{0x2a,0x01,0x04,0xf8,0x0c,0x17,0x4c,0x5d,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, + {{0x2a,0x01,0x04,0xf8,0x0c,0x17,0x67,0xf8,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, + {{0x2a,0x01,0x04,0xf8,0x0c,0x17,0x6d,0xd0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, + {{0x2a,0x01,0x04,0xf8,0x0c,0x17,0x71,0x0b,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, + {{0x2a,0x01,0x04,0xf8,0x0c,0x17,0x07,0x14,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, + {{0x2a,0x01,0x04,0xf8,0x0c,0x17,0x72,0xc6,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, {{0x2a,0x01,0x06,0x08,0xff,0xff,0xa0,0x09,0x8b,0xf5,0x87,0x9d,0xe5,0x1a,0xf8,0x37}, 8333}, - {{0x2a,0x01,0x06,0x80,0x00,0x10,0x00,0x10,0xf2,0xde,0xf1,0xff,0xfe,0xc9,0x0d,0xc0}, 8333}, - {{0x2a,0x01,0x07,0xc8,0xaa,0xac,0x01,0xf6,0x50,0x54,0x00,0xff,0xfe,0x30,0xe5,0x85}, 8333}, - {{0x2a,0x01,0x07,0xc8,0xaa,0xac,0x02,0x0b,0x50,0x54,0x00,0xff,0xfe,0x24,0x43,0x5e}, 8333}, + {{0x2a,0x01,0x06,0x80,0x00,0x10,0x00,0x10,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, + {{0x2a,0x01,0x06,0xf0,0xff,0xff,0x01,0x20,0x00,0x00,0x00,0x00,0x00,0x00,0x8d,0xcb}, 8333}, + {{0x2a,0x01,0x07,0x9c,0xce,0xbc,0x85,0x7c,0x98,0xc1,0x88,0xff,0xfe,0xf5,0x90,0xde}, 8333}, + {{0x2a,0x01,0x07,0x9d,0x73,0x77,0x26,0x29,0x7e,0x57,0x7e,0x57,0x00,0x01,0x00,0x01}, 8333}, {{0x2a,0x01,0x07,0xc8,0xaa,0xac,0x04,0x3d,0x50,0x54,0x00,0xff,0xfe,0x4e,0x3d,0xd4}, 8333}, - {{0x2a,0x01,0x07,0xc8,0xaa,0xad,0x02,0x56,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, - {{0x2a,0x01,0x07,0xc8,0xaa,0xb6,0x00,0xea,0x50,0x54,0x00,0xff,0xfe,0xff,0xea,0xc3}, 8333}, - {{0x2a,0x01,0x07,0xc8,0xaa,0xb9,0x00,0x5a,0x50,0x54,0x00,0xff,0xfe,0x89,0x7b,0x26}, 8333}, - {{0x2a,0x01,0x07,0xc8,0xaa,0xbc,0x02,0xc8,0x50,0x54,0x00,0xff,0xfe,0x35,0x65,0x81}, 8333}, - {{0x2a,0x01,0x7e,0x00,0x00,0x00,0x00,0x00,0xf0,0x3c,0x91,0xff,0xfe,0x18,0x30,0x1e}, 8333}, - {{0x2a,0x01,0x7e,0x00,0x00,0x00,0x00,0x00,0xf0,0x3c,0x91,0xff,0xfe,0x18,0x39,0x42}, 8333}, + {{0x2a,0x01,0x07,0xc8,0xaa,0xb5,0x03,0xe6,0x50,0x54,0x00,0xff,0xfe,0xd7,0x4e,0x54}, 8333}, + {{0x2a,0x01,0x07,0xc8,0xaa,0xbd,0x03,0xd5,0x50,0x54,0x00,0xff,0xfe,0x95,0xf5,0x86}, 8333}, + {{0x2a,0x01,0x07,0xc8,0xaa,0xc1,0x04,0x53,0xd0,0xd2,0xaf,0x96,0xfa,0x88,0x5d,0x0e}, 8333}, + {{0x2a,0x01,0x07,0xc8,0xaa,0xc3,0x06,0x63,0x50,0x54,0x00,0xff,0xfe,0x25,0x8c,0x69}, 8333}, + {{0x2a,0x01,0x07,0xc8,0xaa,0xc3,0x00,0x97,0x50,0x54,0x00,0xff,0xfe,0xa7,0x37,0x80}, 8333}, + {{0x2a,0x01,0x07,0xc8,0xaa,0xc4,0x05,0x67,0x50,0x54,0x00,0xff,0xfe,0xdc,0x51,0x8a}, 8333}, {{0x2a,0x01,0x7e,0x00,0x00,0x00,0x00,0x00,0xf0,0x3c,0x91,0xff,0xfe,0x26,0x8c,0x87}, 8333}, - {{0x2a,0x01,0x7e,0x00,0x00,0x00,0x00,0x00,0xf0,0x3c,0x91,0xff,0xfe,0x50,0x62,0x06}, 8333}, - {{0x2a,0x01,0x7e,0x00,0x00,0x00,0x00,0x00,0xf0,0x3c,0x91,0xff,0xfe,0x67,0x55,0x9d}, 8333}, - {{0x2a,0x01,0x7e,0x00,0x00,0x00,0x00,0x00,0xf0,0x3c,0x91,0xff,0xfe,0x84,0x43,0x4f}, 8333}, + {{0x2a,0x01,0x7e,0x00,0x00,0x00,0x00,0x00,0xf0,0x3c,0x91,0xff,0xfe,0x50,0x94,0xb8}, 8333}, + {{0x2a,0x01,0x7e,0x00,0x00,0x00,0x00,0x00,0xf0,0x3c,0x91,0xff,0xfe,0x55,0x00,0x2c}, 8333}, {{0x2a,0x01,0x7e,0x00,0x00,0x00,0x00,0x00,0xf0,0x3c,0x91,0xff,0xfe,0x89,0x11,0x43}, 8333}, - {{0x2a,0x01,0x7e,0x00,0x00,0x00,0x00,0x00,0xf0,0x3c,0x91,0xff,0xfe,0x98,0x25,0x05}, 8333}, - {{0x2a,0x01,0x7e,0x00,0x00,0x00,0x00,0x00,0xf0,0x3c,0x91,0xff,0xfe,0xdb,0x35,0x2e}, 8333}, - {{0x2a,0x01,0x7e,0x01,0x00,0x00,0x00,0x00,0xf0,0x3c,0x91,0xff,0xfe,0xc8,0xd7,0xb5}, 8333}, - {{0x2a,0x01,0x0e,0x34,0xee,0x33,0x16,0x40,0xc5,0x04,0xf6,0x77,0xb2,0x8a,0xba,0x42}, 8333}, - {{0x2a,0x01,0x0e,0x35,0x2e,0x7e,0x0b,0xc0,0xe0,0x79,0xf5,0x5e,0xce,0xf3,0xb5,0xd7}, 8333}, + {{0x2a,0x01,0x7e,0x00,0x00,0x00,0x00,0x00,0xf0,0x3c,0x91,0xff,0xfe,0x89,0x53,0xfd}, 8333}, + {{0x2a,0x01,0x7e,0x00,0x00,0x00,0x00,0x00,0xf0,0x3c,0x91,0xff,0xfe,0xdf,0xb7,0x0f}, 8333}, + {{0x2a,0x01,0xb0,0x00,0x00,0x00,0x00,0x00,0x41,0x66,0x51,0x5b,0xef,0x9e,0x00,0xb3}, 8333}, + {{0x2a,0x01,0xb2,0xe0,0x00,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x40}, 8333}, + {{0x2a,0x01,0x0e,0x34,0xec,0x29,0x24,0xc0,0x00,0xf3,0xdd,0xaf,0x9f,0x59,0x58,0x6f}, 8333}, + {{0x2a,0x01,0x0e,0x34,0xee,0xd7,0x66,0x70,0xec,0x1b,0xbf,0x7c,0xb0,0x12,0x60,0x69}, 8333}, {{0x2a,0x01,0x0e,0x35,0x2e,0xe5,0x06,0x10,0x02,0x1f,0xd0,0xff,0xfe,0x4e,0x74,0x60}, 8333}, {{0x2a,0x01,0x0e,0x35,0x8a,0x3f,0x47,0xc0,0xc6,0x17,0xfe,0xff,0xfe,0x3c,0x9f,0xbd}, 8333}, - {{0x2a,0x01,0x0e,0x35,0x8a,0xca,0x06,0xa0,0x02,0x11,0x0a,0xff,0xfe,0x5e,0x29,0x5e}, 8333}, - {{0x2a,0x02,0x01,0x80,0x00,0x0a,0x00,0x18,0x00,0x81,0x00,0x07,0x00,0x11,0x00,0x50}, 8333}, - {{0x2a,0x02,0x18,0x10,0x1d,0x87,0x6a,0x00,0x56,0x04,0xa6,0xff,0xfe,0x60,0xd8,0x7d}, 8333}, - {{0x2a,0x02,0x21,0x68,0x11,0x44,0x5c,0x01,0xd6,0x3d,0x7e,0xff,0xfe,0xdd,0x4f,0x8e}, 8333}, - {{0x2a,0x02,0x24,0x98,0x6d,0x7b,0x70,0x01,0xb5,0x08,0xb3,0x9d,0x2c,0xea,0x5b,0x7a}, 8333}, - {{0x2a,0x02,0x25,0x28,0x05,0x03,0x00,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x15}, 8333}, - {{0x2a,0x02,0x25,0x28,0x00,0xfa,0x1a,0x56,0x02,0x16,0x44,0xff,0xfe,0x6a,0xd1,0x12}, 8333}, - {{0x2a,0x02,0x27,0xf8,0x20,0x12,0x00,0x00,0xe9,0xf7,0x26,0x8f,0xc4,0x41,0x61,0x29}, 8333}, + {{0x2a,0x01,0x0e,0x35,0x8b,0xff,0x70,0xb0,0x1e,0x1b,0x0d,0xff,0xfe,0x0b,0x23,0x6d}, 8333}, + {{0x2a,0x02,0x12,0x05,0x34,0xc3,0xa4,0xe0,0xd6,0x3d,0x7e,0xff,0xfe,0x98,0x10,0xc8}, 8333}, + {{0x2a,0x02,0x12,0x05,0x34,0xda,0xaa,0x00,0x58,0x82,0x24,0x9d,0xdd,0xbf,0xbc,0x43}, 8333}, + {{0x2a,0x02,0x12,0x05,0x50,0x51,0xa6,0x40,0xd6,0xae,0x52,0xff,0xfe,0xa3,0x00,0xac}, 8333}, + {{0x2a,0x02,0x12,0x05,0xc6,0x89,0xd9,0x80,0xba,0xae,0xed,0xff,0xfe,0xea,0x94,0x45}, 8333}, + {{0x2a,0x02,0x12,0x0b,0x2c,0x2a,0x5e,0xc0,0x10,0xdd,0x31,0xff,0xfe,0x42,0x50,0x79}, 8333}, + {{0x2a,0x02,0x12,0x0b,0x2c,0x35,0x69,0xd0,0x02,0x19,0x99,0xff,0xfe,0x6b,0x4e,0xc3}, 8333}, + {{0x2a,0x02,0x12,0x0b,0xc3,0xc2,0xff,0x60,0x02,0x1f,0x5b,0xff,0xfe,0xc3,0xa7,0xad}, 24312}, + {{0x2a,0x02,0x13,0xb8,0x40,0x00,0x10,0x00,0x02,0x16,0xe6,0xff,0xfe,0x92,0x86,0x19}, 8333}, + {{0x2a,0x02,0x13,0xb8,0x40,0x00,0x10,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x27}, 8333}, + {{0x2a,0x02,0x17,0xd0,0x00,0x2a,0x44,0x00,0x04,0x0f,0x3d,0xd4,0xb0,0x53,0x47,0xad}, 8333}, + {{0x2a,0x02,0x01,0x80,0x00,0x01,0x00,0x01,0x00,0x00,0x00,0x00,0x05,0x17,0x0a,0xfb}, 8333}, + {{0x2a,0x02,0x01,0x80,0x00,0x06,0x00,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x18}, 8333}, + {{0x2a,0x02,0x18,0x10,0x1d,0x11,0xf9,0x00,0x68,0x72,0xf2,0x8e,0x81,0x26,0xf6,0x35}, 8333}, + {{0x2a,0x02,0x27,0xa8,0x00,0x00,0x00,0x01,0x52,0xe5,0x49,0xff,0xfe,0xe3,0x3b,0x49}, 8333}, {{0x2a,0x02,0x03,0x48,0x00,0x86,0x30,0x11,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, - {{0x2a,0x02,0x47,0x80,0x00,0x01,0x00,0x01,0x00,0x00,0x00,0x00,0x00,0x01,0x8a,0x01}, 8333}, - {{0x2a,0x02,0x05,0x78,0x50,0x02,0x01,0x16,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, + {{0x2a,0x02,0x03,0x90,0x90,0x00,0x00,0x00,0x02,0x18,0x7d,0xff,0xfe,0x10,0xbe,0x33}, 8333}, + {{0x2a,0x02,0x05,0x82,0x78,0xc1,0x76,0x00,0x2d,0x49,0x62,0x12,0x29,0xd3,0x0a,0xbb}, 8333}, {{0x2a,0x02,0x60,0x80,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x19,0x0b,0x69,0xe3}, 8333}, - {{0x2a,0x02,0x60,0x80,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0xe8,0x93,0xd9,0xd6}, 8333}, - {{0x2a,0x02,0x07,0x70,0x40,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x39}, 8333}, + {{0x2a,0x02,0x07,0x50,0x00,0x07,0x33,0x05,0x00,0x00,0x00,0x00,0x00,0x00,0x05,0x75}, 8333}, + {{0x2a,0x02,0x07,0x52,0x01,0x00,0x00,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x53}, 8333}, + {{0x2a,0x02,0x7a,0xa0,0x12,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x75,0x01,0xd9,0x50}, 8333}, {{0x2a,0x02,0x7a,0xa0,0x12,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0xde,0xb3,0x81,0xa2}, 8333}, - {{0x2a,0x02,0x80,0x10,0xb0,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x58,0x60,0x59,0xb5}, 8333}, - {{0x2a,0x02,0x81,0x0d,0x21,0xc0,0x0f,0x00,0xa2,0x48,0x1c,0xff,0xfe,0xb8,0x53,0x48}, 8333}, - {{0x2a,0x02,0x0a,0x50,0x00,0x00,0x00,0x00,0x02,0x1b,0x24,0xff,0xfe,0x93,0x4e,0x39}, 8333}, - {{0x2a,0x02,0x0a,0x80,0x00,0x00,0x12,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, - {{0x2a,0x02,0xc2,0x00,0x00,0x00,0x00,0x10,0x00,0x02,0x00,0x01,0x58,0x30,0x00,0x01}, 8333}, - {{0x2a,0x02,0xc2,0x00,0x00,0x00,0x00,0x10,0x00,0x02,0x00,0x05,0x46,0x92,0x00,0x01}, 8333}, - {{0x2a,0x02,0xc2,0x00,0x00,0x00,0x00,0x10,0x00,0x03,0x00,0x00,0x71,0x58,0x00,0x01}, 8333}, - {{0x2a,0x02,0xc2,0x00,0x00,0x00,0x00,0x10,0x00,0x00,0x00,0x00,0x22,0x44,0x00,0x01}, 8333}, - {{0x2a,0x02,0xc2,0x00,0x00,0x01,0x00,0x10,0x00,0x02,0x00,0x03,0x33,0x39,0x00,0x01}, 8333}, - {{0x2a,0x02,0xc2,0x00,0x00,0x01,0x00,0x10,0x00,0x02,0x00,0x03,0x78,0x44,0x00,0x01}, 8333}, - {{0x2a,0x02,0xc2,0x00,0x00,0x01,0x00,0x10,0x00,0x02,0x00,0x05,0x62,0x88,0x00,0x01}, 8333}, - {{0x2a,0x02,0xc2,0x00,0x00,0x01,0x00,0x10,0x00,0x03,0x00,0x00,0x59,0x12,0x00,0x01}, 8333}, + {{0x2a,0x02,0x7a,0xa0,0x16,0x19,0x00,0x00,0x00,0x00,0x00,0x00,0xa0,0x37,0x69,0xa6}, 8333}, + {{0x2a,0x02,0x81,0x0d,0x14,0xc0,0x86,0x94,0xd2,0x50,0x99,0xff,0xfe,0x81,0x23,0xd9}, 8333}, + {{0x2a,0x02,0x0a,0x50,0x00,0x00,0x00,0x00,0xda,0xcb,0x8a,0xff,0xfe,0x36,0x8d,0x2d}, 8333}, + {{0x2a,0x02,0xc2,0x00,0x00,0x00,0x00,0x10,0x00,0x03,0x00,0x00,0x25,0x91,0x00,0x01}, 8333}, + {{0x2a,0x02,0xc2,0x00,0x00,0x01,0x00,0x10,0x00,0x02,0x00,0x05,0x99,0x82,0x00,0x01}, 8333}, + {{0x2a,0x02,0xc2,0x00,0x00,0x01,0x00,0x10,0x00,0x03,0x00,0x00,0x92,0x90,0x00,0x01}, 8333}, + {{0x2a,0x02,0xc2,0x05,0x30,0x00,0x71,0x58,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, + {{0x2a,0x02,0xc2,0x05,0x30,0x01,0x45,0x22,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, + {{0x2a,0x02,0xc2,0x05,0x30,0x01,0x65,0x49,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, + {{0x2a,0x02,0xc2,0x07,0x20,0x08,0x37,0x72,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, + {{0x2a,0x02,0xc2,0x07,0x20,0x08,0x65,0x19,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, + {{0x2a,0x02,0xc2,0x07,0x20,0x09,0x02,0x13,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, + {{0x2a,0x02,0xc2,0x07,0x20,0x09,0x78,0x58,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, + {{0x2a,0x02,0xc2,0x07,0x20,0x10,0x03,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, + {{0x2a,0x02,0xc2,0x07,0x30,0x01,0x58,0x24,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, + {{0x2a,0x02,0xce,0x80,0x00,0x00,0x00,0x20,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, {{0x2a,0x03,0x40,0x00,0x00,0x02,0x04,0x96,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x08}, 8333}, + {{0x2a,0x03,0x40,0x00,0x00,0x06,0x41,0x6c,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x53}, 8333}, {{0x2a,0x03,0x40,0x00,0x00,0x06,0x80,0x09,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, - {{0x2a,0x03,0x40,0x00,0x00,0x06,0x80,0x63,0x00,0x00,0x00,0x00,0x00,0x00,0xbc,0xd0}, 8333}, - {{0x2a,0x03,0x49,0x00,0xff,0xfc,0x00,0x0b,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, - {{0x2a,0x03,0xb0,0xc0,0x00,0x01,0x00,0xd0,0x00,0x00,0x00,0x00,0x00,0x0d,0x50,0x01}, 8333}, + {{0x2a,0x03,0x40,0x00,0x00,0x09,0x00,0x8e,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, + {{0x2a,0x03,0x73,0x80,0x21,0x40,0x00,0x17,0x51,0xfe,0x35,0x19,0xb5,0x71,0x4a,0x13}, 8333}, + {{0x2a,0x03,0xb0,0xc0,0x00,0x00,0x10,0x10,0x00,0x00,0x00,0x00,0x07,0xa3,0x10,0x01}, 8333}, + {{0x2a,0x03,0xb0,0xc0,0x00,0x00,0x10,0x10,0x00,0x00,0x00,0x00,0x07,0xaa,0x40,0x01}, 8333}, + {{0x2a,0x03,0xb0,0xc0,0x00,0x03,0x00,0xd0,0x00,0x00,0x00,0x00,0x1b,0x99,0xc0,0x01}, 8333}, + {{0x2a,0x03,0xb0,0xc0,0x00,0x03,0x00,0xd0,0x00,0x00,0x00,0x00,0x1b,0x99,0xe0,0x01}, 8333}, + {{0x2a,0x03,0xb0,0xc0,0x00,0x03,0x00,0xd0,0x00,0x00,0x00,0x00,0x1b,0x9a,0x30,0x01}, 8333}, + {{0x2a,0x03,0xb0,0xc0,0x00,0x03,0x00,0xd0,0x00,0x00,0x00,0x00,0x22,0x08,0x60,0x01}, 8333}, + {{0x2a,0x03,0xb0,0xc0,0x00,0x03,0x00,0xd0,0x00,0x00,0x00,0x00,0x23,0xf7,0x10,0x01}, 8333}, + {{0x2a,0x03,0xb0,0xc0,0x00,0x03,0x00,0xd0,0x00,0x00,0x00,0x00,0x23,0xf7,0x90,0x01}, 8333}, + {{0x2a,0x03,0xb0,0xc0,0x00,0x03,0x00,0xd0,0x00,0x00,0x00,0x00,0x23,0xfb,0x20,0x01}, 8333}, + {{0x2a,0x03,0xb0,0xc0,0x00,0x03,0x00,0xd0,0x00,0x00,0x00,0x00,0x23,0xfb,0x30,0x01}, 8333}, + {{0x2a,0x03,0xb0,0xc0,0x00,0x03,0x00,0xd0,0x00,0x00,0x00,0x00,0x23,0xfb,0x50,0x01}, 8333}, + {{0x2a,0x03,0xb0,0xc0,0x00,0x03,0x00,0xd0,0x00,0x00,0x00,0x00,0x23,0xfb,0x70,0x01}, 8333}, + {{0x2a,0x03,0xb0,0xc0,0x00,0x03,0x00,0xd0,0x00,0x00,0x00,0x00,0x24,0x00,0x00,0x01}, 8333}, + {{0x2a,0x03,0xb0,0xc0,0x00,0x03,0x00,0xd0,0x00,0x00,0x00,0x00,0x24,0x00,0x30,0x01}, 8333}, + {{0x2a,0x03,0xb0,0xc0,0x00,0x03,0x00,0xd0,0x00,0x00,0x00,0x00,0x24,0x00,0xe0,0x01}, 8333}, + {{0x2a,0x03,0xb0,0xc0,0x00,0x03,0x00,0xd0,0x00,0x00,0x00,0x00,0x24,0x01,0xe0,0x01}, 8333}, + {{0x2a,0x03,0xb0,0xc0,0x00,0x03,0x00,0xd0,0x00,0x00,0x00,0x00,0x24,0x02,0x20,0x01}, 8333}, + {{0x2a,0x03,0xb0,0xc0,0x00,0x03,0x00,0xd0,0x00,0x00,0x00,0x00,0x24,0x02,0x80,0x01}, 8333}, + {{0x2a,0x03,0xb0,0xc0,0x00,0x03,0x00,0xd0,0x00,0x00,0x00,0x00,0x24,0x02,0x90,0x01}, 8333}, + {{0x2a,0x03,0xb0,0xc0,0x00,0x03,0x00,0xd0,0x00,0x00,0x00,0x00,0x24,0x02,0xb0,0x01}, 8333}, + {{0x2a,0x03,0xb0,0xc0,0x00,0x03,0x00,0xd0,0x00,0x00,0x00,0x00,0x24,0x02,0xd0,0x01}, 8333}, + {{0x2a,0x03,0xb0,0xc0,0x00,0x03,0x00,0xd0,0x00,0x00,0x00,0x00,0x24,0x03,0x10,0x01}, 8333}, + {{0x2a,0x03,0xb0,0xc0,0x00,0x03,0x00,0xd0,0x00,0x00,0x00,0x00,0x24,0x03,0x20,0x01}, 8333}, + {{0x2a,0x03,0xb0,0xc0,0x00,0x03,0x00,0xd0,0x00,0x00,0x00,0x00,0x24,0x03,0x40,0x01}, 8333}, + {{0x2a,0x03,0xb0,0xc0,0x00,0x03,0x00,0xd0,0x00,0x00,0x00,0x00,0x24,0x03,0x60,0x01}, 8333}, + {{0x2a,0x03,0xb0,0xc0,0x00,0x03,0x00,0xd0,0x00,0x00,0x00,0x00,0x24,0x03,0xa0,0x01}, 8333}, + {{0x2a,0x03,0xb0,0xc0,0x00,0x03,0x00,0xd0,0x00,0x00,0x00,0x00,0x24,0x03,0xb0,0x01}, 8333}, + {{0x2a,0x03,0xb0,0xc0,0x00,0x03,0x00,0xd0,0x00,0x00,0x00,0x00,0x24,0x03,0xf0,0x01}, 8333}, + {{0x2a,0x03,0xb0,0xc0,0x00,0x03,0x00,0xd0,0x00,0x00,0x00,0x00,0x24,0x04,0x60,0x01}, 8333}, + {{0x2a,0x03,0xb0,0xc0,0x00,0x03,0x00,0xd0,0x00,0x00,0x00,0x00,0x24,0x04,0xb0,0x01}, 8333}, {{0x2a,0x03,0x0f,0x80,0xed,0x15,0x01,0x49,0x01,0x54,0x01,0x55,0x02,0x35,0x00,0x01}, 8333}, - {{0x2a,0x03,0x0f,0x80,0xed,0x15,0x01,0x49,0x01,0x54,0x01,0x55,0x02,0x41,0x00,0x01}, 8333}, - {{0x2a,0x03,0x0f,0x80,0xed,0x16,0x0c,0xa7,0xea,0x75,0xb1,0x2d,0x02,0xaf,0x9e,0x2a}, 8333}, - {{0x2a,0x04,0x19,0x80,0x31,0x00,0x1a,0xab,0x02,0x90,0xfa,0xff,0xfe,0x70,0xa3,0xd8}, 8333}, - {{0x2a,0x04,0x19,0x80,0x31,0x00,0x1a,0xab,0xe6,0x1d,0x2d,0xff,0xfe,0x29,0xf5,0x90}, 8333}, - {{0x2a,0x04,0x2f,0x80,0x00,0x06,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x89}, 8333}, - {{0x2a,0x04,0xac,0x00,0x00,0x01,0x4a,0x0b,0x50,0x54,0x00,0xff,0xfe,0x00,0x5a,0xf5}, 8333}, - {{0x2a,0x04,0xad,0x80,0x00,0x00,0x00,0x68,0x00,0x00,0x00,0x00,0x00,0x00,0x35,0xda}, 8333}, - {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0xd9,0x4a,0xaf,0xa2,0x8c,0x9d,0xf6,0x22,0x18,0x28}, 8333}, + {{0x2a,0x04,0x19,0x80,0x31,0x00,0x1a,0xac,0xe6,0x1d,0x2d,0xff,0xfe,0x29,0xf2,0x41}, 8333}, + {{0x2a,0x04,0x19,0x80,0x31,0x00,0x1a,0xac,0xe6,0x1d,0x2d,0xff,0xfe,0x29,0xf2,0x51}, 8333}, + {{0x2a,0x04,0x21,0x80,0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x00,0x5a,0x49,0x3c,0x06}, 8333}, + {{0x2a,0x04,0x21,0x80,0x00,0x01,0x00,0x07,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x03}, 8333}, + {{0x2a,0x04,0x2e,0x00,0x00,0x05,0x00,0x2e,0x9a,0x4b,0xe1,0xff,0xfe,0x62,0x6d,0xc0}, 8333}, + {{0x2a,0x04,0x35,0x42,0x10,0x00,0x09,0x10,0x84,0x92,0xb8,0xff,0xfe,0x91,0x71,0x1d}, 8333}, + {{0x2a,0x04,0xdb,0xc3,0xff,0xfe,0x00,0x00,0xe6,0x1f,0x13,0xff,0xfe,0x95,0x84,0x01}, 8333}, + {{0x2a,0x06,0x9f,0xc0,0x2a,0x06,0x9f,0xc0,0x2a,0x06,0x9f,0xc1,0x06,0x7c,0xe7,0x06}, 8333}, + {{0x2c,0x0f,0xf7,0x38,0x20,0x04,0x00,0x82,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0xd1,0xe3,0x80,0xee,0x87,0xdc,0xf3,0x63,0x37,0x00}, 8333}, {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0xdb,0x58,0x10,0x81,0x48,0x69,0x2c,0xb3,0x0d,0x6d}, 8333}, - {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0xe2,0x7f,0xf3,0x20,0xef,0x72,0xaf,0x4d,0x29,0x3c}, 8333}, - {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0xef,0x3c,0x49,0x0b,0xc1,0x74,0xc2,0x92,0x86,0xe1}, 8333}, - {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0xe8,0x27,0xf9,0x43,0xad,0x67,0xfd,0x74,0x25,0x43}, 8333}, - {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0xff,0xd9,0x7d,0x26,0x57,0x03,0xb0,0x49,0x67,0x4f}, 8333}, - {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0xf9,0xbe,0x9e,0xf0,0x33,0x40,0x2e,0x79,0xc9,0x18}, 8333}, - {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x07,0x9c,0x11,0x9b,0x2d,0xf7,0xd7,0xf2,0x5e,0x9b}, 8333}, - {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x00,0x7d,0xc3,0xfd,0xcb,0x7a,0xff,0x07,0xdc,0x48}, 8333}, - {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x03,0x34,0x0e,0x44,0x07,0x5c,0xcb,0x4b,0xe7,0xcb}, 8333}, - {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x06,0x69,0x75,0xcb,0x88,0x3c,0x63,0xa6,0x11,0xff}, 8333}, - {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x0a,0x26,0x27,0x21,0xbf,0x0a,0x38,0xe7,0xfe,0xc1}, 8333}, - {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x0a,0x26,0x27,0x21,0xae,0x94,0xd5,0xc2,0x72,0x24}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0xdc,0x09,0x14,0x6e,0x6c,0x3e,0x58,0xf2,0x1b,0x15}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0xe5,0x86,0xa6,0xb0,0x82,0x31,0xc4,0xc1,0x2e,0x1d}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0xee,0xe7,0x24,0xcf,0xd9,0x86,0xd0,0x09,0x57,0xb0}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0xe8,0x8d,0xf8,0x13,0x16,0xad,0x9d,0xea,0xdd,0xf3}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0xe9,0x82,0x28,0x9a,0x17,0x10,0x6e,0x9d,0x77,0x72}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0xf0,0x9b,0xc4,0x2c,0x36,0x54,0x54,0x7f,0x9a,0xce}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0xf1,0x38,0x98,0xb5,0xbf,0x41,0x89,0x0b,0xb1,0x65}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0xf6,0x18,0x60,0xd5,0xad,0xf0,0xfa,0xd2,0xb2,0xbc}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0xf6,0x64,0x7d,0x84,0xa3,0xa1,0xde,0xef,0xac,0x6b}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0xfe,0x8b,0x0f,0x3c,0xf5,0xe1,0x4d,0xc8,0x9e,0xa7}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0xf9,0x87,0x07,0xf9,0xaf,0xa4,0x95,0xc5,0x96,0xca}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x07,0xc8,0xcb,0xb9,0x7d,0xe9,0x3d,0xad,0xae,0x02}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x04,0xa4,0x14,0x60,0x79,0x44,0x3f,0xfc,0x81,0x48}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x08,0x0a,0xae,0xa1,0xc0,0x9a,0xcd,0x3f,0x8c,0xcb}, 8333}, {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x0a,0xbf,0x87,0xf8,0x8f,0x6b,0x04,0xb5,0xc3,0xfa}, 8333}, - {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x0b,0x29,0x34,0x96,0x29,0xe8,0x67,0x22,0x0c,0x61}, 8333}, - {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x11,0x08,0x94,0x72,0x0f,0x2c,0xb6,0xc9,0x6f,0x22}, 8333}, - {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x12,0xc9,0x76,0x66,0x08,0x77,0xf0,0x71,0x81,0xdc}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x0c,0x6d,0x02,0x65,0xbe,0x59,0x3b,0xcb,0x68,0x21}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x0c,0xb8,0x18,0x7a,0x5e,0x82,0xab,0x3e,0x9d,0xe8}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x0d,0x1f,0xd6,0xf4,0x9b,0x55,0x23,0x54,0xe4,0xbb}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x16,0xa6,0xf8,0x28,0x19,0xe2,0x0e,0x9c,0xd8,0xc1}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x11,0x22,0xd8,0xb2,0x2a,0xee,0x5c,0xcc,0xbb,0x2d}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x11,0x70,0x43,0x27,0xdc,0x3c,0xf6,0x97,0xb8,0x71}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x11,0xbb,0x53,0x77,0x82,0x06,0x72,0xfa,0xba,0x86}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x11,0x95,0xca,0x69,0x77,0x8d,0x58,0xbe,0x26,0xa1}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x12,0x70,0x61,0xfd,0xf4,0xea,0xe0,0xa5,0x63,0xa9}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x1f,0xad,0x40,0xc8,0x73,0x8f,0x3c,0x31,0xf5,0x48}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x19,0x61,0xec,0x24,0x5b,0x01,0x16,0xf5,0xda,0x3c}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x1c,0x1f,0x7b,0x2d,0xed,0xae,0xf3,0xb3,0xe5,0xab}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x20,0x18,0x57,0x49,0xf4,0xa9,0x00,0x10,0x21,0x83}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x23,0xf4,0xc4,0xe5,0xd7,0xda,0xaa,0x1f,0x02,0xfc}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x2b,0xc3,0x70,0xf2,0xc9,0xa0,0xd1,0x6d,0x5b,0xa0}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x2d,0x3a,0x72,0xc8,0x21,0x2f,0x53,0x69,0x54,0xf5}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x37,0x0b,0x12,0x39,0x01,0x90,0xb3,0x44,0xac,0x9b}, 8333}, {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x30,0x7b,0x87,0xc2,0x7e,0xd8,0xe9,0xbb,0x14,0xed}, 8333}, - {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x3e,0xaa,0xb7,0xd0,0x79,0x79,0xf3,0x0b,0xd2,0x63}, 8333}, - {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x6f,0x34,0x7f,0xc7,0xce,0xa3,0x04,0x59,0x06,0x32}, 4176}, - {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x68,0xac,0xad,0xae,0x93,0x23,0x0a,0x51,0x3c,0x5c}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x31,0x87,0x8d,0x3c,0x3a,0x05,0x56,0x19,0xa6,0xd0}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x31,0xf4,0x04,0x0c,0x79,0xbb,0x2b,0x88,0xb6,0x84}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x33,0x6e,0x6c,0x2c,0x26,0xcd,0x40,0x0c,0xaa,0x1f}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x3b,0x51,0x91,0xdd,0xa4,0x49,0x17,0xee,0x50,0x2a}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x3c,0xea,0x31,0x31,0x62,0xd8,0x02,0x94,0x68,0x01}, 8443}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x3d,0xa8,0x17,0x39,0x12,0xe1,0xa4,0xba,0x3c,0xd7}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x3d,0xf3,0xe3,0x3a,0xcb,0xa0,0xd6,0x9f,0x0f,0xa0}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x4f,0xa8,0xc7,0x70,0x2d,0x96,0x66,0xf9,0x39,0xa2}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x48,0xe8,0xd6,0x01,0xc2,0xb0,0x42,0xdb,0x77,0xdd}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x54,0xeb,0xb8,0x2e,0xeb,0xfd,0xea,0xc1,0xac,0xbc}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x55,0x47,0xce,0x4a,0xdf,0x92,0x83,0xd2,0xb9,0x76}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x55,0x90,0xc6,0xe5,0x9e,0xa8,0xf9,0x90,0x2a,0xab}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x58,0x3b,0x73,0xab,0x6b,0x7c,0x6f,0x9b,0xb3,0x3a}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x58,0xbe,0x2b,0xfb,0xe4,0x68,0xf5,0xea,0x52,0x6f}, 8352}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x65,0xa9,0xd7,0x1b,0x40,0x30,0xa4,0xf6,0x19,0x57}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x66,0x6e,0xa4,0x3d,0x18,0x22,0x80,0xe3,0xfd,0x98}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x6f,0xa3,0x65,0xc6,0x76,0x7c,0x05,0xf8,0x59,0xdf}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x6a,0x77,0xee,0x6b,0x98,0x10,0xa0,0xf3,0xfb,0x59}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x76,0xbb,0xeb,0x7e,0x7b,0xa8,0x8c,0xa9,0xb2,0xea}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x77,0x24,0xbe,0xb4,0x1e,0x49,0x20,0x64,0x6d,0x7e}, 8333}, {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x72,0x87,0x94,0x82,0x36,0x22,0x83,0x23,0xb5,0xc5}, 8333}, - {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x7a,0x4c,0x71,0x22,0xb9,0x53,0x89,0x19,0x12,0x43}, 8333}, - {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x8d,0xbe,0xe1,0x25,0x73,0x45,0xf5,0xe6,0x10,0xad}, 8333}, - {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0xa5,0xa5,0xf4,0x4c,0x8f,0xfb,0xb7,0x84,0x36,0xee}, 8333}, - {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0xaa,0xb7,0x04,0x8c,0x87,0xc6,0x38,0x3b,0x0a,0xf6}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x76,0x08,0x1c,0x0d,0x7a,0x78,0x05,0x7f,0x57,0x5e}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x7f,0x59,0x7d,0x21,0x89,0xff,0x46,0xf6,0x21,0x84}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x7c,0x84,0xef,0x06,0xe9,0x25,0x96,0x98,0x8b,0x37}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x7d,0xe6,0x69,0x58,0x93,0xf4,0xd6,0x68,0x86,0xc9}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x88,0x79,0x5d,0x94,0xe6,0xbe,0xb3,0x1e,0x46,0x24}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x8a,0x56,0xd7,0xec,0xf6,0xac,0x64,0xc0,0x3f,0xc4}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x8a,0xc0,0x54,0x31,0x42,0x9d,0x73,0xed,0xad,0x66}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x8d,0xd3,0x5c,0x74,0x98,0x9c,0xc8,0xfe,0xce,0x72}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x91,0x1d,0x25,0x50,0x79,0x57,0xaa,0xdf,0x32,0x19}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x9b,0xcc,0x3a,0x16,0xf7,0x95,0xb6,0x95,0x44,0x65}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x9d,0x11,0x8a,0xc0,0xc8,0xdb,0xbd,0xfe,0xbd,0x21}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x9d,0xf9,0x91,0xfc,0x7d,0x25,0xdc,0xd6,0x85,0x67}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0xa3,0x94,0x6f,0x02,0xa5,0x30,0x4e,0xe2,0xae,0x5b}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0xae,0xcc,0x97,0x9c,0xd0,0xc7,0x4f,0x83,0x09,0x8b}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0xa9,0xc6,0xeb,0xc2,0x1e,0xdd,0xe3,0xdd,0xb9,0x7f}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0xaa,0x24,0x4a,0xc5,0x19,0xce,0xe1,0x4c,0x00,0xc9}, 8333}, {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0xac,0x1f,0x82,0x69,0x5d,0x88,0xa1,0x54,0xf5,0x90}, 8333}, - {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0xb3,0xd1,0xf8,0xbe,0xa7,0x6b,0x46,0xbe,0xe8,0x84}, 8333} + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0xb1,0x65,0x7d,0x19,0x1f,0x1a,0x4f,0x8d,0x68,0xea}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0xb1,0xbd,0x5b,0x30,0x31,0xce,0x31,0x90,0x3e,0x8d}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0xbd,0x03,0xcb,0x6e,0xdc,0xb5,0x95,0xdf,0x5d,0x10}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0xc0,0x91,0x56,0xb9,0x9c,0xe0,0xd9,0x7b,0xf1,0xc1}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0xc5,0xa4,0xaa,0x14,0x5e,0xd0,0x4b,0xa2,0xd1,0x9c}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0xcf,0x0a,0x0b,0xea,0xb7,0x36,0xb7,0x3d,0x0c,0x65}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0xcb,0xba,0x35,0x2e,0xc4,0x5b,0x07,0x17,0xbb,0xad}, 8333} }; static SeedSpec6 pnSeed6_test[] = { diff --git a/src/checkpoints.cpp b/src/checkpoints.cpp index 9a20747049..13b5876530 100644 --- a/src/checkpoints.cpp +++ b/src/checkpoints.cpp @@ -15,46 +15,6 @@ namespace Checkpoints { - /** - * How many times slower we expect checking transactions after the last - * checkpoint to be (from checking signatures, which is skipped up to the - * last checkpoint). This number is a compromise, as it can't be accurate - * for every system. When reindexing from a fast disk with a slow CPU, it - * can be up to 20, while when downloading from a slow network with a - * fast multicore CPU, it won't be much higher than 1. - */ - static const double SIGCHECK_VERIFICATION_FACTOR = 5.0; - - //! Guess how far we are in the verification process at the given block index - double GuessVerificationProgress(const CCheckpointData& data, CBlockIndex *pindex, bool fSigchecks) { - if (pindex==NULL) - return 0.0; - - int64_t nNow = time(NULL); - - double fSigcheckVerificationFactor = fSigchecks ? SIGCHECK_VERIFICATION_FACTOR : 1.0; - double fWorkBefore = 0.0; // Amount of work done before pindex - double fWorkAfter = 0.0; // Amount of work left after pindex (estimated) - // Work is defined as: 1.0 per transaction before the last checkpoint, and - // fSigcheckVerificationFactor per transaction after. - - if (pindex->nChainTx <= data.nTransactionsLastCheckpoint) { - double nCheapBefore = pindex->nChainTx; - double nCheapAfter = data.nTransactionsLastCheckpoint - pindex->nChainTx; - double nExpensiveAfter = (nNow - data.nTimeLastCheckpoint)/86400.0*data.fTransactionsPerDay; - fWorkBefore = nCheapBefore; - fWorkAfter = nCheapAfter + nExpensiveAfter*fSigcheckVerificationFactor; - } else { - double nCheapBefore = data.nTransactionsLastCheckpoint; - double nExpensiveBefore = pindex->nChainTx - data.nTransactionsLastCheckpoint; - double nExpensiveAfter = (nNow - pindex->GetBlockTime())/86400.0*data.fTransactionsPerDay; - fWorkBefore = nCheapBefore + nExpensiveBefore*fSigcheckVerificationFactor; - fWorkAfter = nExpensiveAfter*fSigcheckVerificationFactor; - } - - return fWorkBefore / (fWorkBefore + fWorkAfter); - } - CBlockIndex* GetLastCheckpoint(const CCheckpointData& data) { const MapCheckpoints& checkpoints = data.mapCheckpoints; diff --git a/src/checkpoints.h b/src/checkpoints.h index f826de2319..7449d1063b 100644 --- a/src/checkpoints.h +++ b/src/checkpoints.h @@ -22,8 +22,6 @@ namespace Checkpoints //! Returns last CBlockIndex* in mapBlockIndex that is a checkpoint CBlockIndex* GetLastCheckpoint(const CCheckpointData& data); -double GuessVerificationProgress(const CCheckpointData& data, CBlockIndex* pindex, bool fSigchecks = true); - } //namespace Checkpoints #endif // BITCOIN_CHECKPOINTS_H diff --git a/src/clientversion.h b/src/clientversion.h index 0cd7e517ee..69154d546d 100644 --- a/src/clientversion.h +++ b/src/clientversion.h @@ -15,7 +15,7 @@ //! These need to be macros, as clientversion.cpp's and bitcoin*-res.rc's voodoo requires it #define CLIENT_VERSION_MAJOR 0 -#define CLIENT_VERSION_MINOR 13 +#define CLIENT_VERSION_MINOR 14 #define CLIENT_VERSION_REVISION 99 #define CLIENT_VERSION_BUILD 0 @@ -26,7 +26,7 @@ * Copyright year (2009-this) * Todo: update this when changing our copyright comments in the source */ -#define COPYRIGHT_YEAR 2016 +#define COPYRIGHT_YEAR 2017 #endif //HAVE_CONFIG_H diff --git a/src/coins.cpp b/src/coins.cpp index 4d0e4bc0ad..b2e33abf33 100644 --- a/src/coins.cpp +++ b/src/coins.cpp @@ -295,25 +295,6 @@ bool CCoinsViewCache::HaveInputs(const CTransaction& tx) const return true; } -double CCoinsViewCache::GetPriority(const CTransaction &tx, int nHeight, CAmount &inChainInputValue) const -{ - inChainInputValue = 0; - if (tx.IsCoinBase()) - return 0.0; - double dResult = 0.0; - BOOST_FOREACH(const CTxIn& txin, tx.vin) - { - const CCoins* coins = AccessCoins(txin.prevout.hash); - assert(coins); - if (!coins->IsAvailable(txin.prevout.n)) continue; - if (coins->nHeight <= nHeight) { - dResult += (double)(coins->vout[txin.prevout.n].nValue) * (nHeight-coins->nHeight); - inChainInputValue += coins->vout[txin.prevout.n].nValue; - } - } - return tx.ComputePriority(dResult); -} - CCoinsModifier::CCoinsModifier(CCoinsViewCache& cache_, CCoinsMap::iterator it_, size_t usage) : cache(cache_), it(it_), cachedCoinUsage(usage) { assert(!cache.hasModifier); cache.hasModifier = true; diff --git a/src/coins.h b/src/coins.h index 902cb57f69..d921f5c2a5 100644 --- a/src/coins.h +++ b/src/coins.h @@ -460,13 +460,6 @@ public: //! Check whether all prevouts of the transaction are present in the UTXO set represented by this view bool HaveInputs(const CTransaction& tx) const; - /** - * Return priority of tx at height nHeight. Also calculate the sum of the values of the inputs - * that are already in the chain. These are the inputs that will age and increase priority as - * new blocks are added to the chain. - */ - double GetPriority(const CTransaction &tx, int nHeight, CAmount &inChainInputValue) const; - const CTxOut &GetOutputFor(const CTxIn& input) const; friend class CCoinsModifier; diff --git a/src/consensus/params.h b/src/consensus/params.h index edf445e1c7..6240e82857 100644 --- a/src/consensus/params.h +++ b/src/consensus/params.h @@ -47,7 +47,7 @@ struct Params { /** Block height at which BIP66 becomes active */ int BIP66Height; /** - * Minimum blocks including miner confirmation of the total of 2016 blocks in a retargetting period, + * Minimum blocks including miner confirmation of the total of 2016 blocks in a retargeting period, * (nPowTargetTimespan / nPowTargetSpacing) which is also used for BIP9 deployments. * Examples: 1916 for 95%, 1512 for testchains. */ @@ -62,6 +62,7 @@ struct Params { int64_t nPowTargetTimespan; int64_t DifficultyAdjustmentInterval() const { return nPowTargetTimespan / nPowTargetSpacing; } uint256 nMinimumChainWork; + uint256 defaultAssumeValid; }; } // namespace Consensus diff --git a/src/core_read.cpp b/src/core_read.cpp index 85bb62c176..a8d667e3bc 100644 --- a/src/core_read.cpp +++ b/src/core_read.cpp @@ -20,13 +20,11 @@ #include <boost/algorithm/string/split.hpp> #include <boost/assign/list_of.hpp> -using namespace std; - CScript ParseScript(const std::string& s) { CScript result; - static map<string, opcodetype> mapOpNames; + static std::map<std::string, opcodetype> mapOpNames; if (mapOpNames.empty()) { @@ -39,7 +37,7 @@ CScript ParseScript(const std::string& s) const char* name = GetOpName((opcodetype)op); if (strcmp(name, "OP_UNKNOWN") == 0) continue; - string strName(name); + std::string strName(name); mapOpNames[strName] = (opcodetype)op; // Convenience: OP_ADD and just ADD are both recognized: boost::algorithm::replace_first(strName, "OP_", ""); @@ -47,7 +45,7 @@ CScript ParseScript(const std::string& s) } } - vector<string> words; + std::vector<std::string> words; boost::algorithm::split(words, s, boost::algorithm::is_any_of(" \t\n"), boost::algorithm::token_compress_on); for (std::vector<std::string>::const_iterator w = words.begin(); w != words.end(); ++w) @@ -57,16 +55,16 @@ CScript ParseScript(const std::string& s) // Empty string, ignore. (boost::split given '' will return one word) } else if (all(*w, boost::algorithm::is_digit()) || - (boost::algorithm::starts_with(*w, "-") && all(string(w->begin()+1, w->end()), boost::algorithm::is_digit()))) + (boost::algorithm::starts_with(*w, "-") && all(std::string(w->begin()+1, w->end()), boost::algorithm::is_digit()))) { // Number int64_t n = atoi64(*w); result << n; } - else if (boost::algorithm::starts_with(*w, "0x") && (w->begin()+2 != w->end()) && IsHex(string(w->begin()+2, w->end()))) + else if (boost::algorithm::starts_with(*w, "0x") && (w->begin()+2 != w->end()) && IsHex(std::string(w->begin()+2, w->end()))) { // Raw hex data, inserted NOT pushed onto stack: - std::vector<unsigned char> raw = ParseHex(string(w->begin()+2, w->end())); + std::vector<unsigned char> raw = ParseHex(std::string(w->begin()+2, w->end())); result.insert(result.end(), raw.begin(), raw.end()); } else if (w->size() >= 2 && boost::algorithm::starts_with(*w, "'") && boost::algorithm::ends_with(*w, "'")) @@ -83,7 +81,7 @@ CScript ParseScript(const std::string& s) } else { - throw runtime_error("script parse error"); + throw std::runtime_error("script parse error"); } } @@ -95,7 +93,7 @@ bool DecodeHexTx(CMutableTransaction& tx, const std::string& strHexTx, bool fTry if (!IsHex(strHexTx)) return false; - vector<unsigned char> txData(ParseHex(strHexTx)); + std::vector<unsigned char> txData(ParseHex(strHexTx)); if (fTryNoWitness) { CDataStream ssData(txData, SER_NETWORK, PROTOCOL_VERSION | SERIALIZE_TRANSACTION_NO_WITNESS); @@ -113,6 +111,8 @@ bool DecodeHexTx(CMutableTransaction& tx, const std::string& strHexTx, bool fTry CDataStream ssData(txData, SER_NETWORK, PROTOCOL_VERSION); try { ssData >> tx; + if (!ssData.empty()) + return false; } catch (const std::exception&) { return false; @@ -138,9 +138,9 @@ bool DecodeHexBlk(CBlock& block, const std::string& strHexBlk) return true; } -uint256 ParseHashUV(const UniValue& v, const string& strName) +uint256 ParseHashUV(const UniValue& v, const std::string& strName) { - string strHex; + std::string strHex; if (v.isStr()) strHex = v.getValStr(); return ParseHashStr(strHex, strName); // Note: ParseHashStr("") throws a runtime_error @@ -149,19 +149,19 @@ uint256 ParseHashUV(const UniValue& v, const string& strName) uint256 ParseHashStr(const std::string& strHex, const std::string& strName) { if (!IsHex(strHex)) // Note: IsHex("") is false - throw runtime_error(strName+" must be hexadecimal string (not '"+strHex+"')"); + throw std::runtime_error(strName + " must be hexadecimal string (not '" + strHex + "')"); uint256 result; result.SetHex(strHex); return result; } -vector<unsigned char> ParseHexUV(const UniValue& v, const string& strName) +std::vector<unsigned char> ParseHexUV(const UniValue& v, const std::string& strName) { - string strHex; + std::string strHex; if (v.isStr()) strHex = v.getValStr(); if (!IsHex(strHex)) - throw runtime_error(strName+" must be hexadecimal string (not '"+strHex+"')"); + throw std::runtime_error(strName + " must be hexadecimal string (not '" + strHex + "')"); return ParseHex(strHex); } diff --git a/src/core_write.cpp b/src/core_write.cpp index ee8a897ca4..b0993a131f 100644 --- a/src/core_write.cpp +++ b/src/core_write.cpp @@ -18,16 +18,14 @@ #include <boost/assign/list_of.hpp> #include <boost/foreach.hpp> -using namespace std; - -string FormatScript(const CScript& script) +std::string FormatScript(const CScript& script) { - string ret; + std::string ret; CScript::const_iterator it = script.begin(); opcodetype op; while (it != script.end()) { CScript::const_iterator it2 = it; - vector<unsigned char> vch; + std::vector<unsigned char> vch; if (script.GetOp2(it, op, &vch)) { if (op == OP_0) { ret += "0 "; @@ -36,9 +34,9 @@ string FormatScript(const CScript& script) ret += strprintf("%i ", op - OP_1NEGATE - 1); continue; } else if (op >= OP_NOP && op <= OP_NOP10) { - string str(GetOpName(op)); - if (str.substr(0, 3) == string("OP_")) { - ret += str.substr(3, string::npos) + " "; + std::string str(GetOpName(op)); + if (str.substr(0, 3) == std::string("OP_")) { + ret += str.substr(3, std::string::npos) + " "; continue; } } @@ -55,14 +53,14 @@ string FormatScript(const CScript& script) return ret.substr(0, ret.size() - 1); } -const map<unsigned char, string> mapSigHashTypes = +const std::map<unsigned char, std::string> mapSigHashTypes = boost::assign::map_list_of - (static_cast<unsigned char>(SIGHASH_ALL), string("ALL")) - (static_cast<unsigned char>(SIGHASH_ALL|SIGHASH_ANYONECANPAY), string("ALL|ANYONECANPAY")) - (static_cast<unsigned char>(SIGHASH_NONE), string("NONE")) - (static_cast<unsigned char>(SIGHASH_NONE|SIGHASH_ANYONECANPAY), string("NONE|ANYONECANPAY")) - (static_cast<unsigned char>(SIGHASH_SINGLE), string("SINGLE")) - (static_cast<unsigned char>(SIGHASH_SINGLE|SIGHASH_ANYONECANPAY), string("SINGLE|ANYONECANPAY")) + (static_cast<unsigned char>(SIGHASH_ALL), std::string("ALL")) + (static_cast<unsigned char>(SIGHASH_ALL|SIGHASH_ANYONECANPAY), std::string("ALL|ANYONECANPAY")) + (static_cast<unsigned char>(SIGHASH_NONE), std::string("NONE")) + (static_cast<unsigned char>(SIGHASH_NONE|SIGHASH_ANYONECANPAY), std::string("NONE|ANYONECANPAY")) + (static_cast<unsigned char>(SIGHASH_SINGLE), std::string("SINGLE")) + (static_cast<unsigned char>(SIGHASH_SINGLE|SIGHASH_ANYONECANPAY), std::string("SINGLE|ANYONECANPAY")) ; /** @@ -72,11 +70,11 @@ const map<unsigned char, string> mapSigHashTypes = * of a signature. Only pass true for scripts you believe could contain signatures. For example, * pass false, or omit the this argument (defaults to false), for scriptPubKeys. */ -string ScriptToAsmStr(const CScript& script, const bool fAttemptSighashDecode) +std::string ScriptToAsmStr(const CScript& script, const bool fAttemptSighashDecode) { - string str; + std::string str; opcodetype opcode; - vector<unsigned char> vch; + std::vector<unsigned char> vch; CScript::const_iterator pc = script.begin(); while (pc < script.end()) { if (!str.empty()) { @@ -87,12 +85,12 @@ string ScriptToAsmStr(const CScript& script, const bool fAttemptSighashDecode) return str; } if (0 <= opcode && opcode <= OP_PUSHDATA4) { - if (vch.size() <= static_cast<vector<unsigned char>::size_type>(4)) { + if (vch.size() <= static_cast<std::vector<unsigned char>::size_type>(4)) { str += strprintf("%d", CScriptNum(vch, false).getint()); } else { // the IsUnspendable check makes sure not to try to decode OP_RETURN data that may match the format of a signature if (fAttemptSighashDecode && !script.IsUnspendable()) { - string strSigHashDecode; + std::string strSigHashDecode; // goal: only attempt to decode a defined sighash type from data that looks like a signature within a scriptSig. // this won't decode correctly formatted public keys in Pubkey or Multisig scripts due to // the restrictions on the pubkey formats (see IsCompressedOrUncompressedPubKey) being incongruous with the @@ -116,7 +114,7 @@ string ScriptToAsmStr(const CScript& script, const bool fAttemptSighashDecode) return str; } -string EncodeHexTx(const CTransaction& tx, const int serialFlags) +std::string EncodeHexTx(const CTransaction& tx, const int serialFlags) { CDataStream ssTx(SER_NETWORK, PROTOCOL_VERSION | serialFlags); ssTx << tx; @@ -127,7 +125,7 @@ void ScriptPubKeyToUniv(const CScript& scriptPubKey, UniValue& out, bool fIncludeHex) { txnouttype type; - vector<CTxDestination> addresses; + std::vector<CTxDestination> addresses; int nRequired; out.pushKV("asm", ScriptToAsmStr(scriptPubKey)); diff --git a/src/crypto/common.h b/src/crypto/common.h index 580c72f5a6..4a9d1150b6 100644 --- a/src/crypto/common.h +++ b/src/crypto/common.h @@ -10,57 +10,73 @@ #endif #include <stdint.h> +#include <string.h> #include "compat/endian.h" uint16_t static inline ReadLE16(const unsigned char* ptr) { - return le16toh(*((uint16_t*)ptr)); + uint16_t x; + memcpy((char*)&x, ptr, 2); + return le16toh(x); } uint32_t static inline ReadLE32(const unsigned char* ptr) { - return le32toh(*((uint32_t*)ptr)); + uint32_t x; + memcpy((char*)&x, ptr, 4); + return le32toh(x); } uint64_t static inline ReadLE64(const unsigned char* ptr) { - return le64toh(*((uint64_t*)ptr)); + uint64_t x; + memcpy((char*)&x, ptr, 8); + return le64toh(x); } void static inline WriteLE16(unsigned char* ptr, uint16_t x) { - *((uint16_t*)ptr) = htole16(x); + uint16_t v = htole16(x); + memcpy(ptr, (char*)&v, 2); } void static inline WriteLE32(unsigned char* ptr, uint32_t x) { - *((uint32_t*)ptr) = htole32(x); + uint32_t v = htole32(x); + memcpy(ptr, (char*)&v, 4); } void static inline WriteLE64(unsigned char* ptr, uint64_t x) { - *((uint64_t*)ptr) = htole64(x); + uint64_t v = htole64(x); + memcpy(ptr, (char*)&v, 8); } uint32_t static inline ReadBE32(const unsigned char* ptr) { - return be32toh(*((uint32_t*)ptr)); + uint32_t x; + memcpy((char*)&x, ptr, 4); + return be32toh(x); } uint64_t static inline ReadBE64(const unsigned char* ptr) { - return be64toh(*((uint64_t*)ptr)); + uint64_t x; + memcpy((char*)&x, ptr, 8); + return be64toh(x); } void static inline WriteBE32(unsigned char* ptr, uint32_t x) { - *((uint32_t*)ptr) = htobe32(x); + uint32_t v = htobe32(x); + memcpy(ptr, (char*)&v, 4); } void static inline WriteBE64(unsigned char* ptr, uint64_t x) { - *((uint64_t*)ptr) = htobe64(x); + uint64_t v = htobe64(x); + memcpy(ptr, (char*)&v, 8); } #endif // BITCOIN_CRYPTO_COMMON_H diff --git a/src/cuckoocache.h b/src/cuckoocache.h index efd6a820b5..ff47e9776b 100644 --- a/src/cuckoocache.h +++ b/src/cuckoocache.h @@ -257,7 +257,7 @@ private: * * First, epoch_check decrements and checks the cheap heuristic, and then does * a more expensive scan if the cheap heuristic runs out. If the expensive - * scan suceeds, the epochs are aged and old elements are allow_erased. The + * scan succeeds, the epochs are aged and old elements are allow_erased. The * cheap heuristic is reset to retrigger after the worst case growth of the * current epoch's elements would exceed the epoch_size. */ @@ -395,7 +395,7 @@ public: * 1) On first iteration, last_loc == invalid(), find returns last, so * last_loc defaults to locs[0]. * 2) On further iterations, where last_loc == locs[k], last_loc will - * go to locs[k+1 % 8], i.e., next of the 8 indicies wrapping around + * go to locs[k+1 % 8], i.e., next of the 8 indices wrapping around * to 0 if needed. * * This prevents moving the element we just put in. diff --git a/src/hash.cpp b/src/hash.cpp index a399ca9252..a14a2386a2 100644 --- a/src/hash.cpp +++ b/src/hash.cpp @@ -57,7 +57,7 @@ unsigned int MurmurHash3(unsigned int nHashSeed, const std::vector<unsigned char k1 = ROTL32(k1, 15); k1 *= c2; h1 ^= k1; - }; + } } //---------- diff --git a/src/hash.h b/src/hash.h index 3b86fcc033..eacb8f04fe 100644 --- a/src/hash.h +++ b/src/hash.h @@ -25,9 +25,9 @@ public: static const size_t OUTPUT_SIZE = CSHA256::OUTPUT_SIZE; void Finalize(unsigned char hash[OUTPUT_SIZE]) { - unsigned char buf[sha.OUTPUT_SIZE]; + unsigned char buf[CSHA256::OUTPUT_SIZE]; sha.Finalize(buf); - sha.Reset().Write(buf, sha.OUTPUT_SIZE).Finalize(hash); + sha.Reset().Write(buf, CSHA256::OUTPUT_SIZE).Finalize(hash); } CHash256& Write(const unsigned char *data, size_t len) { @@ -49,9 +49,9 @@ public: static const size_t OUTPUT_SIZE = CRIPEMD160::OUTPUT_SIZE; void Finalize(unsigned char hash[OUTPUT_SIZE]) { - unsigned char buf[sha.OUTPUT_SIZE]; + unsigned char buf[CSHA256::OUTPUT_SIZE]; sha.Finalize(buf); - CRIPEMD160().Write(buf, sha.OUTPUT_SIZE).Finalize(hash); + CRIPEMD160().Write(buf, CSHA256::OUTPUT_SIZE).Finalize(hash); } CHash160& Write(const unsigned char *data, size_t len) { diff --git a/src/httprpc.cpp b/src/httprpc.cpp index 742ff2b8fb..8ac6925acd 100644 --- a/src/httprpc.cpp +++ b/src/httprpc.cpp @@ -25,7 +25,7 @@ static const char* WWW_AUTH_HEADER_DATA = "Basic realm=\"jsonrpc\""; /** Simple one-shot callback timer to be used by the RPC mechanism to e.g. - * re-lock the wellet. + * re-lock the wallet. */ class HTTPRPCTimer : public RPCTimerBase { @@ -112,9 +112,9 @@ static bool multiUserAuthorized(std::string strUserPass) std::string strSalt = vFields[1]; std::string strHash = vFields[2]; - unsigned int KEY_SIZE = 32; - unsigned char *out = new unsigned char[KEY_SIZE]; - + static const unsigned int KEY_SIZE = 32; + unsigned char out[KEY_SIZE]; + CHMAC_SHA256(reinterpret_cast<const unsigned char*>(strSalt.c_str()), strSalt.size()).Write(reinterpret_cast<const unsigned char*>(strPass.c_str()), strPass.size()).Finalize(out); std::vector<unsigned char> hexvec(out, out+KEY_SIZE); std::string strHashFromPass = HexStr(hexvec); diff --git a/src/httpserver.cpp b/src/httpserver.cpp index 1692b43f28..e1763c6ad2 100644 --- a/src/httpserver.cpp +++ b/src/httpserver.cpp @@ -118,7 +118,7 @@ public: void Run() { ThreadCounter count(*this); - while (running) { + while (true) { std::unique_ptr<WorkItem> i; { std::unique_lock<std::mutex> lock(cs); diff --git a/src/init.cpp b/src/init.cpp index 992ce8ebdc..93131b4f94 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -65,8 +65,6 @@ #include "zmq/zmqnotificationinterface.h" #endif -using namespace std; - bool fFeeEstimatesInitialized = false; static const bool DEFAULT_PROXYRANDOMIZE = true; static const bool DEFAULT_REST_ENABLE = false; @@ -120,10 +118,6 @@ static const char* FEE_ESTIMATES_FILENAME="fee_estimates.dat"; // threads that should only be stopped after the main network-processing // threads have exited. // -// Note that if running -daemon the parent process returns from AppInit2 -// before adding any threads to the threadGroup, so .join_all() returns -// immediately and the parent exits from main(). -// // Shutdown for Qt is very similar, only it uses a QTimer to detect // fRequestShutdown getting set, and then does the normal Qt // shutdown thing. @@ -190,7 +184,7 @@ void Shutdown() if (!lockShutdown) return; - /// Note: Shutdown() must be able to handle cases in which AppInit2() failed part of the way, + /// Note: Shutdown() must be able to handle cases in which initialization failed part of the way, /// for example if the data directory was found to be locked. /// Be sure that anything that writes files or flushes caches only does this if the respective /// module was initialized. @@ -310,10 +304,10 @@ void OnRPCStopped() void OnRPCPreCommand(const CRPCCommand& cmd) { // Observe safe mode - string strWarning = GetWarnings("rpc"); + std::string strWarning = GetWarnings("rpc"); if (strWarning != "" && !GetBoolArg("-disablesafemode", DEFAULT_DISABLE_SAFEMODE) && !cmd.okSafeMode) - throw JSONRPCError(RPC_FORBIDDEN_BY_SAFE_MODE, string("Safe mode: ") + strWarning); + throw JSONRPCError(RPC_FORBIDDEN_BY_SAFE_MODE, std::string("Safe mode: ") + strWarning); } std::string HelpMessage(HelpMessageMode mode) @@ -322,15 +316,14 @@ std::string HelpMessage(HelpMessageMode mode) // When adding new options to the categories, please keep and ensure alphabetical ordering. // Do not translate _(...) -help-debug options, Many technical terms, and only a very small audience, so is unnecessary stress to translators. - string strUsage = HelpMessageGroup(_("Options:")); + std::string strUsage = HelpMessageGroup(_("Options:")); strUsage += HelpMessageOpt("-?", _("Print this help message and exit")); strUsage += HelpMessageOpt("-version", _("Print version and exit")); strUsage += HelpMessageOpt("-alertnotify=<cmd>", _("Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)")); strUsage += HelpMessageOpt("-blocknotify=<cmd>", _("Execute command when the best block changes (%s in cmd is replaced by block hash)")); if (showDebug) strUsage += HelpMessageOpt("-blocksonly", strprintf(_("Whether to operate in a blocks only mode (default: %u)"), DEFAULT_BLOCKSONLY)); - strUsage += HelpMessageOpt("-checkblocks=<n>", strprintf(_("How many blocks to check at startup (default: %u, 0 = all)"), DEFAULT_CHECKBLOCKS)); - strUsage += HelpMessageOpt("-checklevel=<n>", strprintf(_("How thorough the block verification of -checkblocks is (0-4, default: %u)"), DEFAULT_CHECKLEVEL)); + strUsage +=HelpMessageOpt("-assumevalid=<hex>", strprintf(_("If this block is in the chain assume that it and its ancestors are valid and potentially skip their script verification (0 to verify all, default: %s, testnet: %s)"), Params(CBaseChainParams::MAIN).GetConsensus().defaultAssumeValid.GetHex(), Params(CBaseChainParams::TESTNET).GetConsensus().defaultAssumeValid.GetHex())); strUsage += HelpMessageOpt("-conf=<file>", strprintf(_("Specify configuration file (default: %s)"), BITCOIN_CONF_FILENAME)); if (mode == HMM_BITCOIND) { @@ -346,14 +339,15 @@ std::string HelpMessage(HelpMessageMode mode) strUsage += HelpMessageOpt("-maxorphantx=<n>", strprintf(_("Keep at most <n> unconnectable transactions in memory (default: %u)"), DEFAULT_MAX_ORPHAN_TRANSACTIONS)); strUsage += HelpMessageOpt("-maxmempool=<n>", strprintf(_("Keep the transaction memory pool below <n> megabytes (default: %u)"), DEFAULT_MAX_MEMPOOL_SIZE)); strUsage += HelpMessageOpt("-mempoolexpiry=<n>", strprintf(_("Do not keep transactions in the mempool longer than <n> hours (default: %u)"), DEFAULT_MEMPOOL_EXPIRY)); + strUsage += HelpMessageOpt("-blockreconstructionextratxn=<n>", strprintf(_("Extra transactions to keep in memory for compact block reconstructions (default: %u)"), DEFAULT_BLOCK_RECONSTRUCTION_EXTRA_TXN)); strUsage += HelpMessageOpt("-par=<n>", strprintf(_("Set the number of script verification threads (%u to %d, 0 = auto, <0 = leave that many cores free, default: %d)"), -GetNumCores(), MAX_SCRIPTCHECK_THREADS, DEFAULT_SCRIPTCHECK_THREADS)); #ifndef WIN32 strUsage += HelpMessageOpt("-pid=<file>", strprintf(_("Specify pid file (default: %s)"), BITCOIN_PID_FILENAME)); #endif - strUsage += HelpMessageOpt("-prune=<n>", strprintf(_("Reduce storage requirements by pruning (deleting) old blocks. This mode is incompatible with -txindex and -rescan. " + strUsage += HelpMessageOpt("-prune=<n>", strprintf(_("Reduce storage requirements by enabling pruning (deleting) of old blocks. This allows the pruneblockchain RPC to be called to delete specific blocks, and enables automatic pruning of old blocks if a target size in MiB is provided. This mode is incompatible with -txindex and -rescan. " "Warning: Reverting this setting requires re-downloading the entire blockchain. " - "(default: 0 = disable pruning blocks, >%u = target size in MiB to use for block files)"), MIN_DISK_SPACE_FOR_BLOCK_FILES / 1024 / 1024)); + "(default: 0 = disable pruning blocks, 1 = allow manual pruning via RPC, >%u = automatically prune block files to stay under the specified target size in MiB)"), MIN_DISK_SPACE_FOR_BLOCK_FILES / 1024 / 1024)); strUsage += HelpMessageOpt("-reindex-chainstate", _("Rebuild chain state from the currently indexed blocks")); strUsage += HelpMessageOpt("-reindex", _("Rebuild chain state and block index from the blk*.dat files on disk")); #ifndef WIN32 @@ -420,6 +414,8 @@ std::string HelpMessage(HelpMessageMode mode) strUsage += HelpMessageOpt("-uacomment=<cmt>", _("Append comment to the user agent string")); if (showDebug) { + strUsage += HelpMessageOpt("-checkblocks=<n>", strprintf(_("How many blocks to check at startup (default: %u, 0 = all)"), DEFAULT_CHECKBLOCKS)); + strUsage += HelpMessageOpt("-checklevel=<n>", strprintf(_("How thorough the block verification of -checkblocks is (0-4, default: %u)"), DEFAULT_CHECKLEVEL)); strUsage += HelpMessageOpt("-checkblockindex", strprintf("Do a full consistency check for mapBlockIndex, setBlockIndexCandidates, chainActive and mapBlocksUnlinked occasionally. Also sets -checkmempool (default: %u)", Params(CBaseChainParams::MAIN).DefaultConsistencyChecks())); strUsage += HelpMessageOpt("-checkmempool=<n>", strprintf("Run checks every <n> transactions (default: %u)", Params(CBaseChainParams::MAIN).DefaultConsistencyChecks())); strUsage += HelpMessageOpt("-checkpoints", strprintf("Disable expensive verification for known chain history (default: %u)", DEFAULT_CHECKPOINTS_ENABLED)); @@ -434,7 +430,7 @@ std::string HelpMessage(HelpMessageMode mode) strUsage += HelpMessageOpt("-limitdescendantsize=<n>", strprintf("Do not accept transactions if any ancestor would have more than <n> kilobytes of in-mempool descendants (default: %u).", DEFAULT_DESCENDANT_SIZE_LIMIT)); strUsage += HelpMessageOpt("-bip9params=deployment:start:end", "Use given start/end times for specified BIP9 deployment (regtest-only)"); } - string debugCategories = "addrman, alert, bench, cmpctblock, coindb, db, http, libevent, lock, mempool, mempoolrej, net, proxy, prune, rand, reindex, rpc, selectcoins, tor, zmq"; // Don't translate these and qt below + std::string debugCategories = "addrman, alert, bench, cmpctblock, coindb, db, http, libevent, lock, mempool, mempoolrej, net, proxy, prune, rand, reindex, rpc, selectcoins, tor, zmq"; // Don't translate these and qt below if (mode == HMM_BITCOIN_QT) debugCategories += ", qt"; strUsage += HelpMessageOpt("-debug=<category>", strprintf(_("Output debugging information (default: %u, supplying <category> is optional)"), 0) + ". " + @@ -448,8 +444,6 @@ std::string HelpMessage(HelpMessageMode mode) { strUsage += HelpMessageOpt("-logtimemicros", strprintf("Add microsecond precision to debug timestamps (default: %u)", DEFAULT_LOGTIMEMICROS)); strUsage += HelpMessageOpt("-mocktime=<n>", "Replace actual time with <n> seconds since epoch (default: 0)"); - strUsage += HelpMessageOpt("-limitfreerelay=<n>", strprintf("Continuously rate-limit free transactions to <n>*1000 bytes per minute (default: %u)", DEFAULT_LIMITFREERELAY)); - strUsage += HelpMessageOpt("-relaypriority", strprintf("Require high priority for relaying free or low-fee transactions (default: %u)", DEFAULT_RELAYPRIORITY)); strUsage += HelpMessageOpt("-maxsigcachesize=<n>", strprintf("Limit size of signature cache to <n> MiB (default: %u)", DEFAULT_MAX_SIG_CACHE_SIZE)); strUsage += HelpMessageOpt("-maxtipage=<n>", strprintf("Maximum tip age in seconds to consider node in initial block download (default: %u)", DEFAULT_MAX_TIP_AGE)); } @@ -460,15 +454,18 @@ std::string HelpMessage(HelpMessageMode mode) strUsage += HelpMessageOpt("-printtoconsole", _("Send trace/debug info to console instead of debug.log file")); if (showDebug) { - strUsage += HelpMessageOpt("-printpriority", strprintf("Log transaction priority and fee per kB when mining blocks (default: %u)", DEFAULT_PRINTPRIORITY)); + strUsage += HelpMessageOpt("-printpriority", strprintf("Log transaction fee per kB when mining blocks (default: %u)", DEFAULT_PRINTPRIORITY)); } strUsage += HelpMessageOpt("-shrinkdebugfile", _("Shrink debug.log file on client startup (default: 1 when no -debug)")); AppendParamsHelpMessages(strUsage, showDebug); strUsage += HelpMessageGroup(_("Node relay options:")); - if (showDebug) + if (showDebug) { strUsage += HelpMessageOpt("-acceptnonstdtxn", strprintf("Relay and mine \"non-standard\" transactions (%sdefault: %u)", "testnet/regtest only; ", !Params(CBaseChainParams::TESTNET).RequireStandard())); + strUsage += HelpMessageOpt("-incrementalrelayfee=<amt>", strprintf("Fee rate (in %s/kB) used to define cost of relay, used for mempool limiting and BIP 125 replacement. (default: %s)", CURRENCY_UNIT, FormatMoney(DEFAULT_INCREMENTAL_RELAY_FEE))); + strUsage += HelpMessageOpt("-dustrelayfee=<amt>", strprintf("Fee rate (in %s/kB) used to defined dust, the value of an output such that it will cost about 1/3 of its value in fees at this fee rate to spend it. (default: %s)", CURRENCY_UNIT, FormatMoney(DUST_RELAY_TX_FEE))); + } strUsage += HelpMessageOpt("-bytespersigop", strprintf(_("Equivalent bytes per sigop in transactions for relay and mining (default: %u)"), DEFAULT_BYTES_PER_SIGOP)); strUsage += HelpMessageOpt("-datacarrier", strprintf(_("Relay and mine data carrier transactions (default: %u)"), DEFAULT_ACCEPT_DATACARRIER)); strUsage += HelpMessageOpt("-datacarriersize", strprintf(_("Maximum size of data in data carrier transactions we relay and mine (default: %u)"), MAX_OP_RETURN_RELAY)); @@ -477,14 +474,14 @@ std::string HelpMessage(HelpMessageMode mode) strUsage += HelpMessageGroup(_("Block creation options:")); strUsage += HelpMessageOpt("-blockmaxweight=<n>", strprintf(_("Set maximum BIP141 block weight (default: %d)"), DEFAULT_BLOCK_MAX_WEIGHT)); strUsage += HelpMessageOpt("-blockmaxsize=<n>", strprintf(_("Set maximum block size in bytes (default: %d)"), DEFAULT_BLOCK_MAX_SIZE)); - strUsage += HelpMessageOpt("-blockprioritysize=<n>", strprintf(_("Set maximum size of high-priority/low-fee transactions in bytes (default: %d)"), DEFAULT_BLOCK_PRIORITY_SIZE)); + strUsage += HelpMessageOpt("-blockmintxfee=<amt>", strprintf(_("Set lowest fee rate (in %s/kB) for transactions to be included in block creation. (default: %s)"), CURRENCY_UNIT, FormatMoney(DEFAULT_BLOCK_MIN_TX_FEE))); if (showDebug) strUsage += HelpMessageOpt("-blockversion=<n>", "Override block version to test forking scenarios"); strUsage += HelpMessageGroup(_("RPC server options:")); strUsage += HelpMessageOpt("-server", _("Accept command line and JSON-RPC commands")); strUsage += HelpMessageOpt("-rest", strprintf(_("Accept public REST requests (default: %u)"), DEFAULT_REST_ENABLE)); - strUsage += HelpMessageOpt("-rpcbind=<addr>", _("Bind to given address to listen for JSON-RPC connections. Use [host]:port notation for IPv6. This option can be specified multiple times (default: bind to all interfaces)")); + strUsage += HelpMessageOpt("-rpcbind=<addr>[:port]", _("Bind to given address to listen for JSON-RPC connections. This option is ignored unless -rpcallowip is also passed. Port is optional and overrides -rpcport. Use [host]:port notation for IPv6. This option can be specified multiple times (default: 127.0.0.1 and ::1 i.e., localhost, or if -rpcallowip has been specified, 0.0.0.0 and :: i.e., all addresses)")); strUsage += HelpMessageOpt("-rpccookiefile=<loc>", _("Location of the auth cookie (default: data dir)")); strUsage += HelpMessageOpt("-rpcuser=<user>", _("Username for JSON-RPC connections")); strUsage += HelpMessageOpt("-rpcpassword=<pw>", _("Password for JSON-RPC connections")); @@ -570,15 +567,14 @@ struct CImportingNow // works correctly. void CleanupBlockRevFiles() { - using namespace boost::filesystem; - map<string, path> mapBlockFiles; + std::map<std::string, boost::filesystem::path> mapBlockFiles; // Glob all blk?????.dat and rev?????.dat files from the blocks directory. // Remove the rev files immediately and insert the blk file paths into an // ordered map keyed by block file index. LogPrintf("Removing unusable blk?????.dat and rev?????.dat files for -reindex with -prune\n"); - path blocksdir = GetDataDir() / "blocks"; - for (directory_iterator it(blocksdir); it != directory_iterator(); it++) { + boost::filesystem::path blocksdir = GetDataDir() / "blocks"; + for (boost::filesystem::directory_iterator it(blocksdir); it != boost::filesystem::directory_iterator(); it++) { if (is_regular_file(*it) && it->path().filename().string().length() == 12 && it->path().filename().string().substr(8,4) == ".dat") @@ -595,7 +591,7 @@ void CleanupBlockRevFiles() // keeping a separate counter. Once we hit a gap (or if 0 doesn't exist) // start removing block files. int nContigCounter = 0; - BOOST_FOREACH(const PAIRTYPE(string, path)& item, mapBlockFiles) { + BOOST_FOREACH(const PAIRTYPE(std::string, boost::filesystem::path)& item, mapBlockFiles) { if (atoi(item.first) == nContigCounter) { nContigCounter++; continue; @@ -684,9 +680,15 @@ bool InitSanityCheck(void) InitError("Elliptic curve cryptography sanity check failure. Aborting."); return false; } + if (!glibc_sanity_test() || !glibcxx_sanity_test()) return false; + if (!Random_SanityCheck()) { + InitError("OS cryptographic RNG sanity check failure. Aborting."); + return false; + } + return true; } @@ -798,6 +800,19 @@ ServiceFlags nLocalServices = NODE_NETWORK; } +[[noreturn]] static void new_handler_terminate() +{ + // Rather than throwing std::bad-alloc if allocation fails, terminate + // immediately to (try to) avoid chain corruption. + // Since LogPrintf may itself allocate memory, set the handler directly + // to terminate first. + std::set_new_handler(std::terminate); + LogPrintf("Error: Out of memory. Terminating.\n"); + + // The log was successful, terminate now. + std::terminate(); +}; + bool AppInitBasicSetup() { // ********************************************************* Step 1: setup @@ -850,6 +865,9 @@ bool AppInitBasicSetup() // Ignore SIGPIPE, otherwise it will bring the daemon down if the client closes unexpectedly signal(SIGPIPE, SIG_IGN); #endif + + std::set_new_handler(new_handler_terminate); + return true; } @@ -888,8 +906,8 @@ bool AppInitParameterInteraction() fDebug = mapMultiArgs.count("-debug"); // Special-case: if -debug=0/-nodebug is set, turn off debugging messages if (fDebug) { - const vector<string>& categories = mapMultiArgs.at("-debug"); - if (GetBoolArg("-nodebug", false) || find(categories.begin(), categories.end(), string("0")) != categories.end()) + const std::vector<std::string>& categories = mapMultiArgs.at("-debug"); + if (GetBoolArg("-nodebug", false) || find(categories.begin(), categories.end(), std::string("0")) != categories.end()) fDebug = false; } @@ -920,11 +938,26 @@ bool AppInitParameterInteraction() fCheckBlockIndex = GetBoolArg("-checkblockindex", chainparams.DefaultConsistencyChecks()); fCheckpointsEnabled = GetBoolArg("-checkpoints", DEFAULT_CHECKPOINTS_ENABLED); + hashAssumeValid = uint256S(GetArg("-assumevalid", chainparams.GetConsensus().defaultAssumeValid.GetHex())); + if (!hashAssumeValid.IsNull()) + LogPrintf("Assuming ancestors of block %s have valid signatures.\n", hashAssumeValid.GetHex()); + else + LogPrintf("Validating signatures for all blocks.\n"); + // mempool limits int64_t nMempoolSizeMax = GetArg("-maxmempool", DEFAULT_MAX_MEMPOOL_SIZE) * 1000000; int64_t nMempoolSizeMin = GetArg("-limitdescendantsize", DEFAULT_DESCENDANT_SIZE_LIMIT) * 1000 * 40; if (nMempoolSizeMax < 0 || nMempoolSizeMax < nMempoolSizeMin) return InitError(strprintf(_("-maxmempool must be at least %d MB"), std::ceil(nMempoolSizeMin / 1000000.0))); + // incremental relay fee sets the minimum feerate increase necessary for BIP 125 replacement in the mempool + // and the amount the mempool min fee increases above the feerate of txs evicted due to mempool limiting. + if (IsArgSet("-incrementalrelayfee")) + { + CAmount n = 0; + if (!ParseMoney(GetArg("-incrementalrelayfee", ""), n)) + return InitError(AmountErrMsg("incrementalrelayfee", GetArg("-incrementalrelayfee", ""))); + incrementalRelayFee = CFeeRate(n); + } // -par=0 means autodetect, but nScriptCheckThreads==0 means no concurrency nScriptCheckThreads = GetArg("-par", DEFAULT_SCRIPTCHECK_THREADS); @@ -936,12 +969,16 @@ bool AppInitParameterInteraction() nScriptCheckThreads = MAX_SCRIPTCHECK_THREADS; // block pruning; get the amount of disk space (in MiB) to allot for block & undo files - int64_t nSignedPruneTarget = GetArg("-prune", 0) * 1024 * 1024; - if (nSignedPruneTarget < 0) { + int64_t nPruneArg = GetArg("-prune", 0); + if (nPruneArg < 0) { return InitError(_("Prune cannot be configured with a negative value.")); } - nPruneTarget = (uint64_t) nSignedPruneTarget; - if (nPruneTarget) { + nPruneTarget = (uint64_t) nPruneArg * 1024 * 1024; + if (nPruneArg == 1) { // manual pruning: -prune=1 + LogPrintf("Block pruning enabled. Use RPC call pruneblockchain(height) to manually prune block and undo files.\n"); + nPruneTarget = std::numeric_limits<uint64_t>::max(); + fPruneMode = true; + } else if (nPruneTarget) { if (nPruneTarget < MIN_DISK_SPACE_FOR_BLOCK_FILES) { return InitError(strprintf(_("Prune configured below the minimum of %d MiB. Please use a higher number."), MIN_DISK_SPACE_FOR_BLOCK_FILES / 1024 / 1024)); } @@ -958,19 +995,43 @@ bool AppInitParameterInteraction() if (nConnectTimeout <= 0) nConnectTimeout = DEFAULT_CONNECT_TIMEOUT; - // Fee-per-kilobyte amount considered the same as "free" + // Fee-per-kilobyte amount required for mempool acceptance and relay // If you are mining, be careful setting this: // if you set it to zero then // a transaction spammer can cheaply fill blocks using - // 1-satoshi-fee transactions. It should be set above the real + // 0-fee transactions. It should be set above the real // cost to you of processing a transaction. if (IsArgSet("-minrelaytxfee")) { CAmount n = 0; - if (!ParseMoney(GetArg("-minrelaytxfee", ""), n) || 0 == n) + if (!ParseMoney(GetArg("-minrelaytxfee", ""), n)) { return InitError(AmountErrMsg("minrelaytxfee", GetArg("-minrelaytxfee", ""))); + } // High fee check is done afterward in CWallet::ParameterInteraction() ::minRelayTxFee = CFeeRate(n); + } else if (incrementalRelayFee > ::minRelayTxFee) { + // Allow only setting incrementalRelayFee to control both + ::minRelayTxFee = incrementalRelayFee; + LogPrintf("Increasing minrelaytxfee to %s to match incrementalrelayfee\n",::minRelayTxFee.ToString()); + } + + // Sanity check argument for min fee for including tx in block + // TODO: Harmonize which arguments need sanity checking and where that happens + if (IsArgSet("-blockmintxfee")) + { + CAmount n = 0; + if (!ParseMoney(GetArg("-blockmintxfee", ""), n)) + return InitError(AmountErrMsg("blockmintxfee", GetArg("-blockmintxfee", ""))); + } + + // Feerate used to define dust. Shouldn't be changed lightly as old + // implementations may inadvertently create non-standard transactions + if (IsArgSet("-dustrelayfee")) + { + CAmount n = 0; + if (!ParseMoney(GetArg("-dustrelayfee", ""), n) || 0 == n) + return InitError(AmountErrMsg("dustrelayfee", GetArg("-dustrelayfee", ""))); + dustRelayFee = CFeeRate(n); } fRequireStandard = !GetBoolArg("-acceptnonstdtxn", !chainparams.RequireStandard()); @@ -1015,7 +1076,7 @@ bool AppInitParameterInteraction() if (!chainparams.MineBlocksOnDemand()) { return InitError("BIP9 parameters may only be overridden on regtest."); } - const vector<string>& deployments = mapMultiArgs.at("-bip9params"); + const std::vector<std::string>& deployments = mapMultiArgs.at("-bip9params"); for (auto i : deployments) { std::vector<std::string> vDeploymentParams; boost::split(vDeploymentParams, i, boost::is_any_of(":")); @@ -1101,8 +1162,11 @@ bool AppInitMain(boost::thread_group& threadGroup, CScheduler& scheduler) #ifndef WIN32 CreatePidFile(GetPidFile(), getpid()); #endif - if (GetBoolArg("-shrinkdebugfile", !fDebug)) + if (GetBoolArg("-shrinkdebugfile", !fDebug)) { + // Do this first since it both loads a bunch of debug.log into memory, + // and because this needs to happen before any other debug.log printing ShrinkDebugFile(); + } if (fPrintToDebugLog) OpenDebugLog(); @@ -1160,9 +1224,9 @@ bool AppInitMain(boost::thread_group& threadGroup, CScheduler& scheduler) RegisterNodeSignals(GetNodeSignals()); // sanitize comments per BIP-0014, format user agent and check total size - std::vector<string> uacomments; + std::vector<std::string> uacomments; if (mapMultiArgs.count("-uacomment")) { - BOOST_FOREACH(string cmt, mapMultiArgs.at("-uacomment")) + BOOST_FOREACH(std::string cmt, mapMultiArgs.at("-uacomment")) { if (cmt != SanitizeString(cmt, SAFE_CHARS_UA_COMMENT)) return InitError(strprintf(_("User Agent comment (%s) contains unsafe characters."), cmt)); @@ -1200,16 +1264,23 @@ bool AppInitMain(boost::thread_group& threadGroup, CScheduler& scheduler) } } + // Check for host lookup allowed before parsing any network related parameters + fNameLookup = GetBoolArg("-dns", DEFAULT_NAME_LOOKUP); + bool proxyRandomize = GetBoolArg("-proxyrandomize", DEFAULT_PROXYRANDOMIZE); // -proxy sets a proxy for all outgoing network traffic // -noproxy (or -proxy=0) as well as the empty string can be used to not set a proxy, this is the default std::string proxyArg = GetArg("-proxy", ""); SetLimited(NET_TOR); if (proxyArg != "" && proxyArg != "0") { - CService resolved(LookupNumeric(proxyArg.c_str(), 9050)); - proxyType addrProxy = proxyType(resolved, proxyRandomize); + CService proxyAddr; + if (!Lookup(proxyArg.c_str(), proxyAddr, 9050, fNameLookup)) { + return InitError(strprintf(_("Invalid -proxy address or hostname: '%s'"), proxyArg)); + } + + proxyType addrProxy = proxyType(proxyAddr, proxyRandomize); if (!addrProxy.IsValid()) - return InitError(strprintf(_("Invalid -proxy address: '%s'"), proxyArg)); + return InitError(strprintf(_("Invalid -proxy address or hostname: '%s'"), proxyArg)); SetProxy(NET_IPV4, addrProxy); SetProxy(NET_IPV6, addrProxy); @@ -1226,10 +1297,13 @@ bool AppInitMain(boost::thread_group& threadGroup, CScheduler& scheduler) if (onionArg == "0") { // Handle -noonion/-onion=0 SetLimited(NET_TOR); // set onions as unreachable } else { - CService resolved(LookupNumeric(onionArg.c_str(), 9050)); - proxyType addrOnion = proxyType(resolved, proxyRandomize); + CService onionProxy; + if (!Lookup(onionArg.c_str(), onionProxy, 9050, fNameLookup)) { + return InitError(strprintf(_("Invalid -onion address or hostname: '%s'"), onionArg)); + } + proxyType addrOnion = proxyType(onionProxy, proxyRandomize); if (!addrOnion.IsValid()) - return InitError(strprintf(_("Invalid -onion address: '%s'"), onionArg)); + return InitError(strprintf(_("Invalid -onion address or hostname: '%s'"), onionArg)); SetProxy(NET_TOR, addrOnion); SetLimited(NET_TOR, false); } @@ -1238,7 +1312,6 @@ bool AppInitMain(boost::thread_group& threadGroup, CScheduler& scheduler) // see Step 2: parameter interactions for more information about these fListen = GetBoolArg("-listen", DEFAULT_LISTEN); fDiscover = GetBoolArg("-discover", true); - fNameLookup = GetBoolArg("-dns", DEFAULT_NAME_LOOKUP); fRelayTxes = !GetBoolArg("-blocksonly", DEFAULT_BLOCKSONLY); if (fListen) { @@ -1305,32 +1378,7 @@ bool AppInitMain(boost::thread_group& threadGroup, CScheduler& scheduler) fReindex = GetBoolArg("-reindex", false); bool fReindexChainState = GetBoolArg("-reindex-chainstate", false); - // Upgrading to 0.8; hard-link the old blknnnn.dat files into /blocks/ - boost::filesystem::path blocksDir = GetDataDir() / "blocks"; - if (!boost::filesystem::exists(blocksDir)) - { - boost::filesystem::create_directories(blocksDir); - bool linked = false; - for (unsigned int i = 1; i < 10000; i++) { - boost::filesystem::path source = GetDataDir() / strprintf("blk%04u.dat", i); - if (!boost::filesystem::exists(source)) break; - boost::filesystem::path dest = blocksDir / strprintf("blk%05u.dat", i-1); - try { - boost::filesystem::create_hard_link(source, dest); - LogPrintf("Hardlinked %s -> %s\n", source.string(), dest.string()); - linked = true; - } catch (const boost::filesystem::filesystem_error& e) { - // Note: hardlink creation failing is not a disaster, it just means - // blocks will get re-downloaded from peers. - LogPrintf("Error hardlinking blk%04u.dat: %s\n", i, e.what()); - break; - } - } - if (linked) - { - fReindex = true; - } - } + boost::filesystem::create_directories(GetDataDir() / "blocks"); // cache size calculations int64_t nTotalCache = (GetArg("-dbcache", nDefaultDbCache) << 20); @@ -1505,7 +1553,7 @@ bool AppInitMain(boost::thread_group& threadGroup, CScheduler& scheduler) } if (chainparams.GetConsensus().vDeployments[Consensus::DEPLOYMENT_SEGWIT].nTimeout != 0) { - // Only advertize witness capabilities if they have a reasonable start time. + // Only advertise witness capabilities if they have a reasonable start time. // This allows us to have the code merged without a defined softfork, by setting its // end time to 0. // Note that setting NODE_WITNESS is never required: the only downside from not @@ -1589,7 +1637,7 @@ bool AppInitMain(boost::thread_group& threadGroup, CScheduler& scheduler) #ifdef ENABLE_WALLET if (pwalletMain) - pwalletMain->postInitProcess(threadGroup); + pwalletMain->postInitProcess(scheduler); #endif return !fRequestShutdown; diff --git a/src/merkleblock.cpp b/src/merkleblock.cpp index 86c8172a31..e3f3e4621a 100644 --- a/src/merkleblock.cpp +++ b/src/merkleblock.cpp @@ -9,14 +9,12 @@ #include "consensus/consensus.h" #include "utilstrencodings.h" -using namespace std; - CMerkleBlock::CMerkleBlock(const CBlock& block, CBloomFilter& filter) { header = block.GetBlockHeader(); - vector<bool> vMatch; - vector<uint256> vHashes; + std::vector<bool> vMatch; + std::vector<uint256> vHashes; vMatch.reserve(block.vtx.size()); vHashes.reserve(block.vtx.size()); @@ -27,7 +25,7 @@ CMerkleBlock::CMerkleBlock(const CBlock& block, CBloomFilter& filter) if (filter.IsRelevantAndUpdate(*block.vtx[i])) { vMatch.push_back(true); - vMatchedTxn.push_back(make_pair(i, hash)); + vMatchedTxn.push_back(std::make_pair(i, hash)); } else vMatch.push_back(false); @@ -41,8 +39,8 @@ CMerkleBlock::CMerkleBlock(const CBlock& block, const std::set<uint256>& txids) { header = block.GetBlockHeader(); - vector<bool> vMatch; - vector<uint256> vHashes; + std::vector<bool> vMatch; + std::vector<uint256> vHashes; vMatch.reserve(block.vtx.size()); vHashes.reserve(block.vtx.size()); diff --git a/src/miner.cpp b/src/miner.cpp index 856e9edc14..67e7ff155b 100644 --- a/src/miner.cpp +++ b/src/miner.cpp @@ -31,8 +31,6 @@ #include <queue> #include <utility> -using namespace std; - ////////////////////////////////////////////////////////////////////////////// // // BitcoinMiner @@ -41,8 +39,8 @@ using namespace std; // // Unconfirmed transactions in the memory pool often depend on other // transactions in the memory pool. When we select transactions from the -// pool, we select by highest priority or fee rate, so we might consider -// transactions that depend on transactions that aren't yet in the block. +// pool, we select by highest fee rate of a transaction combined with all +// its ancestors. uint64_t nLastBlockTx = 0; uint64_t nLastBlockSize = 0; @@ -74,37 +72,56 @@ int64_t UpdateTime(CBlockHeader* pblock, const Consensus::Params& consensusParam return nNewTime - nOldTime; } -BlockAssembler::BlockAssembler(const CChainParams& _chainparams) - : chainparams(_chainparams) +BlockAssembler::Options::Options() { + blockMinFeeRate = CFeeRate(DEFAULT_BLOCK_MIN_TX_FEE); + nBlockMaxWeight = DEFAULT_BLOCK_MAX_WEIGHT; + nBlockMaxSize = DEFAULT_BLOCK_MAX_SIZE; +} + +BlockAssembler::BlockAssembler(const CChainParams& params, const Options& options) : chainparams(params) +{ + blockMinFeeRate = options.blockMinFeeRate; + // Limit weight to between 4K and MAX_BLOCK_WEIGHT-4K for sanity: + nBlockMaxWeight = std::max<size_t>(4000, std::min<size_t>(MAX_BLOCK_WEIGHT - 4000, options.nBlockMaxWeight)); + // Limit size to between 1K and MAX_BLOCK_SERIALIZED_SIZE-1K for sanity: + nBlockMaxSize = std::max<size_t>(1000, std::min<size_t>(MAX_BLOCK_SERIALIZED_SIZE - 1000, options.nBlockMaxSize)); + // Whether we need to account for byte usage (in addition to weight usage) + fNeedSizeAccounting = (nBlockMaxSize < MAX_BLOCK_SERIALIZED_SIZE - 1000); +} + +static BlockAssembler::Options DefaultOptions(const CChainParams& params) { // Block resource limits // If neither -blockmaxsize or -blockmaxweight is given, limit to DEFAULT_BLOCK_MAX_* // If only one is given, only restrict the specified resource. // If both are given, restrict both. - nBlockMaxWeight = DEFAULT_BLOCK_MAX_WEIGHT; - nBlockMaxSize = DEFAULT_BLOCK_MAX_SIZE; + BlockAssembler::Options options; + options.nBlockMaxWeight = DEFAULT_BLOCK_MAX_WEIGHT; + options.nBlockMaxSize = DEFAULT_BLOCK_MAX_SIZE; bool fWeightSet = false; if (IsArgSet("-blockmaxweight")) { - nBlockMaxWeight = GetArg("-blockmaxweight", DEFAULT_BLOCK_MAX_WEIGHT); - nBlockMaxSize = MAX_BLOCK_SERIALIZED_SIZE; + options.nBlockMaxWeight = GetArg("-blockmaxweight", DEFAULT_BLOCK_MAX_WEIGHT); + options.nBlockMaxSize = MAX_BLOCK_SERIALIZED_SIZE; fWeightSet = true; } if (IsArgSet("-blockmaxsize")) { - nBlockMaxSize = GetArg("-blockmaxsize", DEFAULT_BLOCK_MAX_SIZE); + options.nBlockMaxSize = GetArg("-blockmaxsize", DEFAULT_BLOCK_MAX_SIZE); if (!fWeightSet) { - nBlockMaxWeight = nBlockMaxSize * WITNESS_SCALE_FACTOR; + options.nBlockMaxWeight = options.nBlockMaxSize * WITNESS_SCALE_FACTOR; } } - - // Limit weight to between 4K and MAX_BLOCK_WEIGHT-4K for sanity: - nBlockMaxWeight = std::max((unsigned int)4000, std::min((unsigned int)(MAX_BLOCK_WEIGHT-4000), nBlockMaxWeight)); - // Limit size to between 1K and MAX_BLOCK_SERIALIZED_SIZE-1K for sanity: - nBlockMaxSize = std::max((unsigned int)1000, std::min((unsigned int)(MAX_BLOCK_SERIALIZED_SIZE-1000), nBlockMaxSize)); - - // Whether we need to account for byte usage (in addition to weight usage) - fNeedSizeAccounting = (nBlockMaxSize < MAX_BLOCK_SERIALIZED_SIZE-1000); + if (IsArgSet("-blockmintxfee")) { + CAmount n = 0; + ParseMoney(GetArg("-blockmintxfee", ""), n); + options.blockMinFeeRate = CFeeRate(n); + } else { + options.blockMinFeeRate = CFeeRate(DEFAULT_BLOCK_MIN_TX_FEE); + } + return options; } +BlockAssembler::BlockAssembler(const CChainParams& params) : BlockAssembler(params, DefaultOptions(params)) {} + void BlockAssembler::resetBlock() { inBlock.clear(); @@ -118,9 +135,6 @@ void BlockAssembler::resetBlock() // These counters do not include coinbase tx nBlockTx = 0; nFees = 0; - - lastFewTxs = 0; - blockFinished = false; } std::unique_ptr<CBlockTemplate> BlockAssembler::CreateNewBlock(const CScript& scriptPubKeyIn) @@ -163,7 +177,6 @@ std::unique_ptr<CBlockTemplate> BlockAssembler::CreateNewBlock(const CScript& sc // transaction (which in most cases can be a no-op). fIncludeWitness = IsWitnessEnabled(pindexPrev, chainparams.GetConsensus()); - addPriorityTxs(); addPackageTxs(); nLastBlockTx = nBlockTx; @@ -200,17 +213,6 @@ std::unique_ptr<CBlockTemplate> BlockAssembler::CreateNewBlock(const CScript& sc return std::move(pblocktemplate); } -bool BlockAssembler::isStillDependent(CTxMemPool::txiter iter) -{ - BOOST_FOREACH(CTxMemPool::txiter parent, mempool.GetMemPoolParents(iter)) - { - if (!inBlock.count(parent)) { - return true; - } - } - return false; -} - void BlockAssembler::onlyUnconfirmed(CTxMemPool::setEntries& testSet) { for (CTxMemPool::setEntries::iterator iit = testSet.begin(); iit != testSet.end(); ) { @@ -258,58 +260,6 @@ bool BlockAssembler::TestPackageTransactions(const CTxMemPool::setEntries& packa return true; } -bool BlockAssembler::TestForBlock(CTxMemPool::txiter iter) -{ - if (nBlockWeight + iter->GetTxWeight() >= nBlockMaxWeight) { - // If the block is so close to full that no more txs will fit - // or if we've tried more than 50 times to fill remaining space - // then flag that the block is finished - if (nBlockWeight > nBlockMaxWeight - 400 || lastFewTxs > 50) { - blockFinished = true; - return false; - } - // Once we're within 4000 weight of a full block, only look at 50 more txs - // to try to fill the remaining space. - if (nBlockWeight > nBlockMaxWeight - 4000) { - lastFewTxs++; - } - return false; - } - - if (fNeedSizeAccounting) { - if (nBlockSize + ::GetSerializeSize(iter->GetTx(), SER_NETWORK, PROTOCOL_VERSION) >= nBlockMaxSize) { - if (nBlockSize > nBlockMaxSize - 100 || lastFewTxs > 50) { - blockFinished = true; - return false; - } - if (nBlockSize > nBlockMaxSize - 1000) { - lastFewTxs++; - } - return false; - } - } - - if (nBlockSigOpsCost + iter->GetSigOpCost() >= MAX_BLOCK_SIGOPS_COST) { - // If the block has room for no more sig ops then - // flag that the block is finished - if (nBlockSigOpsCost > MAX_BLOCK_SIGOPS_COST - 8) { - blockFinished = true; - return false; - } - // Otherwise attempt to find another tx with fewer sigops - // to put in the block. - return false; - } - - // Must check that lock times are still valid - // This can be removed once MTP is always enforced - // as long as reorgs keep the mempool consistent. - if (!IsFinalTx(iter->GetTx(), nHeight, nLockTimeCutoff)) - return false; - - return true; -} - void BlockAssembler::AddToBlock(CTxMemPool::txiter iter) { pblock->vtx.emplace_back(iter->GetSharedTx()); @@ -326,11 +276,7 @@ void BlockAssembler::AddToBlock(CTxMemPool::txiter iter) bool fPrintPriority = GetBoolArg("-printpriority", DEFAULT_PRINTPRIORITY); if (fPrintPriority) { - double dPriority = iter->GetPriority(nHeight); - CAmount dummy; - mempool.ApplyDeltas(iter->GetTx().GetHash(), dPriority, dummy); - LogPrintf("priority %.1f fee %s txid %s\n", - dPriority, + LogPrintf("fee %s txid %s\n", CFeeRate(iter->GetModifiedFee(), iter->GetTxSize()).ToString(), iter->GetTx().GetHash().ToString()); } @@ -460,7 +406,7 @@ void BlockAssembler::addPackageTxs() packageSigOpsCost = modit->nSigOpCostWithAncestors; } - if (packageFees < ::minRelayTxFee.GetFee(packageSize)) { + if (packageFees < blockMinFeeRate.GetFee(packageSize)) { // Everything else we might consider has a lower fee rate return; } @@ -494,7 +440,7 @@ void BlockAssembler::addPackageTxs() } // Package can be added. Sort the entries in a valid order. - vector<CTxMemPool::txiter> sortedEntries; + std::vector<CTxMemPool::txiter> sortedEntries; SortForBlock(ancestors, iter, sortedEntries); for (size_t i=0; i<sortedEntries.size(); ++i) { @@ -508,88 +454,6 @@ void BlockAssembler::addPackageTxs() } } -void BlockAssembler::addPriorityTxs() -{ - // How much of the block should be dedicated to high-priority transactions, - // included regardless of the fees they pay - unsigned int nBlockPrioritySize = GetArg("-blockprioritysize", DEFAULT_BLOCK_PRIORITY_SIZE); - nBlockPrioritySize = std::min(nBlockMaxSize, nBlockPrioritySize); - - if (nBlockPrioritySize == 0) { - return; - } - - bool fSizeAccounting = fNeedSizeAccounting; - fNeedSizeAccounting = true; - - // This vector will be sorted into a priority queue: - vector<TxCoinAgePriority> vecPriority; - TxCoinAgePriorityCompare pricomparer; - std::map<CTxMemPool::txiter, double, CTxMemPool::CompareIteratorByHash> waitPriMap; - typedef std::map<CTxMemPool::txiter, double, CTxMemPool::CompareIteratorByHash>::iterator waitPriIter; - double actualPriority = -1; - - vecPriority.reserve(mempool.mapTx.size()); - for (CTxMemPool::indexed_transaction_set::iterator mi = mempool.mapTx.begin(); - mi != mempool.mapTx.end(); ++mi) - { - double dPriority = mi->GetPriority(nHeight); - CAmount dummy; - mempool.ApplyDeltas(mi->GetTx().GetHash(), dPriority, dummy); - vecPriority.push_back(TxCoinAgePriority(dPriority, mi)); - } - std::make_heap(vecPriority.begin(), vecPriority.end(), pricomparer); - - CTxMemPool::txiter iter; - while (!vecPriority.empty() && !blockFinished) { // add a tx from priority queue to fill the blockprioritysize - iter = vecPriority.front().second; - actualPriority = vecPriority.front().first; - std::pop_heap(vecPriority.begin(), vecPriority.end(), pricomparer); - vecPriority.pop_back(); - - // If tx already in block, skip - if (inBlock.count(iter)) { - assert(false); // shouldn't happen for priority txs - continue; - } - - // cannot accept witness transactions into a non-witness block - if (!fIncludeWitness && iter->GetTx().HasWitness()) - continue; - - // If tx is dependent on other mempool txs which haven't yet been included - // then put it in the waitSet - if (isStillDependent(iter)) { - waitPriMap.insert(std::make_pair(iter, actualPriority)); - continue; - } - - // If this tx fits in the block add it, otherwise keep looping - if (TestForBlock(iter)) { - AddToBlock(iter); - - // If now that this txs is added we've surpassed our desired priority size - // or have dropped below the AllowFreeThreshold, then we're done adding priority txs - if (nBlockSize >= nBlockPrioritySize || !AllowFree(actualPriority)) { - break; - } - - // This tx was successfully added, so - // add transactions that depend on this one to the priority queue to try again - BOOST_FOREACH(CTxMemPool::txiter child, mempool.GetMemPoolChildren(iter)) - { - waitPriIter wpiter = waitPriMap.find(child); - if (wpiter != waitPriMap.end()) { - vecPriority.push_back(TxCoinAgePriority(wpiter->second,child)); - std::push_heap(vecPriority.begin(), vecPriority.end(), pricomparer); - waitPriMap.erase(wpiter); - } - } - } - } - fNeedSizeAccounting = fSizeAccounting; -} - void IncrementExtraNonce(CBlock* pblock, const CBlockIndex* pindexPrev, unsigned int& nExtraNonce) { // Update nExtraNonce diff --git a/src/miner.h b/src/miner.h index 3dd9bf4cab..c105d07c23 100644 --- a/src/miner.h +++ b/src/miner.h @@ -143,6 +143,7 @@ private: bool fIncludeWitness; unsigned int nBlockMaxWeight, nBlockMaxSize; bool fNeedSizeAccounting; + CFeeRate blockMinFeeRate; // Information on the current status of the block uint64_t nBlockWeight; @@ -157,12 +158,17 @@ private: int64_t nLockTimeCutoff; const CChainParams& chainparams; - // Variables used for addPriorityTxs - int lastFewTxs; - bool blockFinished; - public: - BlockAssembler(const CChainParams& chainparams); + struct Options { + Options(); + size_t nBlockMaxWeight; + size_t nBlockMaxSize; + CFeeRate blockMinFeeRate; + }; + + BlockAssembler(const CChainParams& params); + BlockAssembler(const CChainParams& params, const Options& options); + /** Construct a new block template with coinbase to scriptPubKeyIn */ std::unique_ptr<CBlockTemplate> CreateNewBlock(const CScript& scriptPubKeyIn); @@ -174,17 +180,9 @@ private: void AddToBlock(CTxMemPool::txiter iter); // Methods for how to add transactions to a block. - /** Add transactions based on tx "priority" */ - void addPriorityTxs(); /** Add transactions based on feerate including unconfirmed ancestors */ void addPackageTxs(); - // helper function for addPriorityTxs - /** Test if tx will still "fit" in the block */ - bool TestForBlock(CTxMemPool::txiter iter); - /** Test if tx still has unconfirmed parents not yet in block */ - bool isStillDependent(CTxMemPool::txiter iter); - // helper functions for addPackageTxs() /** Remove confirmed (inBlock) entries from given set */ void onlyUnconfirmed(CTxMemPool::setEntries& testSet); diff --git a/src/net.cpp b/src/net.cpp index 37e7dfed4c..4434793c4c 100644 --- a/src/net.cpp +++ b/src/net.cpp @@ -164,8 +164,9 @@ int GetnScore(const CService& addr) // Is our peer's addrLocal potentially useful as an external IP source? bool IsPeerAddrLocalGood(CNode *pnode) { - return fDiscover && pnode->addr.IsRoutable() && pnode->addrLocal.IsRoutable() && - !IsLimited(pnode->addrLocal.GetNetwork()); + CService addrLocal = pnode->GetAddrLocal(); + return fDiscover && pnode->addr.IsRoutable() && addrLocal.IsRoutable() && + !IsLimited(addrLocal.GetNetwork()); } // pushes our own address to a peer @@ -180,7 +181,7 @@ void AdvertiseLocal(CNode *pnode) if (IsPeerAddrLocalGood(pnode) && (!addrLocal.IsRoutable() || GetRand((GetnScore(addrLocal) > LOCAL_MANUAL) ? 8:2) == 0)) { - addrLocal.SetIP(pnode->addrLocal); + addrLocal.SetIP(pnode->GetAddrLocal()); } if (addrLocal.IsRoutable()) { @@ -307,9 +308,11 @@ CNode* CConnman::FindNode(const CSubNet& subNet) CNode* CConnman::FindNode(const std::string& addrName) { LOCK(cs_vNodes); - BOOST_FOREACH(CNode* pnode, vNodes) - if (pnode->addrName == addrName) + BOOST_FOREACH(CNode* pnode, vNodes) { + if (pnode->GetAddrName() == addrName) { return (pnode); + } + } return NULL; } @@ -342,8 +345,8 @@ CNode* CConnman::ConnectNode(CAddress addrConnect, const char *pszDest, bool fCo CNode* pnode = FindNode((CService)addrConnect); if (pnode) { - pnode->AddRef(); - return pnode; + LogPrintf("Failed to open new connection, already connected\n"); + return NULL; } } @@ -369,18 +372,14 @@ CNode* CConnman::ConnectNode(CAddress addrConnect, const char *pszDest, bool fCo // In that case, drop the connection that was just created, and return the existing CNode instead. // Also store the name we used to connect in that CNode, so that future FindNode() calls to that // name catch this early. + LOCK(cs_vNodes); CNode* pnode = FindNode((CService)addrConnect); if (pnode) { - pnode->AddRef(); - { - LOCK(cs_vNodes); - if (pnode->addrName.empty()) { - pnode->addrName = std::string(pszDest); - } - } + pnode->MaybeSetAddrName(std::string(pszDest)); CloseSocket(hSocket); - return pnode; + LogPrintf("Failed to open new connection, already connected\n"); + return NULL; } } @@ -391,13 +390,7 @@ CNode* CConnman::ConnectNode(CAddress addrConnect, const char *pszDest, bool fCo uint64_t nonce = GetDeterministicRandomizer(RANDOMIZER_ID_LOCALHOSTNONCE).Write(id).Finalize(); CNode* pnode = new CNode(id, nLocalServices, GetBestHeight(), hSocket, addrConnect, CalculateKeyedNetGroup(addrConnect), nonce, pszDest ? pszDest : "", false); pnode->nServicesExpected = ServiceFlags(addrConnect.nServices & nRelevantServices); - pnode->nTimeConnected = GetTime(); pnode->AddRef(); - GetNodeSignals().InitializeNode(pnode, *this); - { - LOCK(cs_vNodes); - vNodes.push_back(pnode); - } return pnode; } else if (!proxyConnectionFailed) { @@ -432,16 +425,12 @@ void CConnman::DumpBanlist() void CNode::CloseSocketDisconnect() { fDisconnect = true; + LOCK(cs_hSocket); if (hSocket != INVALID_SOCKET) { LogPrint("net", "disconnecting peer=%d\n", id); CloseSocket(hSocket); } - - // in case this fails, we'll empty the recv buffer when the CNode is deleted - TRY_LOCK(cs_vRecvMsg, lockRecv); - if (lockRecv) - vRecvMsg.clear(); } void CConnman::ClearBanned() @@ -605,6 +594,33 @@ void CConnman::AddWhitelistedRange(const CSubNet &subnet) { vWhitelistedRange.push_back(subnet); } + +std::string CNode::GetAddrName() const { + LOCK(cs_addrName); + return addrName; +} + +void CNode::MaybeSetAddrName(const std::string& addrNameIn) { + LOCK(cs_addrName); + if (addrName.empty()) { + addrName = addrNameIn; + } +} + +CService CNode::GetAddrLocal() const { + LOCK(cs_addrLocal); + return addrLocal; +} + +void CNode::SetAddrLocal(const CService& addrLocalIn) { + LOCK(cs_addrLocal); + if (addrLocal.IsValid()) { + error("Addr local already set for node: %i. Refusing to change from %s to %s", id, addrLocal.ToString(), addrLocalIn.ToString()); + } else { + addrLocal = addrLocalIn; + } +} + #undef X #define X(name) stats.name = name void CNode::copyStats(CNodeStats &stats) @@ -612,21 +628,33 @@ void CNode::copyStats(CNodeStats &stats) stats.nodeid = this->GetId(); X(nServices); X(addr); - X(fRelayTxes); + { + LOCK(cs_filter); + X(fRelayTxes); + } X(nLastSend); X(nLastRecv); X(nTimeConnected); X(nTimeOffset); - X(addrName); + stats.addrName = GetAddrName(); X(nVersion); - X(cleanSubVer); + { + LOCK(cs_SubVer); + X(cleanSubVer); + } X(fInbound); X(fAddnode); X(nStartingHeight); - X(nSendBytes); - X(mapSendBytesPerMsgCmd); - X(nRecvBytes); - X(mapRecvBytesPerMsgCmd); + { + LOCK(cs_vSend); + X(mapSendBytesPerMsgCmd); + X(nSendBytes); + } + { + LOCK(cs_vRecv); + X(mapRecvBytesPerMsgCmd); + X(nRecvBytes); + } X(fWhitelisted); // It is common for nodes with good ping times to suddenly become lagged, @@ -646,20 +674,24 @@ void CNode::copyStats(CNodeStats &stats) stats.dPingWait = (((double)nPingUsecWait) / 1e6); // Leave string empty if addrLocal invalid (not filled in yet) - stats.addrLocal = addrLocal.IsValid() ? addrLocal.ToString() : ""; + CService addrLocalUnlocked = GetAddrLocal(); + stats.addrLocal = addrLocalUnlocked.IsValid() ? addrLocalUnlocked.ToString() : ""; } #undef X -// requires LOCK(cs_vRecvMsg) bool CNode::ReceiveMsgBytes(const char *pch, unsigned int nBytes, bool& complete) { complete = false; + int64_t nTimeMicros = GetTimeMicros(); + LOCK(cs_vRecv); + nLastRecv = nTimeMicros / 1000000; + nRecvBytes += nBytes; while (nBytes > 0) { // get current incomplete message, or create a new one if (vRecvMsg.empty() || vRecvMsg.back().complete()) - vRecvMsg.push_back(CNetMessage(Params().MessageStart(), SER_NETWORK, nRecvVersion)); + vRecvMsg.push_back(CNetMessage(Params().MessageStart(), SER_NETWORK, INIT_PROTO_VERSION)); CNetMessage& msg = vRecvMsg.back(); @@ -691,7 +723,7 @@ bool CNode::ReceiveMsgBytes(const char *pch, unsigned int nBytes, bool& complete assert(i != mapRecvBytesPerMsgCmd.end()); i->second += msg.hdr.nMessageSize + CMessageHeader::HEADER_SIZE; - msg.nTime = GetTimeMicros(); + msg.nTime = nTimeMicros; complete = true; } } @@ -699,6 +731,33 @@ bool CNode::ReceiveMsgBytes(const char *pch, unsigned int nBytes, bool& complete return true; } +void CNode::SetSendVersion(int nVersionIn) +{ + // Send version may only be changed in the version message, and + // only one version message is allowed per session. We can therefore + // treat this value as const and even atomic as long as it's only used + // once a version message has been successfully processed. Any attempt to + // set this twice is an error. + if (nSendVersion != 0) { + error("Send version already set for node: %i. Refusing to change from %i to %i", id, nSendVersion, nVersionIn); + } else { + nSendVersion = nVersionIn; + } +} + +int CNode::GetSendVersion() const +{ + // The send version should always be explicitly set to + // INIT_PROTO_VERSION rather than using this value until SetSendVersion + // has been called. + if (nSendVersion == 0) { + error("Requesting unset send version for node: %i. Using %i", id, INIT_PROTO_VERSION); + return INIT_PROTO_VERSION; + } + return nSendVersion; +} + + int CNetMessage::readHeader(const char *pch, unsigned int nBytes) { // copy data to temporary parsing buffer @@ -764,7 +823,7 @@ const uint256& CNetMessage::GetMessageHash() const // requires LOCK(cs_vSend) -size_t SocketSendData(CNode *pnode) +size_t CConnman::SocketSendData(CNode *pnode) const { auto it = pnode->vSendMsg.begin(); size_t nSentSize = 0; @@ -772,15 +831,22 @@ size_t SocketSendData(CNode *pnode) while (it != pnode->vSendMsg.end()) { const auto &data = *it; assert(data.size() > pnode->nSendOffset); - int nBytes = send(pnode->hSocket, reinterpret_cast<const char*>(data.data()) + pnode->nSendOffset, data.size() - pnode->nSendOffset, MSG_NOSIGNAL | MSG_DONTWAIT); + int nBytes = 0; + { + LOCK(pnode->cs_hSocket); + if (pnode->hSocket == INVALID_SOCKET) + break; + nBytes = send(pnode->hSocket, reinterpret_cast<const char*>(data.data()) + pnode->nSendOffset, data.size() - pnode->nSendOffset, MSG_NOSIGNAL | MSG_DONTWAIT); + } if (nBytes > 0) { - pnode->nLastSend = GetTime(); + pnode->nLastSend = GetSystemTimeInSeconds(); pnode->nSendBytes += nBytes; pnode->nSendOffset += nBytes; nSentSize += nBytes; if (pnode->nSendOffset == data.size()) { pnode->nSendOffset = 0; pnode->nSendSize -= data.size(); + pnode->fPauseSend = pnode->nSendSize > nSendBufferMaxSize; it++; } else { // could not send full message; stop sending more @@ -1052,8 +1118,7 @@ void CConnman::ThreadSocketHandler() std::vector<CNode*> vNodesCopy = vNodes; BOOST_FOREACH(CNode* pnode, vNodesCopy) { - if (pnode->fDisconnect || - (pnode->GetRefCount() <= 0 && pnode->vRecvMsg.empty() && pnode->nSendSize == 0)) + if (pnode->fDisconnect) { // remove from vNodes vNodes.erase(remove(vNodes.begin(), vNodes.end(), pnode), vNodes.end()); @@ -1076,24 +1141,18 @@ void CConnman::ThreadSocketHandler() BOOST_FOREACH(CNode* pnode, vNodesDisconnectedCopy) { // wait until threads are done using it - if (pnode->GetRefCount() <= 0) - { + if (pnode->GetRefCount() <= 0) { bool fDelete = false; { - TRY_LOCK(pnode->cs_vSend, lockSend); - if (lockSend) - { - TRY_LOCK(pnode->cs_vRecvMsg, lockRecv); - if (lockRecv) - { - TRY_LOCK(pnode->cs_inventory, lockInv); - if (lockInv) - fDelete = true; + TRY_LOCK(pnode->cs_inventory, lockInv); + if (lockInv) { + TRY_LOCK(pnode->cs_vSend, lockSend); + if (lockSend) { + fDelete = true; } } } - if (fDelete) - { + if (fDelete) { vNodesDisconnected.remove(pnode); DeleteNode(pnode); } @@ -1137,42 +1196,38 @@ void CConnman::ThreadSocketHandler() LOCK(cs_vNodes); BOOST_FOREACH(CNode* pnode, vNodes) { - if (pnode->hSocket == INVALID_SOCKET) - continue; - FD_SET(pnode->hSocket, &fdsetError); - hSocketMax = std::max(hSocketMax, pnode->hSocket); - have_fds = true; - // Implement the following logic: // * If there is data to send, select() for sending data. As this only // happens when optimistic write failed, we choose to first drain the // write buffer in this case before receiving more. This avoids // needlessly queueing received data, if the remote peer is not themselves // receiving data. This means properly utilizing TCP flow control signalling. - // * Otherwise, if there is no (complete) message in the receive buffer, - // or there is space left in the buffer, select() for receiving data. - // * (if neither of the above applies, there is certainly one message - // in the receiver buffer ready to be processed). - // Together, that means that at least one of the following is always possible, - // so we don't deadlock: - // * We send some data. - // * We wait for data to be received (and disconnect after timeout). - // * We process a message in the buffer (message handler thread). + // * Otherwise, if there is space left in the receive buffer, select() for + // receiving data. + // * Hand off all complete messages to the processor, to be handled without + // blocking here. + + bool select_recv = !pnode->fPauseRecv; + bool select_send; { - TRY_LOCK(pnode->cs_vSend, lockSend); - if (lockSend) { - if (!pnode->vSendMsg.empty()) { - FD_SET(pnode->hSocket, &fdsetSend); - continue; - } - } + LOCK(pnode->cs_vSend); + select_send = !pnode->vSendMsg.empty(); } - { - TRY_LOCK(pnode->cs_vRecvMsg, lockRecv); - if (lockRecv && ( - pnode->vRecvMsg.empty() || !pnode->vRecvMsg.front().complete() || - pnode->GetTotalRecvSize() <= GetReceiveFloodSize())) - FD_SET(pnode->hSocket, &fdsetRecv); + + LOCK(pnode->cs_hSocket); + if (pnode->hSocket == INVALID_SOCKET) + continue; + + FD_SET(pnode->hSocket, &fdsetError); + hSocketMax = std::max(hSocketMax, pnode->hSocket); + have_fds = true; + + if (select_send) { + FD_SET(pnode->hSocket, &fdsetSend); + continue; + } + if (select_recv) { + FD_SET(pnode->hSocket, &fdsetRecv); } } } @@ -1226,27 +1281,52 @@ void CConnman::ThreadSocketHandler() // // Receive // - if (pnode->hSocket == INVALID_SOCKET) - continue; - if (FD_ISSET(pnode->hSocket, &fdsetRecv) || FD_ISSET(pnode->hSocket, &fdsetError)) + bool recvSet = false; + bool sendSet = false; + bool errorSet = false; + { + LOCK(pnode->cs_hSocket); + if (pnode->hSocket == INVALID_SOCKET) + continue; + recvSet = FD_ISSET(pnode->hSocket, &fdsetRecv); + sendSet = FD_ISSET(pnode->hSocket, &fdsetSend); + errorSet = FD_ISSET(pnode->hSocket, &fdsetError); + } + if (recvSet || errorSet) { - TRY_LOCK(pnode->cs_vRecvMsg, lockRecv); - if (lockRecv) { { // typical socket buffer is 8K-64K char pchBuf[0x10000]; - int nBytes = recv(pnode->hSocket, pchBuf, sizeof(pchBuf), MSG_DONTWAIT); + int nBytes = 0; + { + LOCK(pnode->cs_hSocket); + if (pnode->hSocket == INVALID_SOCKET) + continue; + nBytes = recv(pnode->hSocket, pchBuf, sizeof(pchBuf), MSG_DONTWAIT); + } if (nBytes > 0) { bool notify = false; if (!pnode->ReceiveMsgBytes(pchBuf, nBytes, notify)) pnode->CloseSocketDisconnect(); - if(notify) - condMsgProc.notify_one(); - pnode->nLastRecv = GetTime(); - pnode->nRecvBytes += nBytes; RecordBytesRecv(nBytes); + if (notify) { + size_t nSizeAdded = 0; + auto it(pnode->vRecvMsg.begin()); + for (; it != pnode->vRecvMsg.end(); ++it) { + if (!it->complete()) + break; + nSizeAdded += it->vRecv.size() + CMessageHeader::HEADER_SIZE; + } + { + LOCK(pnode->cs_vProcessMsg); + pnode->vProcessMsg.splice(pnode->vProcessMsg.end(), pnode->vRecvMsg, pnode->vRecvMsg.begin(), it); + pnode->nProcessQueueSize += nSizeAdded; + pnode->fPauseRecv = pnode->nProcessQueueSize > nReceiveFloodSize; + } + WakeMessageHandler(); + } } else if (nBytes == 0) { @@ -1273,22 +1353,19 @@ void CConnman::ThreadSocketHandler() // // Send // - if (pnode->hSocket == INVALID_SOCKET) - continue; - if (FD_ISSET(pnode->hSocket, &fdsetSend)) + if (sendSet) { - TRY_LOCK(pnode->cs_vSend, lockSend); - if (lockSend) { - size_t nBytes = SocketSendData(pnode); - if (nBytes) - RecordBytesSent(nBytes); + LOCK(pnode->cs_vSend); + size_t nBytes = SocketSendData(pnode); + if (nBytes) { + RecordBytesSent(nBytes); } } // // Inactivity checking // - int64_t nTime = GetTime(); + int64_t nTime = GetSystemTimeInSeconds(); if (nTime - pnode->nTimeConnected > 60) { if (pnode->nLastRecv == 0 || pnode->nLastSend == 0) @@ -1311,6 +1388,11 @@ void CConnman::ThreadSocketHandler() LogPrintf("ping timeout: %fs\n", 0.000001 * (GetTimeMicros() - pnode->nPingUsecStart)); pnode->fDisconnect = true; } + else if (!pnode->fSuccessfullyConnected) + { + LogPrintf("version handshake timeout from %d\n", pnode->id); + pnode->fDisconnect = true; + } } } { @@ -1321,8 +1403,14 @@ void CConnman::ThreadSocketHandler() } } - - +void CConnman::WakeMessageHandler() +{ + { + std::lock_guard<std::mutex> lock(mutexMsgProc); + fMsgProcWake = true; + } + condMsgProc.notify_one(); +} @@ -1744,8 +1832,9 @@ std::vector<AddedNodeInfo> CConnman::GetAddedNodeInfo() if (pnode->addr.IsValid()) { mapConnected[pnode->addr] = pnode->fInbound; } - if (!pnode->addrName.empty()) { - mapConnectedByName[pnode->addrName] = std::make_pair(pnode->fInbound, static_cast<const CService&>(pnode->addr)); + std::string addrName = pnode->GetAddrName(); + if (!addrName.empty()) { + mapConnectedByName[std::move(addrName)] = std::make_pair(pnode->fInbound, static_cast<const CService&>(pnode->addr)); } } } @@ -1842,6 +1931,12 @@ bool CConnman::OpenNetworkConnection(const CAddress& addrConnect, bool fCountFai if (fAddnode) pnode->fAddnode = true; + GetNodeSignals().InitializeNode(pnode, *this); + { + LOCK(cs_vNodes); + vNodes.push_back(pnode); + } + return true; } @@ -1858,7 +1953,7 @@ void CConnman::ThreadMessageHandler() } } - bool fSleep = true; + bool fMoreWork = false; BOOST_FOREACH(CNode* pnode, vNodesCopy) { @@ -1866,30 +1961,15 @@ void CConnman::ThreadMessageHandler() continue; // Receive messages - { - TRY_LOCK(pnode->cs_vRecvMsg, lockRecv); - if (lockRecv) - { - if (!GetNodeSignals().ProcessMessages(pnode, *this, flagInterruptMsgProc)) - pnode->CloseSocketDisconnect(); - - if (pnode->nSendSize < GetSendBufferSize()) - { - if (!pnode->vRecvGetData.empty() || (!pnode->vRecvMsg.empty() && pnode->vRecvMsg[0].complete())) - { - fSleep = false; - } - } - } - } + bool fMoreNodeWork = GetNodeSignals().ProcessMessages(pnode, *this, flagInterruptMsgProc); + fMoreWork |= (fMoreNodeWork && !pnode->fPauseSend); if (flagInterruptMsgProc) return; // Send messages { - TRY_LOCK(pnode->cs_vSend, lockSend); - if (lockSend) - GetNodeSignals().SendMessages(pnode, *this, flagInterruptMsgProc); + LOCK(pnode->cs_sendProcessing); + GetNodeSignals().SendMessages(pnode, *this, flagInterruptMsgProc); } if (flagInterruptMsgProc) return; @@ -1901,10 +1981,11 @@ void CConnman::ThreadMessageHandler() pnode->Release(); } - if (fSleep) { - std::unique_lock<std::mutex> lock(mutexMsgProc); - condMsgProc.wait_until(lock, std::chrono::steady_clock::now() + std::chrono::milliseconds(100)); + std::unique_lock<std::mutex> lock(mutexMsgProc); + if (!fMoreWork) { + condMsgProc.wait_until(lock, std::chrono::steady_clock::now() + std::chrono::milliseconds(100), [this] { return fMsgProcWake; }); } + fMsgProcWake = false; } } @@ -2121,7 +2202,7 @@ bool CConnman::Start(CScheduler& scheduler, std::string& strNodeError, Options c nMaxFeeler = connOptions.nMaxFeeler; nSendBufferMaxSize = connOptions.nSendBufferMaxSize; - nReceiveFloodSize = connOptions.nSendBufferMaxSize; + nReceiveFloodSize = connOptions.nReceiveFloodSize; nMaxOutboundLimit = connOptions.nMaxOutboundLimit; nMaxOutboundTimeframe = connOptions.nMaxOutboundTimeframe; @@ -2129,8 +2210,9 @@ bool CConnman::Start(CScheduler& scheduler, std::string& strNodeError, Options c SetBestHeight(connOptions.nBestHeight); clientInterface = connOptions.uiInterface; - if (clientInterface) - clientInterface->InitMessage(_("Loading addresses...")); + if (clientInterface) { + clientInterface->InitMessage(_("Loading P2P addresses...")); + } // Load addresses from peers.dat int64_t nStart = GetTimeMillis(); { @@ -2182,6 +2264,11 @@ bool CConnman::Start(CScheduler& scheduler, std::string& strNodeError, Options c interruptNet.reset(); flagInterruptMsgProc = false; + { + std::unique_lock<std::mutex> lock(mutexMsgProc); + fMsgProcWake = false; + } + // Send and receive from sockets, accept connections threadSocketHandler = std::thread(&TraceThread<std::function<void()> >, "net", std::function<void()>(std::bind(&CConnman::ThreadSocketHandler, this))); @@ -2201,7 +2288,7 @@ bool CConnman::Start(CScheduler& scheduler, std::string& strNodeError, Options c threadMessageHandler = std::thread(&TraceThread<std::function<void()> >, "msghand", std::function<void()>(std::bind(&CConnman::ThreadMessageHandler, this))); // Dump network addresses - scheduler.scheduleEvery(boost::bind(&CConnman::DumpData, this), DUMP_ADDRESSES_INTERVAL); + scheduler.scheduleEvery(std::bind(&CConnman::DumpData, this), DUMP_ADDRESSES_INTERVAL * 1000); return true; } @@ -2232,9 +2319,17 @@ void CConnman::Interrupt() interruptNet(); InterruptSocks5(true); - if (semOutbound) - for (int i=0; i<(nMaxOutbound + nMaxFeeler); i++) + if (semOutbound) { + for (int i=0; i<(nMaxOutbound + nMaxFeeler); i++) { semOutbound->post(); + } + } + + if (semAddnode) { + for (int i=0; i<nMaxAddnode; i++) { + semAddnode->post(); + } + } } void CConnman::Stop() @@ -2250,10 +2345,6 @@ void CConnman::Stop() if (threadSocketHandler.joinable()) threadSocketHandler.join(); - if (semAddnode) - for (int i=0; i<nMaxAddnode; i++) - semOutbound->post(); - if (fAddressesInitialized) { DumpData(); @@ -2262,8 +2353,7 @@ void CConnman::Stop() // Close sockets BOOST_FOREACH(CNode* pnode, vNodes) - if (pnode->hSocket != INVALID_SOCKET) - CloseSocket(pnode->hSocket); + pnode->CloseSocketDisconnect(); BOOST_FOREACH(ListenSocket& hListenSocket, vhListenSocket) if (hListenSocket.socket != INVALID_SOCKET) if (!CloseSocket(hListenSocket.socket)) @@ -2376,32 +2466,14 @@ void CConnman::GetNodeStats(std::vector<CNodeStats>& vstats) vstats.reserve(vNodes.size()); for(std::vector<CNode*>::iterator it = vNodes.begin(); it != vNodes.end(); ++it) { CNode* pnode = *it; - CNodeStats stats; - pnode->copyStats(stats); - vstats.push_back(stats); - } -} - -bool CConnman::DisconnectAddress(const CNetAddr& netAddr) -{ - if (CNode* pnode = FindNode(netAddr)) { - pnode->fDisconnect = true; - return true; - } - return false; -} - -bool CConnman::DisconnectSubnet(const CSubNet& subNet) -{ - if (CNode* pnode = FindNode(subNet)) { - pnode->fDisconnect = true; - return true; + vstats.emplace_back(); + pnode->copyStats(vstats.back()); } - return false; } bool CConnman::DisconnectNode(const std::string& strNode) { + LOCK(cs_vNodes); if (CNode* pnode = FindNode(strNode)) { pnode->fDisconnect = true; return true; @@ -2420,16 +2492,6 @@ bool CConnman::DisconnectNode(NodeId id) return false; } -void CConnman::RelayTransaction(const CTransaction& tx) -{ - CInv inv(MSG_TX, tx.GetHash()); - LOCK(cs_vNodes); - BOOST_FOREACH(CNode* pnode, vNodes) - { - pnode->PushInventory(inv); - } -} - void CConnman::RecordBytesRecv(uint64_t bytes) { LOCK(cs_totalBytesRecv); @@ -2557,6 +2619,7 @@ unsigned int CConnman::GetReceiveFloodSize() const { return nReceiveFloodSize; } unsigned int CConnman::GetSendBufferSize() const{ return nSendBufferMaxSize; } CNode::CNode(NodeId idIn, ServiceFlags nLocalServicesIn, int nMyStartingHeightIn, SOCKET hSocketIn, const CAddress& addrIn, uint64_t nKeyedNetGroupIn, uint64_t nLocalHostNonceIn, const std::string& addrNameIn, bool fInboundIn) : + nTimeConnected(GetSystemTimeInSeconds()), addr(addrIn), fInbound(fInboundIn), id(idIn), @@ -2576,7 +2639,6 @@ CNode::CNode(NodeId idIn, ServiceFlags nLocalServicesIn, int nMyStartingHeightIn nLastRecv = 0; nSendBytes = 0; nRecvBytes = 0; - nTimeConnected = GetTime(); nTimeOffset = 0; addrName = addrNameIn == "" ? addr.ToStringIPPort() : addrNameIn; nVersion = 0; @@ -2613,6 +2675,9 @@ CNode::CNode(NodeId idIn, ServiceFlags nLocalServicesIn, int nMyStartingHeightIn minFeeFilter = 0; lastSentFeeFilter = 0; nextSendTimeFeeFilter = 0; + fPauseRecv = false; + fPauseSend = false; + nProcessQueueSize = 0; BOOST_FOREACH(const std::string &msg, getAllNetMessageTypes()) mapRecvBytesPerMsgCmd[msg] = 0; @@ -2666,6 +2731,11 @@ void CNode::AskFor(const CInv& inv) mapAskFor.insert(std::make_pair(nRequestTime, inv)); } +bool CConnman::NodeFullyConnected(const CNode* pnode) +{ + return pnode && pnode->fSuccessfullyConnected && !pnode->fDisconnect; +} + void CConnman::PushMessage(CNode* pnode, CSerializedNetMsg&& msg) { size_t nMessageSize = msg.data.size(); @@ -2683,15 +2753,14 @@ void CConnman::PushMessage(CNode* pnode, CSerializedNetMsg&& msg) size_t nBytesSent = 0; { LOCK(pnode->cs_vSend); - if(pnode->hSocket == INVALID_SOCKET) { - return; - } bool optimisticSend(pnode->vSendMsg.empty()); //log total amount of bytes per command pnode->mapSendBytesPerMsgCmd[msg.command] += nTotalSize; pnode->nSendSize += nTotalSize; + if (pnode->nSendSize > nSendBufferMaxSize) + pnode->fPauseSend = true; pnode->vSendMsg.push_back(std::move(serializedHeader)); if (nMessageSize) pnode->vSendMsg.push_back(std::move(msg.data)); @@ -2714,19 +2783,19 @@ bool CConnman::ForNode(NodeId id, std::function<bool(CNode* pnode)> func) break; } } - return found != nullptr && func(found); + return found != nullptr && NodeFullyConnected(found) && func(found); } int64_t PoissonNextSend(int64_t nNow, int average_interval_seconds) { return nNow + (int64_t)(log1p(GetRand(1ULL << 48) * -0.0000000000000035527136788 /* -1/2^48 */) * average_interval_seconds * -1000000.0 + 0.5); } -CSipHasher CConnman::GetDeterministicRandomizer(uint64_t id) +CSipHasher CConnman::GetDeterministicRandomizer(uint64_t id) const { return CSipHasher(nSeed0, nSeed1).Write(id); } -uint64_t CConnman::CalculateKeyedNetGroup(const CAddress& ad) +uint64_t CConnman::CalculateKeyedNetGroup(const CAddress& ad) const { std::vector<unsigned char> vchNetGroup(ad.GetGroup()); @@ -162,75 +162,33 @@ public: void PushMessage(CNode* pnode, CSerializedNetMsg&& msg); template<typename Callable> - bool ForEachNodeContinueIf(Callable&& func) - { - LOCK(cs_vNodes); - for (auto&& node : vNodes) - if(!func(node)) - return false; - return true; - }; - - template<typename Callable> - bool ForEachNodeContinueIf(Callable&& func) const - { - LOCK(cs_vNodes); - for (const auto& node : vNodes) - if(!func(node)) - return false; - return true; - }; - - template<typename Callable, typename CallableAfter> - bool ForEachNodeContinueIfThen(Callable&& pre, CallableAfter&& post) - { - bool ret = true; - LOCK(cs_vNodes); - for (auto&& node : vNodes) - if(!pre(node)) { - ret = false; - break; - } - post(); - return ret; - }; - - template<typename Callable, typename CallableAfter> - bool ForEachNodeContinueIfThen(Callable&& pre, CallableAfter&& post) const - { - bool ret = true; - LOCK(cs_vNodes); - for (const auto& node : vNodes) - if(!pre(node)) { - ret = false; - break; - } - post(); - return ret; - }; - - template<typename Callable> void ForEachNode(Callable&& func) { LOCK(cs_vNodes); - for (auto&& node : vNodes) - func(node); + for (auto&& node : vNodes) { + if (NodeFullyConnected(node)) + func(node); + } }; template<typename Callable> void ForEachNode(Callable&& func) const { LOCK(cs_vNodes); - for (const auto& node : vNodes) - func(node); + for (auto&& node : vNodes) { + if (NodeFullyConnected(node)) + func(node); + } }; template<typename Callable, typename CallableAfter> void ForEachNodeThen(Callable&& pre, CallableAfter&& post) { LOCK(cs_vNodes); - for (auto&& node : vNodes) - pre(node); + for (auto&& node : vNodes) { + if (NodeFullyConnected(node)) + pre(node); + } post(); }; @@ -238,13 +196,13 @@ public: void ForEachNodeThen(Callable&& pre, CallableAfter&& post) const { LOCK(cs_vNodes); - for (const auto& node : vNodes) - pre(node); + for (auto&& node : vNodes) { + if (NodeFullyConnected(node)) + pre(node); + } post(); }; - void RelayTransaction(const CTransaction& tx); - // Addrman functions size_t GetAddressCount() const; void SetServices(const CService &addr, ServiceFlags nServices); @@ -286,10 +244,8 @@ public: size_t GetNodeCount(NumConnections num); void GetNodeStats(std::vector<CNodeStats>& vstats); - bool DisconnectAddress(const CNetAddr& addr); bool DisconnectNode(const std::string& node); bool DisconnectNode(NodeId id); - bool DisconnectSubnet(const CSubNet& subnet); unsigned int GetSendBufferSize() const; @@ -325,8 +281,11 @@ public: int GetBestHeight() const; /** Get a unique deterministic randomizer. */ - CSipHasher GetDeterministicRandomizer(uint64_t id); + CSipHasher GetDeterministicRandomizer(uint64_t id) const; + + unsigned int GetReceiveFloodSize() const; + void WakeMessageHandler(); private: struct ListenSocket { SOCKET socket; @@ -343,7 +302,7 @@ private: void ThreadSocketHandler(); void ThreadDNSAddressSeed(); - uint64_t CalculateKeyedNetGroup(const CAddress& ad); + uint64_t CalculateKeyedNetGroup(const CAddress& ad) const; CNode* FindNode(const CNetAddr& ip); CNode* FindNode(const CSubNet& subNet); @@ -358,6 +317,7 @@ private: NodeId GetNewNodeId(); + size_t SocketSendData(CNode *pnode) const; //!check is the banlist has unwritten changes bool BannedSetIsDirty(); //!set the "dirty" flag for the banlist @@ -368,12 +328,13 @@ private: void DumpData(); void DumpBanlist(); - unsigned int GetReceiveFloodSize() const; - // Network stats void RecordBytesRecv(uint64_t bytes); void RecordBytesSent(uint64_t bytes); + // Whether the node should be passed out in ForEach* callbacks + static bool NodeFullyConnected(const CNode* pnode); + // Network usage totals CCriticalSection cs_totalBytesRecv; CCriticalSection cs_totalBytesSent; @@ -428,6 +389,9 @@ private: /** SipHasher seeds for deterministic randomness */ const uint64_t nSeed0, nSeed1; + /** flag for waking the message processor. */ + bool fMsgProcWake; + std::condition_variable condMsgProc; std::mutex mutexMsgProc; std::atomic<bool> flagInterruptMsgProc; @@ -445,7 +409,6 @@ void Discover(boost::thread_group& threadGroup); void MapPort(bool fUseUPnP); unsigned short GetListenPort(); bool BindListenPort(const CService &bindAddr, std::string& strError, bool fWhitelisted = false); -size_t SocketSendData(CNode *pnode); struct CombinerAll { @@ -601,7 +564,7 @@ class CNode friend class CConnman; public: // socket - ServiceFlags nServices; + std::atomic<ServiceFlags> nServices; ServiceFlags nServicesExpected; SOCKET hSocket; size_t nSendSize; // total size of all vSendMsg entries @@ -609,33 +572,38 @@ public: uint64_t nSendBytes; std::deque<std::vector<unsigned char>> vSendMsg; CCriticalSection cs_vSend; + CCriticalSection cs_hSocket; + CCriticalSection cs_vRecv; + + CCriticalSection cs_vProcessMsg; + std::list<CNetMessage> vProcessMsg; + size_t nProcessQueueSize; + + CCriticalSection cs_sendProcessing; std::deque<CInv> vRecvGetData; - std::deque<CNetMessage> vRecvMsg; - CCriticalSection cs_vRecvMsg; uint64_t nRecvBytes; - int nRecvVersion; + std::atomic<int> nRecvVersion; - int64_t nLastSend; - int64_t nLastRecv; - int64_t nTimeConnected; - int64_t nTimeOffset; + std::atomic<int64_t> nLastSend; + std::atomic<int64_t> nLastRecv; + const int64_t nTimeConnected; + std::atomic<int64_t> nTimeOffset; const CAddress addr; - std::string addrName; - CService addrLocal; - int nVersion; + std::atomic<int> nVersion; // strSubVer is whatever byte array we read from the wire. However, this field is intended // to be printed out, displayed to humans in various forms and so on. So we sanitize it and // store the sanitized version in cleanSubVer. The original should be used when dealing with // the network or wire types and the cleaned string used when displayed or logged. std::string strSubVer, cleanSubVer; + CCriticalSection cs_SubVer; // used for both cleanSubVer and strSubVer bool fWhitelisted; // This peer can bypass DoS banning. bool fFeeler; // If true this node is being used as a short lived feeler. bool fOneShot; bool fAddnode; bool fClient; const bool fInbound; - bool fSuccessfullyConnected; + std::atomic_bool fSuccessfullyConnected; std::atomic_bool fDisconnect; // We use fRelayTxes for two purposes - // a) it allows us to not relay tx invs before receiving the peer's version message @@ -646,10 +614,12 @@ public: CSemaphoreGrant grantOutbound; CCriticalSection cs_filter; CBloomFilter* pfilter; - int nRefCount; + std::atomic<int> nRefCount; const NodeId id; const uint64_t nKeyedNetGroup; + std::atomic_bool fPauseRecv; + std::atomic_bool fPauseSend; protected: mapMsgCmdSize mapSendBytesPerMsgCmd; @@ -657,7 +627,7 @@ protected: public: uint256 hashContinue; - int nStartingHeight; + std::atomic<int> nStartingHeight; // flood relay std::vector<CAddress> vAddrToSend; @@ -695,15 +665,15 @@ public: // Ping time measurement: // The pong reply we're expecting, or 0 if no pong expected. - uint64_t nPingNonceSent; + std::atomic<uint64_t> nPingNonceSent; // Time (in usec) the last ping was sent, or 0 if no ping was ever sent. - int64_t nPingUsecStart; + std::atomic<int64_t> nPingUsecStart; // Last measured round-trip time. - int64_t nPingUsecTime; + std::atomic<int64_t> nPingUsecTime; // Best measured round-trip time. - int64_t nMinPingUsecTime; + std::atomic<int64_t> nMinPingUsecTime; // Whether a ping is requested. - bool fPingQueued; + std::atomic<bool> fPingQueued; // Minimum fee rate with which to filter inv's to this node CAmount minFeeFilter; CCriticalSection cs_feeFilter; @@ -723,6 +693,13 @@ private: const ServiceFlags nLocalServices; const int nMyStartingHeight; int nSendVersion; + std::list<CNetMessage> vRecvMsg; // Used only by SocketHandler thread + + mutable CCriticalSection cs_addrName; + std::string addrName; + + CService addrLocal; + mutable CCriticalSection cs_addrLocal; public: NodeId GetId() const { @@ -743,44 +720,22 @@ public: return nRefCount; } - // requires LOCK(cs_vRecvMsg) - unsigned int GetTotalRecvSize() - { - unsigned int total = 0; - BOOST_FOREACH(const CNetMessage &msg, vRecvMsg) - total += msg.vRecv.size() + 24; - return total; - } - - // requires LOCK(cs_vRecvMsg) bool ReceiveMsgBytes(const char *pch, unsigned int nBytes, bool& complete); - // requires LOCK(cs_vRecvMsg) void SetRecvVersion(int nVersionIn) { nRecvVersion = nVersionIn; - BOOST_FOREACH(CNetMessage &msg, vRecvMsg) - msg.SetVersion(nVersionIn); } - void SetSendVersion(int nVersionIn) + int GetRecvVersion() { - // Send version may only be changed in the version message, and - // only one version message is allowed per session. We can therefore - // treat this value as const and even atomic as long as it's only used - // once the handshake is complete. Any attempt to set this twice is an - // error. - assert(nSendVersion == 0); - nSendVersion = nVersionIn; + return nRecvVersion; } + void SetSendVersion(int nVersionIn); + int GetSendVersion() const; - int GetSendVersion() const - { - // The send version should always be explicitly set to - // INIT_PROTO_VERSION rather than using this value until the handshake - // is complete. - assert(nSendVersion != 0); - return nSendVersion; - } + CService GetAddrLocal() const; + //! May not be called more than once + void SetAddrLocal(const CService& addrLocalIn); CNode* AddRef() { @@ -851,6 +806,10 @@ public: { return nLocalServices; } + + std::string GetAddrName() const; + //! Sets the addrName only if it was not previously set + void MaybeSetAddrName(const std::string& addrNameIn); }; diff --git a/src/net_processing.cpp b/src/net_processing.cpp index 3a956e89e7..71a0a1de22 100644 --- a/src/net_processing.cpp +++ b/src/net_processing.cpp @@ -32,13 +32,11 @@ #include <boost/thread.hpp> -using namespace std; - #if defined(NDEBUG) # error "Bitcoin cannot be compiled without assertions." #endif -int64_t nTimeBestReceived = 0; // Used only to inform the wallet of when we last received a block +std::atomic<int64_t> nTimeBestReceived(0); // Used only to inform the wallet of when we last received a block struct IteratorComparator { @@ -55,10 +53,13 @@ struct COrphanTx { NodeId fromPeer; int64_t nTimeExpire; }; -map<uint256, COrphanTx> mapOrphanTransactions GUARDED_BY(cs_main); -map<COutPoint, set<map<uint256, COrphanTx>::iterator, IteratorComparator>> mapOrphanTransactionsByPrev GUARDED_BY(cs_main); +std::map<uint256, COrphanTx> mapOrphanTransactions GUARDED_BY(cs_main); +std::map<COutPoint, std::set<std::map<uint256, COrphanTx>::iterator, IteratorComparator>> mapOrphanTransactionsByPrev GUARDED_BY(cs_main); void EraseOrphansFor(NodeId peer) EXCLUSIVE_LOCKS_REQUIRED(cs_main); +static size_t vExtraTxnForCompactIt = 0; +static std::vector<std::pair<uint256, CTransactionRef>> vExtraTxnForCompact GUARDED_BY(cs_main); + static const uint64_t RANDOMIZER_ID_ADDRESS_RELAY = 0x3cac0035b5866b90ULL; // SHA256("main address relay")[0:8] // Internal stuff @@ -73,7 +74,7 @@ namespace { * Set mapBlockSource[hash].second to false if the node should not be * punished if the block is invalid. */ - map<uint256, std::pair<NodeId, bool>> mapBlockSource; + std::map<uint256, std::pair<NodeId, bool>> mapBlockSource; /** * Filter for transactions that were recently rejected by @@ -101,14 +102,14 @@ namespace { /** Blocks that are in flight, and that are in the queue to be downloaded. Protected by cs_main. */ struct QueuedBlock { uint256 hash; - CBlockIndex* pindex; //!< Optional. + const CBlockIndex* pindex; //!< Optional. bool fValidatedHeaders; //!< Whether this block has validated headers at the time of request. std::unique_ptr<PartiallyDownloadedBlock> partialBlock; //!< Optional, used for CMPCTBLOCK downloads }; - map<uint256, pair<NodeId, list<QueuedBlock>::iterator> > mapBlocksInFlight; + std::map<uint256, std::pair<NodeId, std::list<QueuedBlock>::iterator> > mapBlocksInFlight; /** Stack of nodes which we have set to announce using compact blocks */ - list<NodeId> lNodesAnnouncingHeaderAndIDs; + std::list<NodeId> lNodesAnnouncingHeaderAndIDs; /** Number of preferable block download peers. */ int nPreferredDownload = 0; @@ -132,7 +133,7 @@ namespace { struct CBlockReject { unsigned char chRejectCode; - string strRejectReason; + std::string strRejectReason; uint256 hashBlock; }; @@ -156,20 +157,20 @@ struct CNodeState { //! List of asynchronously-determined block rejections to notify this peer about. std::vector<CBlockReject> rejects; //! The best known block we know this peer has announced. - CBlockIndex *pindexBestKnownBlock; + const CBlockIndex *pindexBestKnownBlock; //! The hash of the last unknown block this peer has announced. uint256 hashLastUnknownBlock; //! The last full block we both have. - CBlockIndex *pindexLastCommonBlock; + const CBlockIndex *pindexLastCommonBlock; //! The best header we have sent our peer. - CBlockIndex *pindexBestHeaderSent; + const CBlockIndex *pindexBestHeaderSent; //! Length of current-streak of unconnecting headers announcements int nUnconnectingHeaders; //! Whether we've started headers synchronization with this peer. bool fSyncStarted; //! Since when we're stalling block download progress (in microseconds), or 0. int64_t nStallingSince; - list<QueuedBlock> vBlocksInFlight; + std::list<QueuedBlock> vBlocksInFlight; //! When the first entry in vBlocksInFlight started downloading. Don't care when vBlocksInFlight is empty. int64_t nDownloadingSince; int nBlocksInFlight; @@ -221,11 +222,11 @@ struct CNodeState { }; /** Map maintaining per-node state. Requires cs_main. */ -map<NodeId, CNodeState> mapNodeState; +std::map<NodeId, CNodeState> mapNodeState; // Requires cs_main. CNodeState *State(NodeId pnode) { - map<NodeId, CNodeState>::iterator it = mapNodeState.find(pnode); + std::map<NodeId, CNodeState>::iterator it = mapNodeState.find(pnode); if (it == mapNodeState.end()) return NULL; return &it->second; @@ -263,7 +264,7 @@ void PushNodeVersion(CNode *pnode, CConnman& connman, int64_t nTime) void InitializeNode(CNode *pnode, CConnman& connman) { CAddress addr = pnode->addr; - std::string addrName = pnode->addrName; + std::string addrName = pnode->GetAddrName(); NodeId nodeid = pnode->GetId(); { LOCK(cs_main); @@ -307,7 +308,7 @@ void FinalizeNode(NodeId nodeid, bool& fUpdateConnectionTime) { // Returns a bool indicating whether we requested this block. // Also used if a block was /not/ received and timed out or started with another peer bool MarkBlockAsReceived(const uint256& hash) { - map<uint256, pair<NodeId, list<QueuedBlock>::iterator> >::iterator itInFlight = mapBlocksInFlight.find(hash); + std::map<uint256, std::pair<NodeId, std::list<QueuedBlock>::iterator> >::iterator itInFlight = mapBlocksInFlight.find(hash); if (itInFlight != mapBlocksInFlight.end()) { CNodeState *state = State(itInFlight->second.first); state->nBlocksInFlightValidHeaders -= itInFlight->second.second->fValidatedHeaders; @@ -331,12 +332,12 @@ bool MarkBlockAsReceived(const uint256& hash) { // Requires cs_main. // returns false, still setting pit, if the block was already in flight from the same peer // pit will only be valid as long as the same cs_main lock is being held -bool MarkBlockAsInFlight(NodeId nodeid, const uint256& hash, const Consensus::Params& consensusParams, CBlockIndex *pindex = NULL, list<QueuedBlock>::iterator **pit = NULL) { +bool MarkBlockAsInFlight(NodeId nodeid, const uint256& hash, const Consensus::Params& consensusParams, const CBlockIndex* pindex = NULL, std::list<QueuedBlock>::iterator** pit = NULL) { CNodeState *state = State(nodeid); assert(state != NULL); // Short-circuit most stuff in case its from the same node - map<uint256, pair<NodeId, list<QueuedBlock>::iterator> >::iterator itInFlight = mapBlocksInFlight.find(hash); + std::map<uint256, std::pair<NodeId, std::list<QueuedBlock>::iterator> >::iterator itInFlight = mapBlocksInFlight.find(hash); if (itInFlight != mapBlocksInFlight.end() && itInFlight->second.first == nodeid) { *pit = &itInFlight->second.second; return false; @@ -345,7 +346,7 @@ bool MarkBlockAsInFlight(NodeId nodeid, const uint256& hash, const Consensus::Pa // Make sure it's not listed somewhere already. MarkBlockAsReceived(hash); - list<QueuedBlock>::iterator it = state->vBlocksInFlight.insert(state->vBlocksInFlight.end(), + std::list<QueuedBlock>::iterator it = state->vBlocksInFlight.insert(state->vBlocksInFlight.end(), {hash, pindex, pindex != NULL, std::unique_ptr<PartiallyDownloadedBlock>(pit ? new PartiallyDownloadedBlock(&mempool) : NULL)}); state->nBlocksInFlight++; state->nBlocksInFlightValidHeaders += it->fValidatedHeaders; @@ -395,33 +396,38 @@ void UpdateBlockAvailability(NodeId nodeid, const uint256 &hash) { } } -void MaybeSetPeerAsAnnouncingHeaderAndIDs(const CNodeState* nodestate, CNode* pfrom, CConnman& connman) { - if (!nodestate->fSupportsDesiredCmpctVersion) { +void MaybeSetPeerAsAnnouncingHeaderAndIDs(NodeId nodeid, CConnman& connman) { + AssertLockHeld(cs_main); + CNodeState* nodestate = State(nodeid); + if (!nodestate || !nodestate->fSupportsDesiredCmpctVersion) { // Never ask from peers who can't provide witnesses. return; } if (nodestate->fProvidesHeaderAndIDs) { for (std::list<NodeId>::iterator it = lNodesAnnouncingHeaderAndIDs.begin(); it != lNodesAnnouncingHeaderAndIDs.end(); it++) { - if (*it == pfrom->GetId()) { + if (*it == nodeid) { lNodesAnnouncingHeaderAndIDs.erase(it); - lNodesAnnouncingHeaderAndIDs.push_back(pfrom->GetId()); + lNodesAnnouncingHeaderAndIDs.push_back(nodeid); return; } } - bool fAnnounceUsingCMPCTBLOCK = false; - uint64_t nCMPCTBLOCKVersion = (pfrom->GetLocalServices() & NODE_WITNESS) ? 2 : 1; - if (lNodesAnnouncingHeaderAndIDs.size() >= 3) { - // As per BIP152, we only get 3 of our peers to announce - // blocks using compact encodings. - connman.ForNode(lNodesAnnouncingHeaderAndIDs.front(), [&connman, fAnnounceUsingCMPCTBLOCK, nCMPCTBLOCKVersion](CNode* pnodeStop){ - connman.PushMessage(pnodeStop, CNetMsgMaker(pnodeStop->GetSendVersion()).Make(NetMsgType::SENDCMPCT, fAnnounceUsingCMPCTBLOCK, nCMPCTBLOCKVersion)); - return true; - }); - lNodesAnnouncingHeaderAndIDs.pop_front(); - } - fAnnounceUsingCMPCTBLOCK = true; - connman.PushMessage(pfrom, CNetMsgMaker(pfrom->GetSendVersion()).Make(NetMsgType::SENDCMPCT, fAnnounceUsingCMPCTBLOCK, nCMPCTBLOCKVersion)); - lNodesAnnouncingHeaderAndIDs.push_back(pfrom->GetId()); + connman.ForNode(nodeid, [&connman](CNode* pfrom){ + bool fAnnounceUsingCMPCTBLOCK = false; + uint64_t nCMPCTBLOCKVersion = (pfrom->GetLocalServices() & NODE_WITNESS) ? 2 : 1; + if (lNodesAnnouncingHeaderAndIDs.size() >= 3) { + // As per BIP152, we only get 3 of our peers to announce + // blocks using compact encodings. + connman.ForNode(lNodesAnnouncingHeaderAndIDs.front(), [&connman, fAnnounceUsingCMPCTBLOCK, nCMPCTBLOCKVersion](CNode* pnodeStop){ + connman.PushMessage(pnodeStop, CNetMsgMaker(pnodeStop->GetSendVersion()).Make(NetMsgType::SENDCMPCT, fAnnounceUsingCMPCTBLOCK, nCMPCTBLOCKVersion)); + return true; + }); + lNodesAnnouncingHeaderAndIDs.pop_front(); + } + fAnnounceUsingCMPCTBLOCK = true; + connman.PushMessage(pfrom, CNetMsgMaker(pfrom->GetSendVersion()).Make(NetMsgType::SENDCMPCT, fAnnounceUsingCMPCTBLOCK, nCMPCTBLOCKVersion)); + lNodesAnnouncingHeaderAndIDs.push_back(pfrom->GetId()); + return true; + }); } } @@ -432,7 +438,7 @@ bool CanDirectFetch(const Consensus::Params &consensusParams) } // Requires cs_main -bool PeerHasHeader(CNodeState *state, CBlockIndex *pindex) +bool PeerHasHeader(CNodeState *state, const CBlockIndex *pindex) { if (state->pindexBestKnownBlock && pindex == state->pindexBestKnownBlock->GetAncestor(pindex->nHeight)) return true; @@ -443,7 +449,7 @@ bool PeerHasHeader(CNodeState *state, CBlockIndex *pindex) /** Find the last common ancestor two blocks have. * Both pa and pb must be non-NULL. */ -CBlockIndex* LastCommonAncestor(CBlockIndex* pa, CBlockIndex* pb) { +const CBlockIndex* LastCommonAncestor(const CBlockIndex* pa, const CBlockIndex* pb) { if (pa->nHeight > pb->nHeight) { pa = pa->GetAncestor(pb->nHeight); } else if (pb->nHeight > pa->nHeight) { @@ -462,7 +468,7 @@ CBlockIndex* LastCommonAncestor(CBlockIndex* pa, CBlockIndex* pb) { /** Update pindexLastCommonBlock and add not-in-flight missing successors to vBlocks, until it has * at most count entries. */ -void FindNextBlocksToDownload(NodeId nodeid, unsigned int count, std::vector<CBlockIndex*>& vBlocks, NodeId& nodeStaller, const Consensus::Params& consensusParams) { +void FindNextBlocksToDownload(NodeId nodeid, unsigned int count, std::vector<const CBlockIndex*>& vBlocks, NodeId& nodeStaller, const Consensus::Params& consensusParams) { if (count == 0) return; @@ -490,8 +496,8 @@ void FindNextBlocksToDownload(NodeId nodeid, unsigned int count, std::vector<CBl if (state->pindexLastCommonBlock == state->pindexBestKnownBlock) return; - std::vector<CBlockIndex*> vToFetch; - CBlockIndex *pindexWalk = state->pindexLastCommonBlock; + std::vector<const CBlockIndex*> vToFetch; + const CBlockIndex *pindexWalk = state->pindexLastCommonBlock; // Never fetch further than the best block we know the peer has, or more than BLOCK_DOWNLOAD_WINDOW + 1 beyond the last // linked block we have in common with this peer. The +1 is so we can detect stalling, namely if we would be able to // download that next block if the window were 1 larger. @@ -514,7 +520,7 @@ void FindNextBlocksToDownload(NodeId nodeid, unsigned int count, std::vector<CBl // are not yet downloaded and not in flight to vBlocks. In the mean time, update // pindexLastCommonBlock as long as all ancestors are already downloaded, or if it's // already part of our chain (and therefore don't need it even if pruned). - BOOST_FOREACH(CBlockIndex* pindex, vToFetch) { + BOOST_FOREACH(const CBlockIndex* pindex, vToFetch) { if (!pindex->IsValid(BLOCK_VALID_TREE)) { // We consider the chain that this peer is on invalid. return; @@ -586,6 +592,17 @@ void UnregisterNodeSignals(CNodeSignals& nodeSignals) // mapOrphanTransactions // +void AddToCompactExtraTransactions(const CTransactionRef& tx) +{ + size_t max_extra_txn = GetArg("-blockreconstructionextratxn", DEFAULT_BLOCK_RECONSTRUCTION_EXTRA_TXN); + if (max_extra_txn <= 0) + return; + if (!vExtraTxnForCompact.size()) + vExtraTxnForCompact.resize(max_extra_txn); + vExtraTxnForCompact[vExtraTxnForCompactIt] = std::make_pair(tx->GetWitnessHash(), tx); + vExtraTxnForCompactIt = (vExtraTxnForCompactIt + 1) % max_extra_txn; +} + bool AddOrphanTx(const CTransactionRef& tx, NodeId peer) EXCLUSIVE_LOCKS_REQUIRED(cs_main) { const uint256& hash = tx->GetHash(); @@ -612,6 +629,8 @@ bool AddOrphanTx(const CTransactionRef& tx, NodeId peer) EXCLUSIVE_LOCKS_REQUIRE mapOrphanTransactionsByPrev[txin.prevout].insert(ret.first); } + AddToCompactExtraTransactions(tx); + LogPrint("mempool", "stored orphan tx %s (mapsz %u outsz %u)\n", hash.ToString(), mapOrphanTransactions.size(), mapOrphanTransactionsByPrev.size()); return true; @@ -619,7 +638,7 @@ bool AddOrphanTx(const CTransactionRef& tx, NodeId peer) EXCLUSIVE_LOCKS_REQUIRE int static EraseOrphanTx(uint256 hash) EXCLUSIVE_LOCKS_REQUIRED(cs_main) { - map<uint256, COrphanTx>::iterator it = mapOrphanTransactions.find(hash); + std::map<uint256, COrphanTx>::iterator it = mapOrphanTransactions.find(hash); if (it == mapOrphanTransactions.end()) return 0; BOOST_FOREACH(const CTxIn& txin, it->second.tx->vin) @@ -638,16 +657,16 @@ int static EraseOrphanTx(uint256 hash) EXCLUSIVE_LOCKS_REQUIRED(cs_main) void EraseOrphansFor(NodeId peer) { int nErased = 0; - map<uint256, COrphanTx>::iterator iter = mapOrphanTransactions.begin(); + std::map<uint256, COrphanTx>::iterator iter = mapOrphanTransactions.begin(); while (iter != mapOrphanTransactions.end()) { - map<uint256, COrphanTx>::iterator maybeErase = iter++; // increment to avoid iterator becoming invalid + std::map<uint256, COrphanTx>::iterator maybeErase = iter++; // increment to avoid iterator becoming invalid if (maybeErase->second.fromPeer == peer) { nErased += EraseOrphanTx(maybeErase->second.tx->GetHash()); } } - if (nErased > 0) LogPrint("mempool", "Erased %d orphan tx from peer %d\n", nErased, peer); + if (nErased > 0) LogPrint("mempool", "Erased %d orphan tx from peer=%d\n", nErased, peer); } @@ -660,10 +679,10 @@ unsigned int LimitOrphanTxSize(unsigned int nMaxOrphans) EXCLUSIVE_LOCKS_REQUIRE // Sweep out expired orphan pool entries: int nErased = 0; int64_t nMinExpTime = nNow + ORPHAN_TX_EXPIRE_TIME - ORPHAN_TX_EXPIRE_INTERVAL; - map<uint256, COrphanTx>::iterator iter = mapOrphanTransactions.begin(); + std::map<uint256, COrphanTx>::iterator iter = mapOrphanTransactions.begin(); while (iter != mapOrphanTransactions.end()) { - map<uint256, COrphanTx>::iterator maybeErase = iter++; + std::map<uint256, COrphanTx>::iterator maybeErase = iter++; if (maybeErase->second.nTimeExpire <= nNow) { nErased += EraseOrphanTx(maybeErase->second.tx->GetHash()); } else { @@ -678,7 +697,7 @@ unsigned int LimitOrphanTxSize(unsigned int nMaxOrphans) EXCLUSIVE_LOCKS_REQUIRE { // Evict a random orphan: uint256 randomhash = GetRandHash(); - map<uint256, COrphanTx>::iterator it = mapOrphanTransactions.lower_bound(randomhash); + std::map<uint256, COrphanTx>::iterator it = mapOrphanTransactions.lower_bound(randomhash); if (it == mapOrphanTransactions.end()) it = mapOrphanTransactions.begin(); EraseOrphanTx(it->first); @@ -752,6 +771,51 @@ void PeerLogicValidation::SyncTransaction(const CTransaction& tx, const CBlockIn } } +static CCriticalSection cs_most_recent_block; +static std::shared_ptr<const CBlock> most_recent_block; +static std::shared_ptr<const CBlockHeaderAndShortTxIDs> most_recent_compact_block; +static uint256 most_recent_block_hash; + +void PeerLogicValidation::NewPoWValidBlock(const CBlockIndex *pindex, const std::shared_ptr<const CBlock>& pblock) { + std::shared_ptr<const CBlockHeaderAndShortTxIDs> pcmpctblock = std::make_shared<const CBlockHeaderAndShortTxIDs> (*pblock, true); + const CNetMsgMaker msgMaker(PROTOCOL_VERSION); + + LOCK(cs_main); + + static int nHighestFastAnnounce = 0; + if (pindex->nHeight <= nHighestFastAnnounce) + return; + nHighestFastAnnounce = pindex->nHeight; + + bool fWitnessEnabled = IsWitnessEnabled(pindex->pprev, Params().GetConsensus()); + uint256 hashBlock(pblock->GetHash()); + + { + LOCK(cs_most_recent_block); + most_recent_block_hash = hashBlock; + most_recent_block = pblock; + most_recent_compact_block = pcmpctblock; + } + + connman->ForEachNode([this, &pcmpctblock, pindex, &msgMaker, fWitnessEnabled, &hashBlock](CNode* pnode) { + // TODO: Avoid the repeated-serialization here + if (pnode->nVersion < INVALID_CB_NO_BAN_VERSION || pnode->fDisconnect) + return; + ProcessBlockAvailability(pnode->GetId()); + CNodeState &state = *State(pnode->GetId()); + // If the peer has, or we announced to them the previous block already, + // but we don't think they have this one, go ahead and announce it + if (state.fPreferHeaderAndIDs && (!fWitnessEnabled || state.fWantsCmpctWitness) && + !PeerHasHeader(&state, pindex) && PeerHasHeader(&state, pindex->pprev)) { + + LogPrint("net", "%s sending header-and-ids %s to peer=%d\n", "PeerLogicValidation::NewPoWValidBlock", + hashBlock.ToString(), pnode->id); + connman->PushMessage(pnode, msgMaker.Make(NetMsgType::CMPCTBLOCK, *pcmpctblock)); + state.pindexBestHeaderSent = pindex; + } + }); +} + void PeerLogicValidation::UpdatedBlockTip(const CBlockIndex *pindexNew, const CBlockIndex *pindexFork, bool fInitialDownload) { const int nNewHeight = pindexNew->nHeight; connman->SetBestHeight(nNewHeight); @@ -777,6 +841,7 @@ void PeerLogicValidation::UpdatedBlockTip(const CBlockIndex *pindexNew, const CB } } }); + connman->WakeMessageHandler(); } nTimeBestReceived = GetTime(); @@ -798,6 +863,19 @@ void PeerLogicValidation::BlockChecked(const CBlock& block, const CValidationSta Misbehaving(it->second.first, nDoS); } } + // Check that: + // 1. The block is valid + // 2. We're not in initial block download + // 3. This is currently the best block we're aware of. We haven't updated + // the tip yet so we have no way to check this directly here. Instead we + // just check that there are currently no other blocks in flight. + else if (state.IsValid() && + !IsInitialBlockDownload() && + mapBlocksInFlight.count(hash) == mapBlocksInFlight.size()) { + if (it != mapBlockSource.end()) { + MaybeSetPeerAsAnnouncingHeaderAndIDs(it->second.first, *connman); + } + } if (it != mapBlockSource.end()) mapBlockSource.erase(it); } @@ -886,17 +964,16 @@ static void RelayAddress(const CAddress& addr, bool fReachable, CConnman& connma connman.ForEachNodeThen(std::move(sortfunc), std::move(pushfunc)); } -void static ProcessGetData(CNode* pfrom, const Consensus::Params& consensusParams, CConnman& connman, std::atomic<bool>& interruptMsgProc) +void static ProcessGetData(CNode* pfrom, const Consensus::Params& consensusParams, CConnman& connman, const std::atomic<bool>& interruptMsgProc) { std::deque<CInv>::iterator it = pfrom->vRecvGetData.begin(); - unsigned int nMaxSendBufferSize = connman.GetSendBufferSize(); - vector<CInv> vNotFound; - CNetMsgMaker msgMaker(pfrom->GetSendVersion()); + std::vector<CInv> vNotFound; + const CNetMsgMaker msgMaker(pfrom->GetSendVersion()); LOCK(cs_main); while (it != pfrom->vRecvGetData.end()) { // Don't bother if send buffer is too full to respond anyway - if (pfrom->nSendSize >= nMaxSendBufferSize) + if (pfrom->fPauseSend) break; const CInv &inv = *it; @@ -912,6 +989,21 @@ void static ProcessGetData(CNode* pfrom, const Consensus::Params& consensusParam BlockMap::iterator mi = mapBlockIndex.find(inv.hash); if (mi != mapBlockIndex.end()) { + if (mi->second->nChainTx && !mi->second->IsValid(BLOCK_VALID_SCRIPTS) && + mi->second->IsValid(BLOCK_VALID_TREE)) { + // If we have the block and all of its parents, but have not yet validated it, + // we might be in the middle of connecting it (ie in the unlock of cs_main + // before ActivateBestChain but after AcceptBlock). + // In this case, we need to run ActivateBestChain prior to checking the relay + // conditions below. + std::shared_ptr<const CBlock> a_recent_block; + { + LOCK(cs_most_recent_block); + a_recent_block = most_recent_block; + } + CValidationState dummy; + ActivateBestChain(dummy, Params(), a_recent_block); + } if (chainActive.Contains(mi->second)) { send = true; } else { @@ -997,7 +1089,7 @@ void static ProcessGetData(CNode* pfrom, const Consensus::Params& consensusParam // Bypass PushInventory, this must send even if redundant, // and we want it right after the last block so they don't // wait for other stuff first. - vector<CInv> vInv; + std::vector<CInv> vInv; vInv.push_back(CInv(MSG_BLOCK, chainActive.Tip()->GetBlockHash())); connman.PushMessage(pfrom, msgMaker.Make(NetMsgType::INV, vInv)); pfrom->hashContinue.SetNull(); @@ -1049,7 +1141,7 @@ void static ProcessGetData(CNode* pfrom, const Consensus::Params& consensusParam } } -uint32_t GetFetchFlags(CNode* pfrom, CBlockIndex* pprev, const Consensus::Params& chainparams) { +uint32_t GetFetchFlags(CNode* pfrom, const CBlockIndex* pprev, const Consensus::Params& chainparams) { uint32_t nFetchFlags = 0; if ((pfrom->GetLocalServices() & NODE_WITNESS) && State(pfrom->GetId())->fHaveWitness) { nFetchFlags |= MSG_WITNESS_FLAG; @@ -1057,10 +1149,25 @@ uint32_t GetFetchFlags(CNode* pfrom, CBlockIndex* pprev, const Consensus::Params return nFetchFlags; } -bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv, int64_t nTimeReceived, const CChainParams& chainparams, CConnman& connman, std::atomic<bool>& interruptMsgProc) -{ - unsigned int nMaxSendBufferSize = connman.GetSendBufferSize(); +inline void static SendBlockTransactions(const CBlock& block, const BlockTransactionsRequest& req, CNode* pfrom, CConnman& connman) { + BlockTransactions resp(req); + for (size_t i = 0; i < req.indexes.size(); i++) { + if (req.indexes[i] >= block.vtx.size()) { + LOCK(cs_main); + Misbehaving(pfrom->GetId(), 100); + LogPrintf("Peer %d sent us a getblocktxn with out-of-bounds tx indices", pfrom->id); + return; + } + resp.txn[i] = block.vtx[req.indexes[i]]; + } + LOCK(cs_main); + const CNetMsgMaker msgMaker(pfrom->GetSendVersion()); + int nSendFlags = State(pfrom->GetId())->fWantsCmpctWitness ? 0 : SERIALIZE_TRANSACTION_NO_WITNESS; + connman.PushMessage(pfrom, msgMaker.Make(nSendFlags, NetMsgType::BLOCKTXN, resp)); +} +bool static ProcessMessage(CNode* pfrom, const std::string& strCommand, CDataStream& vRecv, int64_t nTimeReceived, const CChainParams& chainparams, CConnman& connman, const std::atomic<bool>& interruptMsgProc) +{ LogPrint("net", "received: %s (%u bytes) peer=%d\n", SanitizeString(strCommand), vRecv.size(), pfrom->id); if (IsArgSet("-dropmessagestest") && GetRand(GetArg("-dropmessagestest", 0)) == 0) { @@ -1083,13 +1190,36 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv, } } + if (strCommand == NetMsgType::REJECT) + { + if (fDebug) { + try { + std::string strMsg; unsigned char ccode; std::string strReason; + vRecv >> LIMITED_STRING(strMsg, CMessageHeader::COMMAND_SIZE) >> ccode >> LIMITED_STRING(strReason, MAX_REJECT_MESSAGE_LENGTH); + + std::ostringstream ss; + ss << strMsg << " code " << itostr(ccode) << ": " << strReason; + + if (strMsg == NetMsgType::BLOCK || strMsg == NetMsgType::TX) + { + uint256 hash; + vRecv >> hash; + ss << ": hash " << hash.ToString(); + } + LogPrint("net", "Reject %s\n", SanitizeString(ss.str())); + } catch (const std::ios_base::failure&) { + // Avoid feedback loops by preventing reject messages from triggering a new reject message. + LogPrint("net", "Unparseable reject message received\n"); + } + } + } - if (strCommand == NetMsgType::VERSION) + else if (strCommand == NetMsgType::VERSION) { // Each connection can only send one version message if (pfrom->nVersion != 0) { - connman.PushMessage(pfrom, CNetMsgMaker(INIT_PROTO_VERSION).Make(NetMsgType::REJECT, strCommand, REJECT_DUPLICATE, string("Duplicate version message"))); + connman.PushMessage(pfrom, CNetMsgMaker(INIT_PROTO_VERSION).Make(NetMsgType::REJECT, strCommand, REJECT_DUPLICATE, std::string("Duplicate version message"))); LOCK(cs_main); Misbehaving(pfrom->GetId(), 1); return false; @@ -1100,50 +1230,53 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv, CAddress addrFrom; uint64_t nNonce = 1; uint64_t nServiceInt; - vRecv >> pfrom->nVersion >> nServiceInt >> nTime >> addrMe; - pfrom->nServices = ServiceFlags(nServiceInt); + ServiceFlags nServices; + int nVersion; + int nSendVersion; + std::string strSubVer; + std::string cleanSubVer; + int nStartingHeight = -1; + bool fRelay = true; + + vRecv >> nVersion >> nServiceInt >> nTime >> addrMe; + nSendVersion = std::min(nVersion, PROTOCOL_VERSION); + nServices = ServiceFlags(nServiceInt); if (!pfrom->fInbound) { - connman.SetServices(pfrom->addr, pfrom->nServices); + connman.SetServices(pfrom->addr, nServices); } - if (pfrom->nServicesExpected & ~pfrom->nServices) + if (pfrom->nServicesExpected & ~nServices) { - LogPrint("net", "peer=%d does not offer the expected services (%08x offered, %08x expected); disconnecting\n", pfrom->id, pfrom->nServices, pfrom->nServicesExpected); + LogPrint("net", "peer=%d does not offer the expected services (%08x offered, %08x expected); disconnecting\n", pfrom->id, nServices, pfrom->nServicesExpected); connman.PushMessage(pfrom, CNetMsgMaker(INIT_PROTO_VERSION).Make(NetMsgType::REJECT, strCommand, REJECT_NONSTANDARD, strprintf("Expected to offer services %08x", pfrom->nServicesExpected))); pfrom->fDisconnect = true; return false; } - if (pfrom->nVersion < MIN_PEER_PROTO_VERSION) + if (nVersion < MIN_PEER_PROTO_VERSION) { // disconnect from peers older than this proto version - LogPrintf("peer=%d using obsolete version %i; disconnecting\n", pfrom->id, pfrom->nVersion); + LogPrintf("peer=%d using obsolete version %i; disconnecting\n", pfrom->id, nVersion); connman.PushMessage(pfrom, CNetMsgMaker(INIT_PROTO_VERSION).Make(NetMsgType::REJECT, strCommand, REJECT_OBSOLETE, strprintf("Version must be %d or greater", MIN_PEER_PROTO_VERSION))); pfrom->fDisconnect = true; return false; } - if (pfrom->nVersion == 10300) - pfrom->nVersion = 300; + if (nVersion == 10300) + nVersion = 300; if (!vRecv.empty()) vRecv >> addrFrom >> nNonce; if (!vRecv.empty()) { - vRecv >> LIMITED_STRING(pfrom->strSubVer, MAX_SUBVERSION_LENGTH); - pfrom->cleanSubVer = SanitizeString(pfrom->strSubVer); + vRecv >> LIMITED_STRING(strSubVer, MAX_SUBVERSION_LENGTH); + cleanSubVer = SanitizeString(strSubVer); } if (!vRecv.empty()) { - vRecv >> pfrom->nStartingHeight; - } - { - LOCK(pfrom->cs_filter); - if (!vRecv.empty()) - vRecv >> pfrom->fRelayTxes; // set to true after we get the first filter* message - else - pfrom->fRelayTxes = true; + vRecv >> nStartingHeight; } - + if (!vRecv.empty()) + vRecv >> fRelay; // Disconnect if we connected to ourself if (pfrom->fInbound && !connman.CheckIncomingNonce(nNonce)) { @@ -1152,7 +1285,6 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv, return true; } - pfrom->addrLocal = addrMe; if (pfrom->fInbound && addrMe.IsRoutable()) { SeenLocal(addrMe); @@ -1162,9 +1294,27 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv, if (pfrom->fInbound) PushNodeVersion(pfrom, connman, GetAdjustedTime()); - pfrom->fClient = !(pfrom->nServices & NODE_NETWORK); + connman.PushMessage(pfrom, CNetMsgMaker(INIT_PROTO_VERSION).Make(NetMsgType::VERACK)); + + pfrom->nServices = nServices; + pfrom->SetAddrLocal(addrMe); + { + LOCK(pfrom->cs_SubVer); + pfrom->strSubVer = strSubVer; + pfrom->cleanSubVer = cleanSubVer; + } + pfrom->nStartingHeight = nStartingHeight; + pfrom->fClient = !(nServices & NODE_NETWORK); + { + LOCK(pfrom->cs_filter); + pfrom->fRelayTxes = fRelay; // set to true after we get the first filter* message + } + + // Change version + pfrom->SetSendVersion(nSendVersion); + pfrom->nVersion = nVersion; - if((pfrom->nServices & NODE_WITNESS)) + if((nServices & NODE_WITNESS)) { LOCK(cs_main); State(pfrom->GetId())->fHaveWitness = true; @@ -1176,11 +1326,6 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv, UpdatePreferredDownload(pfrom, State(pfrom->GetId())); } - // Change version - connman.PushMessage(pfrom, CNetMsgMaker(INIT_PROTO_VERSION).Make(NetMsgType::VERACK)); - int nSendVersion = std::min(pfrom->nVersion, PROTOCOL_VERSION); - pfrom->SetSendVersion(nSendVersion); - if (!pfrom->fInbound) { // Advertise our address @@ -1193,7 +1338,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv, LogPrint("net", "ProcessMessages: advertising address %s\n", addr.ToString()); pfrom->PushAddress(addr, insecure_rand); } else if (IsPeerAddrLocalGood(pfrom)) { - addr.SetIP(pfrom->addrLocal); + addr.SetIP(addrMe); LogPrint("net", "ProcessMessages: advertising address %s\n", addr.ToString()); pfrom->PushAddress(addr, insecure_rand); } @@ -1208,14 +1353,12 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv, connman.MarkAddressGood(pfrom->addr); } - pfrom->fSuccessfullyConnected = true; - - string remoteAddr; + std::string remoteAddr; if (fLogIPs) remoteAddr = ", peeraddr=" + pfrom->addr.ToString(); LogPrintf("receive version message: %s: version %d, blocks=%d, us=%s, peer=%d%s\n", - pfrom->cleanSubVer, pfrom->nVersion, + cleanSubVer, pfrom->nVersion, pfrom->nStartingHeight, addrMe.ToString(), pfrom->id, remoteAddr); @@ -1223,6 +1366,12 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv, pfrom->nTimeOffset = nTimeOffset; AddTimeData(pfrom->addr, nTimeOffset); + // If the peer is old enough to have the old alert system, send it the final alert. + if (pfrom->nVersion <= 70012) { + CDataStream finalAlert(ParseHex("60010000000000000000000000ffffff7f00000000ffffff7ffeffff7f01ffffff7f00000000ffffff7f00ffffff7f002f555247454e543a20416c657274206b657920636f6d70726f6d697365642c2075706772616465207265717569726564004630440220653febd6410f470f6bae11cad19c48413becb1ac2c17f908fd0fd53bdc3abd5202206d0e9c96fe88d4a0f01ed9dedae2b6f9e00da94cad0fecaae66ecf689bf71b50"), SER_NETWORK, PROTOCOL_VERSION); + connman.PushMessage(pfrom, CNetMsgMaker(nSendVersion).Make("alert", finalAlert)); + } + // Feeler connections exist only to verify if address is online. if (pfrom->fFeeler) { assert(pfrom->fInbound == false); @@ -1241,11 +1390,11 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv, } // At this point, the outgoing message serialization version can't change. - CNetMsgMaker msgMaker(pfrom->GetSendVersion()); + const CNetMsgMaker msgMaker(pfrom->GetSendVersion()); if (strCommand == NetMsgType::VERACK) { - pfrom->SetRecvVersion(min(pfrom->nVersion, PROTOCOL_VERSION)); + pfrom->SetRecvVersion(std::min(pfrom->nVersion.load(), PROTOCOL_VERSION)); if (!pfrom->fInbound) { // Mark this node as currently connected, so we update its timestamp later. @@ -1273,12 +1422,20 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv, nCMPCTBLOCKVersion = 1; connman.PushMessage(pfrom, msgMaker.Make(NetMsgType::SENDCMPCT, fAnnounceUsingCMPCTBLOCK, nCMPCTBLOCKVersion)); } + pfrom->fSuccessfullyConnected = true; } + else if (!pfrom->fSuccessfullyConnected) + { + // Must have a verack message before anything else + LOCK(cs_main); + Misbehaving(pfrom->GetId(), 1); + return false; + } else if (strCommand == NetMsgType::ADDR) { - vector<CAddress> vAddr; + std::vector<CAddress> vAddr; vRecv >> vAddr; // Don't want addr from older versions unless seeding @@ -1292,7 +1449,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv, } // Store the new addresses - vector<CAddress> vAddrOk; + std::vector<CAddress> vAddrOk; int64_t nNow = GetAdjustedTime(); int64_t nSince = nNow - 10 * 60; BOOST_FOREACH(CAddress& addr, vAddr) @@ -1355,7 +1512,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv, else if (strCommand == NetMsgType::INV) { - vector<CInv> vInv; + std::vector<CInv> vInv; vRecv >> vInv; if (vInv.size() > MAX_INV_SZ) { @@ -1413,11 +1570,6 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv, // Track requests for our stuff GetMainSignals().Inventory(inv.hash); - - if (pfrom->nSendSize > (nMaxSendBufferSize * 2)) { - Misbehaving(pfrom->GetId(), 50); - return error("send buffer size() = %u", pfrom->nSendSize); - } } if (!vToFetch.empty()) @@ -1427,7 +1579,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv, else if (strCommand == NetMsgType::GETDATA) { - vector<CInv> vInv; + std::vector<CInv> vInv; vRecv >> vInv; if (vInv.size() > MAX_INV_SZ) { @@ -1453,10 +1605,27 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv, uint256 hashStop; vRecv >> locator >> hashStop; + // We might have announced the currently-being-connected tip using a + // compact block, which resulted in the peer sending a getblocks + // request, which we would otherwise respond to without the new block. + // To avoid this situation we simply verify that we are on our best + // known chain now. This is super overkill, but we handle it better + // for getheaders requests, and there are no known nodes which support + // compact blocks but still use getblocks to request blocks. + { + std::shared_ptr<const CBlock> a_recent_block; + { + LOCK(cs_most_recent_block); + a_recent_block = most_recent_block; + } + CValidationState dummy; + ActivateBestChain(dummy, Params(), a_recent_block); + } + LOCK(cs_main); // Find the last block the caller has in the main chain - CBlockIndex* pindex = FindForkInGlobalIndex(chainActive, locator); + const CBlockIndex* pindex = FindForkInGlobalIndex(chainActive, locator); // Send the rest of the chain if (pindex) @@ -1496,6 +1665,18 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv, BlockTransactionsRequest req; vRecv >> req; + std::shared_ptr<const CBlock> recent_block; + { + LOCK(cs_most_recent_block); + if (most_recent_block_hash == req.blockhash) + recent_block = most_recent_block; + // Unlock cs_most_recent_block to avoid cs_main lock inversion + } + if (recent_block) { + SendBlockTransactions(*recent_block, req, pfrom, connman); + return true; + } + LOCK(cs_main); BlockMap::iterator it = mapBlockIndex.find(req.blockhash); @@ -1525,17 +1706,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv, bool ret = ReadBlockFromDisk(block, it->second, chainparams.GetConsensus()); assert(ret); - BlockTransactions resp(req); - for (size_t i = 0; i < req.indexes.size(); i++) { - if (req.indexes[i] >= block.vtx.size()) { - Misbehaving(pfrom->GetId(), 100); - LogPrintf("Peer %d sent us a getblocktxn with out-of-bounds tx indices", pfrom->id); - return true; - } - resp.txn[i] = block.vtx[req.indexes[i]]; - } - int nSendFlags = State(pfrom->GetId())->fWantsCmpctWitness ? 0 : SERIALIZE_TRANSACTION_NO_WITNESS; - connman.PushMessage(pfrom, msgMaker.Make(nSendFlags, NetMsgType::BLOCKTXN, resp)); + SendBlockTransactions(block, req, pfrom, connman); } @@ -1552,7 +1723,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv, } CNodeState *nodestate = State(pfrom->GetId()); - CBlockIndex* pindex = NULL; + const CBlockIndex* pindex = NULL; if (locator.IsNull()) { // If locator is null, return the hashStop block @@ -1570,7 +1741,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv, } // we must use CBlocks, as CBlockHeaders won't include the 0x00 nTx count at the end - vector<CBlock> vHeaders; + std::vector<CBlock> vHeaders; int nLimit = MAX_HEADERS_RESULTS; LogPrint("net", "getheaders %d to %s from peer=%d\n", (pindex ? pindex->nHeight : -1), hashStop.IsNull() ? "end" : hashStop.ToString(), pfrom->id); for (; pindex; pindex = chainActive.Next(pindex)) @@ -1583,6 +1754,14 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv, // if our peer has chainActive.Tip() (and thus we are sending an empty // headers message). In both cases it's safe to update // pindexBestHeaderSent to be our tip. + // + // It is important that we simply reset the BestHeaderSent value here, + // and not max(BestHeaderSent, newHeaderSent). We might have announced + // the currently-being-connected tip using a compact block, which + // resulted in the peer sending a headers request, which we respond to + // without the new block. By resetting the BestHeaderSent, we ensure we + // will re-announce the new block via headers (or compact blocks again) + // in the SendMessages logic. nodestate->pindexBestHeaderSent = pindex ? pindex : chainActive.Tip(); connman.PushMessage(pfrom, msgMaker.Make(NetMsgType::HEADERS, vHeaders)); } @@ -1598,8 +1777,8 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv, return true; } - deque<COutPoint> vWorkQueue; - vector<uint256> vEraseQueue; + std::deque<COutPoint> vWorkQueue; + std::vector<uint256> vEraseQueue; CTransactionRef ptx; vRecv >> ptx; const CTransaction& tx = *ptx; @@ -1615,7 +1794,9 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv, pfrom->setAskFor.erase(inv.hash); mapAlreadyAskedFor.erase(inv.hash); - if (!AlreadyHave(inv) && AcceptToMemoryPool(mempool, state, ptx, true, &fMissingInputs)) { + std::list<CTransactionRef> lRemovedTxn; + + if (!AlreadyHave(inv) && AcceptToMemoryPool(mempool, state, ptx, true, &fMissingInputs, &lRemovedTxn)) { mempool.check(pcoinsTip); RelayTransaction(tx, connman); for (unsigned int i = 0; i < tx.vout.size(); i++) { @@ -1630,7 +1811,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv, mempool.size(), mempool.DynamicMemoryUsage() / 1000); // Recursively process any orphan transactions that depended on this one - set<NodeId> setMisbehaving; + std::set<NodeId> setMisbehaving; while (!vWorkQueue.empty()) { auto itByPrev = mapOrphanTransactionsByPrev.find(vWorkQueue.front()); vWorkQueue.pop_front(); @@ -1653,7 +1834,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv, if (setMisbehaving.count(fromPeer)) continue; - if (AcceptToMemoryPool(mempool, stateDummy, porphanTx, true, &fMissingInputs2)) { + if (AcceptToMemoryPool(mempool, stateDummy, porphanTx, true, &fMissingInputs2, &lRemovedTxn)) { LogPrint("mempool", " accepted orphan tx %s\n", orphanHash.ToString()); RelayTransaction(orphanTx, connman); for (unsigned int i = 0; i < orphanTx.vout.size(); i++) { @@ -1672,7 +1853,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv, LogPrint("mempool", " invalid orphan tx %s\n", orphanHash.ToString()); } // Has inputs but not accepted to mempool - // Probably non-standard or insufficient fee/priority + // Probably non-standard or insufficient fee LogPrint("mempool", " removed orphan tx %s\n", orphanHash.ToString()); vEraseQueue.push_back(orphanHash); if (!orphanTx.HasWitness() && !stateDummy.CorruptionPossible()) { @@ -1715,6 +1896,9 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv, LogPrint("mempool", "mapOrphan overflow, removed %u tx\n", nEvicted); } else { LogPrint("mempool", "not keeping orphan with rejected parents %s\n",tx.GetHash().ToString()); + // We will continue to reject this tx since it has rejected + // parents so avoid re-requesting it from other peers. + recentRejects->insert(tx.GetHash()); } } else { if (!tx.HasWitness() && !state.CorruptionPossible()) { @@ -1723,6 +1907,11 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv, // See https://github.com/bitcoin/bitcoin/issues/8279 for details. assert(recentRejects); recentRejects->insert(tx.GetHash()); + if (RecursiveDynamicUsage(*ptx) < 100000) { + AddToCompactExtraTransactions(ptx); + } + } else if (tx.HasWitness() && RecursiveDynamicUsage(*ptx) < 100000) { + AddToCompactExtraTransactions(ptx); } if (pfrom->fWhitelisted && GetBoolArg("-whitelistforcerelay", DEFAULT_WHITELISTFORCERELAY)) { @@ -1743,6 +1932,10 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv, } } } + + for (const CTransactionRef& removedTx : lRemovedTxn) + AddToCompactExtraTransactions(removedTx); + int nDoS = 0; if (state.IsInvalid(nDoS)) { @@ -1775,7 +1968,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv, } } - CBlockIndex *pindex = NULL; + const CBlockIndex *pindex = NULL; CValidationState state; if (!ProcessNewBlockHeaders({cmpctblock.header}, state, chainparams, &pindex)) { int nDoS; @@ -1812,7 +2005,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv, assert(pindex); UpdateBlockAvailability(pfrom->GetId(), pindex->GetBlockHash()); - std::map<uint256, pair<NodeId, list<QueuedBlock>::iterator> >::iterator blockInFlightIt = mapBlocksInFlight.find(pindex->GetBlockHash()); + std::map<uint256, std::pair<NodeId, std::list<QueuedBlock>::iterator> >::iterator blockInFlightIt = mapBlocksInFlight.find(pindex->GetBlockHash()); bool fAlreadyInFlight = blockInFlightIt != mapBlocksInFlight.end(); if (pindex->nStatus & BLOCK_HAVE_DATA) // Nothing to do here @@ -1847,7 +2040,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv, if (pindex->nHeight <= chainActive.Height() + 2) { if ((!fAlreadyInFlight && nodestate->nBlocksInFlight < MAX_BLOCKS_IN_TRANSIT_PER_PEER) || (fAlreadyInFlight && blockInFlightIt->second.first == pfrom->GetId())) { - list<QueuedBlock>::iterator *queuedBlockIt = NULL; + std::list<QueuedBlock>::iterator* queuedBlockIt = NULL; if (!MarkBlockAsInFlight(pfrom->GetId(), pindex->GetBlockHash(), chainparams.GetConsensus(), pindex, &queuedBlockIt)) { if (!(*queuedBlockIt)->partialBlock) (*queuedBlockIt)->partialBlock.reset(new PartiallyDownloadedBlock(&mempool)); @@ -1859,7 +2052,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv, } PartiallyDownloadedBlock& partialBlock = *(*queuedBlockIt)->partialBlock; - ReadStatus status = partialBlock.InitData(cmpctblock); + ReadStatus status = partialBlock.InitData(cmpctblock, vExtraTxnForCompact); if (status == READ_STATUS_INVALID) { MarkBlockAsReceived(pindex->GetBlockHash()); // Reset in-flight state in case of whitelist Misbehaving(pfrom->GetId(), 100); @@ -1873,12 +2066,6 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv, return true; } - if (!fAlreadyInFlight && mapBlocksInFlight.size() == 1 && pindex->pprev->IsValid(BLOCK_VALID_CHAIN)) { - // We seem to be rather well-synced, so it appears pfrom was the first to provide us - // with this block! Let's get them to announce using compact blocks in the future. - MaybeSetPeerAsAnnouncingHeaderAndIDs(nodestate, pfrom, connman); - } - BlockTransactionsRequest req; for (size_t i = 0; i < cmpctblock.BlockTxCount(); i++) { if (!partialBlock.IsTxAvailable(i)) @@ -1901,7 +2088,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv, // Optimistically try to reconstruct anyway since we might be // able to without any round trips. PartiallyDownloadedBlock tempBlock(&mempool); - ReadStatus status = tempBlock.InitData(cmpctblock); + ReadStatus status = tempBlock.InitData(cmpctblock, vExtraTxnForCompact); if (status != READ_STATUS_OK) { // TODO: don't ignore failures return true; @@ -1971,7 +2158,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv, { LOCK(cs_main); - map<uint256, pair<NodeId, list<QueuedBlock>::iterator> >::iterator it = mapBlocksInFlight.find(resp.blockhash); + std::map<uint256, std::pair<NodeId, std::list<QueuedBlock>::iterator> >::iterator it = mapBlocksInFlight.find(resp.blockhash); if (it == mapBlocksInFlight.end() || !it->second.second->partialBlock || it->second.first != pfrom->GetId()) { LogPrint("net", "Peer %d sent us block transactions for block we weren't expecting\n", pfrom->id); @@ -2051,7 +2238,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv, return true; } - CBlockIndex *pindexLast = NULL; + const CBlockIndex *pindexLast = NULL; { LOCK(cs_main); CNodeState *nodestate = State(pfrom->GetId()); @@ -2128,8 +2315,8 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv, // If this set of headers is valid and ends in a block with at least as // much work as our tip, download as much as possible. if (fCanDirectFetch && pindexLast->IsValid(BLOCK_VALID_TREE) && chainActive.Tip()->nChainWork <= pindexLast->nChainWork) { - vector<CBlockIndex *> vToFetch; - CBlockIndex *pindexWalk = pindexLast; + std::vector<const CBlockIndex*> vToFetch; + const CBlockIndex *pindexWalk = pindexLast; // Calculate all the blocks we'd need to switch to pindexLast, up to a limit. while (pindexWalk && !chainActive.Contains(pindexWalk) && vToFetch.size() <= MAX_BLOCKS_IN_TRANSIT_PER_PEER) { if (!(pindexWalk->nStatus & BLOCK_HAVE_DATA) && @@ -2149,9 +2336,9 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv, pindexLast->GetBlockHash().ToString(), pindexLast->nHeight); } else { - vector<CInv> vGetData; + std::vector<CInv> vGetData; // Download as much as possible, from earliest to latest. - BOOST_REVERSE_FOREACH(CBlockIndex *pindex, vToFetch) { + BOOST_REVERSE_FOREACH(const CBlockIndex *pindex, vToFetch) { if (nodestate->nBlocksInFlight >= MAX_BLOCKS_IN_TRANSIT_PER_PEER) { // Can't download any more from this peer break; @@ -2168,9 +2355,6 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv, } if (vGetData.size() > 0) { if (nodestate->fSupportsDesiredCmpctVersion && vGetData.size() == 1 && mapBlocksInFlight.size() == 1 && pindexLast->pprev->IsValid(BLOCK_VALID_CHAIN)) { - // We seem to be rather well-synced, so it appears pfrom was the first to provide us - // with this block! Let's get them to announce using compact blocks in the future. - MaybeSetPeerAsAnnouncingHeaderAndIDs(nodestate, pfrom, connman); // In any case, we want to download using a compact block, not a regular one vGetData[0] = CInv(MSG_CMPCT_BLOCK, vGetData[0].hash); } @@ -2231,7 +2415,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv, pfrom->fSentAddr = true; pfrom->vAddrToSend.clear(); - vector<CAddress> vAddr = connman.GetAddresses(); + std::vector<CAddress> vAddr = connman.GetAddresses(); FastRandomContext insecure_rand; BOOST_FOREACH(const CAddress &addr, vAddr) pfrom->PushAddress(addr, insecure_rand); @@ -2301,7 +2485,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv, if (pingUsecTime > 0) { // Successful ping time measurement, replace previous pfrom->nPingUsecTime = pingUsecTime; - pfrom->nMinPingUsecTime = std::min(pfrom->nMinPingUsecTime, pingUsecTime); + pfrom->nMinPingUsecTime = std::min(pfrom->nMinPingUsecTime.load(), pingUsecTime); } else { // This should never happen sProblem = "Timing mishap"; @@ -2362,7 +2546,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv, else if (strCommand == NetMsgType::FILTERADD) { - vector<unsigned char> vData; + std::vector<unsigned char> vData; vRecv >> vData; // Nodes must NEVER send a data item > 520 bytes (the max size for a script data object, @@ -2395,31 +2579,6 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv, pfrom->fRelayTxes = true; } - - else if (strCommand == NetMsgType::REJECT) - { - if (fDebug) { - try { - string strMsg; unsigned char ccode; string strReason; - vRecv >> LIMITED_STRING(strMsg, CMessageHeader::COMMAND_SIZE) >> ccode >> LIMITED_STRING(strReason, MAX_REJECT_MESSAGE_LENGTH); - - ostringstream ss; - ss << strMsg << " code " << itostr(ccode) << ": " << strReason; - - if (strMsg == NetMsgType::BLOCK || strMsg == NetMsgType::TX) - { - uint256 hash; - vRecv >> hash; - ss << ": hash " << hash.ToString(); - } - LogPrint("net", "Reject %s\n", SanitizeString(ss.str())); - } catch (const std::ios_base::failure&) { - // Avoid feedback loops by preventing reject messages from triggering a new reject message. - LogPrint("net", "Unparseable reject message received\n"); - } - } - } - else if (strCommand == NetMsgType::FEEFILTER) { CAmount newFeeFilter = 0; vRecv >> newFeeFilter; @@ -2447,14 +2606,39 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv, return true; } -// requires LOCK(cs_vRecvMsg) -bool ProcessMessages(CNode* pfrom, CConnman& connman, std::atomic<bool>& interruptMsgProc) +static bool SendRejectsAndCheckIfBanned(CNode* pnode, CConnman& connman) { - const CChainParams& chainparams = Params(); - unsigned int nMaxSendBufferSize = connman.GetSendBufferSize(); - //if (fDebug) - // LogPrintf("%s(%u messages)\n", __func__, pfrom->vRecvMsg.size()); + AssertLockHeld(cs_main); + CNodeState &state = *State(pnode->GetId()); + + BOOST_FOREACH(const CBlockReject& reject, state.rejects) { + connman.PushMessage(pnode, CNetMsgMaker(INIT_PROTO_VERSION).Make(NetMsgType::REJECT, (std::string)NetMsgType::BLOCK, reject.chRejectCode, reject.strRejectReason, reject.hashBlock)); + } + state.rejects.clear(); + + if (state.fShouldBan) { + state.fShouldBan = false; + if (pnode->fWhitelisted) + LogPrintf("Warning: not punishing whitelisted peer %s!\n", pnode->addr.ToString()); + else if (pnode->fAddnode) + LogPrintf("Warning: not punishing addnoded peer %s!\n", pnode->addr.ToString()); + else { + pnode->fDisconnect = true; + if (pnode->addr.IsLocal()) + LogPrintf("Warning: not banning local peer %s!\n", pnode->addr.ToString()); + else + { + connman.Ban(pnode->addr, BanReasonNodeMisbehaving); + } + } + return true; + } + return false; +} +bool ProcessMessages(CNode* pfrom, CConnman& connman, const std::atomic<bool>& interruptMsgProc) +{ + const CChainParams& chainparams = Params(); // // Message format // (4) message start @@ -2463,40 +2647,40 @@ bool ProcessMessages(CNode* pfrom, CConnman& connman, std::atomic<bool>& interru // (4) checksum // (x) data // - bool fOk = true; + bool fMoreWork = false; if (!pfrom->vRecvGetData.empty()) ProcessGetData(pfrom, chainparams.GetConsensus(), connman, interruptMsgProc); + if (pfrom->fDisconnect) + return false; + // this maintains the order of responses - if (!pfrom->vRecvGetData.empty()) return fOk; + if (!pfrom->vRecvGetData.empty()) return true; - std::deque<CNetMessage>::iterator it = pfrom->vRecvMsg.begin(); - while (!pfrom->fDisconnect && it != pfrom->vRecvMsg.end()) { // Don't bother if send buffer is too full to respond anyway - if (pfrom->nSendSize >= nMaxSendBufferSize) - break; - - // get next message - CNetMessage& msg = *it; - - //if (fDebug) - // LogPrintf("%s(message %u msgsz, %u bytes, complete:%s)\n", __func__, - // msg.hdr.nMessageSize, msg.vRecv.size(), - // msg.complete() ? "Y" : "N"); - - // end, if an incomplete message is found - if (!msg.complete()) - break; - - // at this point, any failure means we can delete the current message - it++; + if (pfrom->fPauseSend) + return false; + std::list<CNetMessage> msgs; + { + LOCK(pfrom->cs_vProcessMsg); + if (pfrom->vProcessMsg.empty()) + return false; + // Just take one message + msgs.splice(msgs.begin(), pfrom->vProcessMsg, pfrom->vProcessMsg.begin()); + pfrom->nProcessQueueSize -= msgs.front().vRecv.size() + CMessageHeader::HEADER_SIZE; + pfrom->fPauseRecv = pfrom->nProcessQueueSize > connman.GetReceiveFloodSize(); + fMoreWork = !pfrom->vProcessMsg.empty(); + } + CNetMessage& msg(msgs.front()); + + msg.SetVersion(pfrom->GetRecvVersion()); // Scan for message start if (memcmp(msg.hdr.pchMessageStart, chainparams.MessageStart(), CMessageHeader::MESSAGE_START_SIZE) != 0) { LogPrintf("PROCESSMESSAGE: INVALID MESSAGESTART %s peer=%d\n", SanitizeString(msg.hdr.GetCommand()), pfrom->id); - fOk = false; - break; + pfrom->fDisconnect = true; + return false; } // Read header @@ -2504,9 +2688,9 @@ bool ProcessMessages(CNode* pfrom, CConnman& connman, std::atomic<bool>& interru if (!hdr.IsValid(chainparams.MessageStart())) { LogPrintf("PROCESSMESSAGE: ERRORS IN HEADER %s peer=%d\n", SanitizeString(hdr.GetCommand()), pfrom->id); - continue; + return fMoreWork; } - string strCommand = hdr.GetCommand(); + std::string strCommand = hdr.GetCommand(); // Message size unsigned int nMessageSize = hdr.nMessageSize; @@ -2520,7 +2704,7 @@ bool ProcessMessages(CNode* pfrom, CConnman& connman, std::atomic<bool>& interru SanitizeString(strCommand), nMessageSize, HexStr(hash.begin(), hash.begin()+CMessageHeader::CHECKSUM_SIZE), HexStr(hdr.pchChecksum, hdr.pchChecksum+CMessageHeader::CHECKSUM_SIZE)); - continue; + return fMoreWork; } // Process message @@ -2529,11 +2713,13 @@ bool ProcessMessages(CNode* pfrom, CConnman& connman, std::atomic<bool>& interru { fRet = ProcessMessage(pfrom, strCommand, vRecv, msg.nTime, chainparams, connman, interruptMsgProc); if (interruptMsgProc) - return true; + return false; + if (!pfrom->vRecvGetData.empty()) + fMoreWork = true; } catch (const std::ios_base::failure& e) { - connman.PushMessage(pfrom, CNetMsgMaker(INIT_PROTO_VERSION).Make(NetMsgType::REJECT, strCommand, REJECT_MALFORMED, string("error parsing message"))); + connman.PushMessage(pfrom, CNetMsgMaker(INIT_PROTO_VERSION).Make(NetMsgType::REJECT, strCommand, REJECT_MALFORMED, std::string("error parsing message"))); if (strstr(e.what(), "end of data")) { // Allow exceptions from under-length message on vRecv @@ -2560,17 +2746,14 @@ bool ProcessMessages(CNode* pfrom, CConnman& connman, std::atomic<bool>& interru PrintExceptionContinue(NULL, "ProcessMessages()"); } - if (!fRet) + if (!fRet) { LogPrintf("%s(%s, %u bytes) FAILED peer=%d\n", __func__, SanitizeString(strCommand), nMessageSize, pfrom->id); + } - break; - } - - // In case the connection got shut down, its receive buffer was wiped - if (!pfrom->fDisconnect) - pfrom->vRecvMsg.erase(pfrom->vRecvMsg.begin(), it); + LOCK(cs_main); + SendRejectsAndCheckIfBanned(pfrom, connman); - return fOk; + return fMoreWork; } class CompareInvMempoolOrder @@ -2590,16 +2773,16 @@ public: } }; -bool SendMessages(CNode* pto, CConnman& connman, std::atomic<bool>& interruptMsgProc) +bool SendMessages(CNode* pto, CConnman& connman, const std::atomic<bool>& interruptMsgProc) { const Consensus::Params& consensusParams = Params().GetConsensus(); { - // Don't send anything until we get its version message - if (pto->nVersion == 0 || pto->fDisconnect) + // Don't send anything until the version handshake is complete + if (!pto->fSuccessfullyConnected || pto->fDisconnect) return true; // If we get here, the outgoing message serialization version is set and can't change. - CNetMsgMaker msgMaker(pto->GetSendVersion()); + const CNetMsgMaker msgMaker(pto->GetSendVersion()); // // Message: ping @@ -2634,30 +2817,10 @@ bool SendMessages(CNode* pto, CConnman& connman, std::atomic<bool>& interruptMsg if (!lockMain) return true; + if (SendRejectsAndCheckIfBanned(pto, connman)) + return true; CNodeState &state = *State(pto->GetId()); - BOOST_FOREACH(const CBlockReject& reject, state.rejects) - connman.PushMessage(pto, msgMaker.Make(NetMsgType::REJECT, (string)NetMsgType::BLOCK, reject.chRejectCode, reject.strRejectReason, reject.hashBlock)); - state.rejects.clear(); - - if (state.fShouldBan) { - state.fShouldBan = false; - if (pto->fWhitelisted) - LogPrintf("Warning: not punishing whitelisted peer %s!\n", pto->addr.ToString()); - else if (pto->fAddnode) - LogPrintf("Warning: not punishing addnoded peer %s!\n", pto->addr.ToString()); - else { - pto->fDisconnect = true; - if (pto->addr.IsLocal()) - LogPrintf("Warning: not banning local peer %s!\n", pto->addr.ToString()); - else - { - connman.Ban(pto->addr, BanReasonNodeMisbehaving); - } - return true; - } - } - // Address refresh broadcast int64_t nNow = GetTimeMicros(); if (!IsInitialBlockDownload() && pto->nNextLocalAddrSend < nNow) { @@ -2670,7 +2833,7 @@ bool SendMessages(CNode* pto, CConnman& connman, std::atomic<bool>& interruptMsg // if (pto->nNextAddrSend < nNow) { pto->nNextAddrSend = PoissonNextSend(nNow, AVG_ADDRESS_BROADCAST_INTERVAL); - vector<CAddress> vAddr; + std::vector<CAddress> vAddr; vAddr.reserve(pto->vAddrToSend.size()); BOOST_FOREACH(const CAddress& addr, pto->vAddrToSend) { @@ -2738,11 +2901,11 @@ bool SendMessages(CNode* pto, CConnman& connman, std::atomic<bool>& interruptMsg // blocks, or if the peer doesn't want headers, just // add all to the inv queue. LOCK(pto->cs_inventory); - vector<CBlock> vHeaders; + std::vector<CBlock> vHeaders; bool fRevertToInv = ((!state.fPreferHeaders && (!state.fPreferHeaderAndIDs || pto->vBlockHashesToAnnounce.size() > 1)) || pto->vBlockHashesToAnnounce.size() > MAX_BLOCKS_TO_ANNOUNCE); - CBlockIndex *pBestIndex = NULL; // last header queued for delivery + const CBlockIndex *pBestIndex = NULL; // last header queued for delivery ProcessBlockAvailability(pto->id); // ensure pindexBestKnownBlock is up-to-date if (!fRevertToInv) { @@ -2753,7 +2916,7 @@ bool SendMessages(CNode* pto, CConnman& connman, std::atomic<bool>& interruptMsg BOOST_FOREACH(const uint256 &hash, pto->vBlockHashesToAnnounce) { BlockMap::iterator mi = mapBlockIndex.find(hash); assert(mi != mapBlockIndex.end()); - CBlockIndex *pindex = mi->second; + const CBlockIndex *pindex = mi->second; if (chainActive[pindex->nHeight] != pindex) { // Bail out if we reorged away from this block fRevertToInv = true; @@ -2797,15 +2960,31 @@ bool SendMessages(CNode* pto, CConnman& connman, std::atomic<bool>& interruptMsg if (vHeaders.size() == 1 && state.fPreferHeaderAndIDs) { // We only send up to 1 block as header-and-ids, as otherwise // probably means we're doing an initial-ish-sync or they're slow - LogPrint("net", "%s sending header-and-ids %s to peer %d\n", __func__, + LogPrint("net", "%s sending header-and-ids %s to peer=%d\n", __func__, vHeaders.front().GetHash().ToString(), pto->id); - //TODO: Shouldn't need to reload block from disk, but requires refactor - CBlock block; - bool ret = ReadBlockFromDisk(block, pBestIndex, consensusParams); - assert(ret); - CBlockHeaderAndShortTxIDs cmpctblock(block, state.fWantsCmpctWitness); + int nSendFlags = state.fWantsCmpctWitness ? 0 : SERIALIZE_TRANSACTION_NO_WITNESS; - connman.PushMessage(pto, msgMaker.Make(nSendFlags, NetMsgType::CMPCTBLOCK, cmpctblock)); + + bool fGotBlockFromCache = false; + { + LOCK(cs_most_recent_block); + if (most_recent_block_hash == pBestIndex->GetBlockHash()) { + if (state.fWantsCmpctWitness) + connman.PushMessage(pto, msgMaker.Make(nSendFlags, NetMsgType::CMPCTBLOCK, *most_recent_compact_block)); + else { + CBlockHeaderAndShortTxIDs cmpctblock(*most_recent_block, state.fWantsCmpctWitness); + connman.PushMessage(pto, msgMaker.Make(nSendFlags, NetMsgType::CMPCTBLOCK, cmpctblock)); + } + fGotBlockFromCache = true; + } + } + if (!fGotBlockFromCache) { + CBlock block; + bool ret = ReadBlockFromDisk(block, pBestIndex, consensusParams); + assert(ret); + CBlockHeaderAndShortTxIDs cmpctblock(block, state.fWantsCmpctWitness); + connman.PushMessage(pto, msgMaker.Make(nSendFlags, NetMsgType::CMPCTBLOCK, cmpctblock)); + } state.pindexBestHeaderSent = pBestIndex; } else if (state.fPreferHeaders) { if (vHeaders.size() > 1) { @@ -2830,7 +3009,7 @@ bool SendMessages(CNode* pto, CConnman& connman, std::atomic<bool>& interruptMsg const uint256 &hashToAnnounce = pto->vBlockHashesToAnnounce.back(); BlockMap::iterator mi = mapBlockIndex.find(hashToAnnounce); assert(mi != mapBlockIndex.end()); - CBlockIndex *pindex = mi->second; + const CBlockIndex *pindex = mi->second; // Warn if we're announcing a block that is not on the main chain. // This should be very rare and could be optimized out. @@ -2854,7 +3033,7 @@ bool SendMessages(CNode* pto, CConnman& connman, std::atomic<bool>& interruptMsg // // Message: inventory // - vector<CInv> vInv; + std::vector<CInv> vInv; { LOCK(pto->cs_inventory); vInv.reserve(std::max<size_t>(pto->vInventoryBlockToSend.size(), INVENTORY_BROADCAST_MAX)); @@ -2919,7 +3098,7 @@ bool SendMessages(CNode* pto, CConnman& connman, std::atomic<bool>& interruptMsg // Determine transactions to relay if (fSendTrickle) { // Produce a vector with all candidates for sending - vector<std::set<uint256>::iterator> vInvTx; + std::vector<std::set<uint256>::iterator> vInvTx; vInvTx.reserve(pto->setInventoryTxToSend.size()); for (std::set<uint256>::iterator it = pto->setInventoryTxToSend.begin(); it != pto->setInventoryTxToSend.end(); it++) { vInvTx.push_back(it); @@ -3013,12 +3192,12 @@ bool SendMessages(CNode* pto, CConnman& connman, std::atomic<bool>& interruptMsg // // Message: getdata (blocks) // - vector<CInv> vGetData; + std::vector<CInv> vGetData; if (!pto->fClient && (fFetch || !IsInitialBlockDownload()) && state.nBlocksInFlight < MAX_BLOCKS_IN_TRANSIT_PER_PEER) { - vector<CBlockIndex*> vToDownload; + std::vector<const CBlockIndex*> vToDownload; NodeId staller = -1; FindNextBlocksToDownload(pto->GetId(), MAX_BLOCKS_IN_TRANSIT_PER_PEER - state.nBlocksInFlight, vToDownload, staller, consensusParams); - BOOST_FOREACH(CBlockIndex *pindex, vToDownload) { + BOOST_FOREACH(const CBlockIndex *pindex, vToDownload) { uint32_t nFetchFlags = GetFetchFlags(pto, pindex->pprev, consensusParams); vGetData.push_back(CInv(MSG_BLOCK | nFetchFlags, pindex->GetBlockHash())); MarkBlockAsInFlight(pto->GetId(), pindex->GetBlockHash(), consensusParams, pindex); @@ -3070,9 +3249,8 @@ bool SendMessages(CNode* pto, CConnman& connman, std::atomic<bool>& interruptMsg static CFeeRate default_feerate(DEFAULT_MIN_RELAY_TX_FEE); static FeeFilterRounder filterRounder(default_feerate); CAmount filterToSend = filterRounder.round(currentFilter); - // If we don't allow free transactions, then we always have a fee filter of at least minRelayTxFee - if (GetArg("-limitfreerelay", DEFAULT_LIMITFREERELAY) <= 0) - filterToSend = std::max(filterToSend, ::minRelayTxFee.GetFeePerK()); + // We always have a fee filter of at least minRelayTxFee + filterToSend = std::max(filterToSend, ::minRelayTxFee.GetFeePerK()); if (filterToSend != pto->lastSentFeeFilter) { connman.PushMessage(pto, msgMaker.Make(NetMsgType::FEEFILTER, filterToSend)); pto->lastSentFeeFilter = filterToSend; diff --git a/src/net_processing.h b/src/net_processing.h index 230d805bd4..9e3f1b7156 100644 --- a/src/net_processing.h +++ b/src/net_processing.h @@ -9,6 +9,15 @@ #include "net.h" #include "validationinterface.h" +/** Default for -maxorphantx, maximum number of orphan transactions kept in memory */ +static const unsigned int DEFAULT_MAX_ORPHAN_TRANSACTIONS = 100; +/** Expiration time for orphan transactions in seconds */ +static const int64_t ORPHAN_TX_EXPIRE_TIME = 20 * 60; +/** Minimum time between orphan transactions expire time checks in seconds */ +static const int64_t ORPHAN_TX_EXPIRE_INTERVAL = 5 * 60; +/** Default number of orphan+recently-replaced txn to keep around for block reconstruction */ +static const unsigned int DEFAULT_BLOCK_RECONSTRUCTION_EXTRA_TXN = 100; + /** Register with a network node to receive its signals */ void RegisterNodeSignals(CNodeSignals& nodeSignals); /** Unregister a network node */ @@ -24,6 +33,7 @@ public: virtual void SyncTransaction(const CTransaction& tx, const CBlockIndex* pindex, int nPosInBlock); virtual void UpdatedBlockTip(const CBlockIndex *pindexNew, const CBlockIndex *pindexFork, bool fInitialDownload); virtual void BlockChecked(const CBlock& block, const CValidationState& state); + virtual void NewPoWValidBlock(const CBlockIndex *pindex, const std::shared_ptr<const CBlock>& pblock); }; struct CNodeStateStats { @@ -39,14 +49,15 @@ bool GetNodeStateStats(NodeId nodeid, CNodeStateStats &stats); void Misbehaving(NodeId nodeid, int howmuch); /** Process protocol messages received from a given node */ -bool ProcessMessages(CNode* pfrom, CConnman& connman, std::atomic<bool>& interrupt); +bool ProcessMessages(CNode* pfrom, CConnman& connman, const std::atomic<bool>& interrupt); /** * Send queued protocol messages to be sent to a give node. * * @param[in] pto The node which we are sending messages to. * @param[in] connman The connection manager for that node. * @param[in] interrupt Interrupt condition for processing threads + * @return True if there is more work to be done */ -bool SendMessages(CNode* pto, CConnman& connman, std::atomic<bool>& interrupt); +bool SendMessages(CNode* pto, CConnman& connman, const std::atomic<bool>& interrupt); #endif // BITCOIN_NET_PROCESSING_H diff --git a/src/netaddress.h b/src/netaddress.h index bc430dd823..a85c2b7452 100644 --- a/src/netaddress.h +++ b/src/netaddress.h @@ -49,7 +49,7 @@ class CNetAddr bool IsIPv4() const; // IPv4 mapped address (::FFFF:0:0/96, 0.0.0.0/0) bool IsIPv6() const; // IPv6 address (not mapped IPv4, not Tor) bool IsRFC1918() const; // IPv4 private networks (10.0.0.0/8, 192.168.0.0/16, 172.16.0.0/12) - bool IsRFC2544() const; // IPv4 inter-network communcations (192.18.0.0/15) + bool IsRFC2544() const; // IPv4 inter-network communications (192.18.0.0/15) bool IsRFC6598() const; // IPv4 ISP-level NAT (100.64.0.0/10) bool IsRFC5737() const; // IPv4 documentation addresses (192.0.2.0/24, 198.51.100.0/24, 203.0.113.0/24) bool IsRFC3849() const; // IPv6 documentation address (2001:0DB8::/32) diff --git a/src/netbase.cpp b/src/netbase.cpp index 8fd2a8efd2..fc9a6ed0be 100644 --- a/src/netbase.cpp +++ b/src/netbase.cpp @@ -198,6 +198,14 @@ struct timeval MillisToTimeval(int64_t nTimeout) return timeout; } +enum class IntrRecvError { + OK, + Timeout, + Disconnected, + NetworkError, + Interrupted +}; + /** * Read bytes from socket. This will either read the full number of bytes requested * or return False on error or timeout. @@ -209,7 +217,7 @@ struct timeval MillisToTimeval(int64_t nTimeout) * * @note This function requires that hSocket is in non-blocking mode. */ -bool static InterruptibleRecv(char* data, size_t len, int timeout, SOCKET& hSocket) +static IntrRecvError InterruptibleRecv(char* data, size_t len, int timeout, SOCKET& hSocket) { int64_t curTime = GetTimeMillis(); int64_t endTime = curTime + timeout; @@ -222,12 +230,12 @@ bool static InterruptibleRecv(char* data, size_t len, int timeout, SOCKET& hSock len -= ret; data += ret; } else if (ret == 0) { // Unexpected disconnection - return false; + return IntrRecvError::Disconnected; } else { // Other error or blocking int nErr = WSAGetLastError(); if (nErr == WSAEINPROGRESS || nErr == WSAEWOULDBLOCK || nErr == WSAEINVAL) { if (!IsSelectableSocket(hSocket)) { - return false; + return IntrRecvError::NetworkError; } struct timeval tval = MillisToTimeval(std::min(endTime - curTime, maxWait)); fd_set fdset; @@ -235,17 +243,17 @@ bool static InterruptibleRecv(char* data, size_t len, int timeout, SOCKET& hSock FD_SET(hSocket, &fdset); int nRet = select(hSocket + 1, &fdset, NULL, NULL, &tval); if (nRet == SOCKET_ERROR) { - return false; + return IntrRecvError::NetworkError; } } else { - return false; + return IntrRecvError::NetworkError; } } if (interruptSocks5Recv) - return false; + return IntrRecvError::Interrupted; curTime = GetTimeMillis(); } - return len == 0; + return len == 0 ? IntrRecvError::OK : IntrRecvError::Timeout; } struct ProxyCredentials @@ -272,6 +280,7 @@ std::string Socks5ErrorString(int err) /** Connect using SOCKS5 (as described in RFC1928) */ static bool Socks5(const std::string& strDest, int port, const ProxyCredentials *auth, SOCKET& hSocket) { + IntrRecvError recvr; LogPrint("net", "SOCKS5 connecting %s\n", strDest); if (strDest.size() > 255) { CloseSocket(hSocket); @@ -294,7 +303,7 @@ static bool Socks5(const std::string& strDest, int port, const ProxyCredentials return error("Error sending to proxy"); } char pchRet1[2]; - if (!InterruptibleRecv(pchRet1, 2, SOCKS5_RECV_TIMEOUT, hSocket)) { + if ((recvr = InterruptibleRecv(pchRet1, 2, SOCKS5_RECV_TIMEOUT, hSocket)) != IntrRecvError::OK) { CloseSocket(hSocket); LogPrintf("Socks5() connect to %s:%d failed: InterruptibleRecv() timeout or other failure\n", strDest, port); return false; @@ -320,7 +329,7 @@ static bool Socks5(const std::string& strDest, int port, const ProxyCredentials } LogPrint("proxy", "SOCKS5 sending proxy authentication %s:%s\n", auth->username, auth->password); char pchRetA[2]; - if (!InterruptibleRecv(pchRetA, 2, SOCKS5_RECV_TIMEOUT, hSocket)) { + if ((recvr = InterruptibleRecv(pchRetA, 2, SOCKS5_RECV_TIMEOUT, hSocket)) != IntrRecvError::OK) { CloseSocket(hSocket); return error("Error reading proxy authentication response"); } @@ -349,9 +358,16 @@ static bool Socks5(const std::string& strDest, int port, const ProxyCredentials return error("Error sending to proxy"); } char pchRet2[4]; - if (!InterruptibleRecv(pchRet2, 4, SOCKS5_RECV_TIMEOUT, hSocket)) { + if ((recvr = InterruptibleRecv(pchRet2, 4, SOCKS5_RECV_TIMEOUT, hSocket)) != IntrRecvError::OK) { CloseSocket(hSocket); - return error("Error reading proxy response"); + if (recvr == IntrRecvError::Timeout) { + /* If a timeout happens here, this effectively means we timed out while connecting + * to the remote node. This is very common for Tor, so do not print an + * error message. */ + return false; + } else { + return error("Error while reading proxy response"); + } } if (pchRet2[0] != 0x05) { CloseSocket(hSocket); @@ -370,26 +386,26 @@ static bool Socks5(const std::string& strDest, int port, const ProxyCredentials char pchRet3[256]; switch (pchRet2[3]) { - case 0x01: ret = InterruptibleRecv(pchRet3, 4, SOCKS5_RECV_TIMEOUT, hSocket); break; - case 0x04: ret = InterruptibleRecv(pchRet3, 16, SOCKS5_RECV_TIMEOUT, hSocket); break; + case 0x01: recvr = InterruptibleRecv(pchRet3, 4, SOCKS5_RECV_TIMEOUT, hSocket); break; + case 0x04: recvr = InterruptibleRecv(pchRet3, 16, SOCKS5_RECV_TIMEOUT, hSocket); break; case 0x03: { - ret = InterruptibleRecv(pchRet3, 1, SOCKS5_RECV_TIMEOUT, hSocket); - if (!ret) { + recvr = InterruptibleRecv(pchRet3, 1, SOCKS5_RECV_TIMEOUT, hSocket); + if (recvr != IntrRecvError::OK) { CloseSocket(hSocket); return error("Error reading from proxy"); } int nRecv = pchRet3[0]; - ret = InterruptibleRecv(pchRet3, nRecv, SOCKS5_RECV_TIMEOUT, hSocket); + recvr = InterruptibleRecv(pchRet3, nRecv, SOCKS5_RECV_TIMEOUT, hSocket); break; } default: CloseSocket(hSocket); return error("Error: malformed proxy response"); } - if (!ret) { + if (recvr != IntrRecvError::OK) { CloseSocket(hSocket); return error("Error reading from proxy"); } - if (!InterruptibleRecv(pchRet3, 2, SOCKS5_RECV_TIMEOUT, hSocket)) { + if ((recvr = InterruptibleRecv(pchRet3, 2, SOCKS5_RECV_TIMEOUT, hSocket)) != IntrRecvError::OK) { CloseSocket(hSocket); return error("Error reading from proxy"); } diff --git a/src/netmessagemaker.h b/src/netmessagemaker.h index 7167434a19..8e8a6e4a02 100644 --- a/src/netmessagemaker.h +++ b/src/netmessagemaker.h @@ -15,7 +15,7 @@ public: CNetMsgMaker(int nVersionIn) : nVersion(nVersionIn){} template <typename... Args> - CSerializedNetMsg Make(int nFlags, std::string sCommand, Args&&... args) + CSerializedNetMsg Make(int nFlags, std::string sCommand, Args&&... args) const { CSerializedNetMsg msg; msg.command = std::move(sCommand); @@ -24,7 +24,7 @@ public: } template <typename... Args> - CSerializedNetMsg Make(std::string sCommand, Args&&... args) + CSerializedNetMsg Make(std::string sCommand, Args&&... args) const { return Make(0, std::move(sCommand), std::forward<Args>(args)...); } diff --git a/src/policy/fees.cpp b/src/policy/fees.cpp index 5407aefb45..da33e4100f 100644 --- a/src/policy/fees.cpp +++ b/src/policy/fees.cpp @@ -298,13 +298,13 @@ bool CBlockPolicyEstimator::removeTx(uint256 hash) } } -CBlockPolicyEstimator::CBlockPolicyEstimator(const CFeeRate& _minRelayFee) +CBlockPolicyEstimator::CBlockPolicyEstimator() : nBestSeenHeight(0), trackedTxs(0), untrackedTxs(0) { - static_assert(MIN_FEERATE > 0, "Min feerate must be nonzero"); - minTrackedFee = _minRelayFee < CFeeRate(MIN_FEERATE) ? CFeeRate(MIN_FEERATE) : _minRelayFee; + static_assert(MIN_BUCKET_FEERATE > 0, "Min feerate must be nonzero"); + minTrackedFee = CFeeRate(MIN_BUCKET_FEERATE); std::vector<double> vfeelist; - for (double bucketBoundary = minTrackedFee.GetFeePerK(); bucketBoundary <= MAX_FEERATE; bucketBoundary *= FEE_SPACING) { + for (double bucketBoundary = minTrackedFee.GetFeePerK(); bucketBoundary <= MAX_BUCKET_FEERATE; bucketBoundary *= FEE_SPACING) { vfeelist.push_back(bucketBoundary); } vfeelist.push_back(INF_FEERATE); @@ -452,24 +452,6 @@ CFeeRate CBlockPolicyEstimator::estimateSmartFee(int confTarget, int *answerFoun return CFeeRate(median); } -double CBlockPolicyEstimator::estimatePriority(int confTarget) -{ - return -1; -} - -double CBlockPolicyEstimator::estimateSmartPriority(int confTarget, int *answerFoundAtTarget, const CTxMemPool& pool) -{ - if (answerFoundAtTarget) - *answerFoundAtTarget = confTarget; - - // If mempool is limiting txs, no priority txs are allowed - CAmount minPoolFee = pool.GetMinFee(GetArg("-maxmempool", DEFAULT_MAX_MEMPOOL_SIZE) * 1000000).GetFeePerK(); - if (minPoolFee > 0) - return INF_PRIORITY; - - return -1; -} - void CBlockPolicyEstimator::Write(CAutoFile& fileout) { fileout << nBestSeenHeight; @@ -482,17 +464,14 @@ void CBlockPolicyEstimator::Read(CAutoFile& filein, int nFileVersion) filein >> nFileBestSeenHeight; feeStats.Read(filein); nBestSeenHeight = nFileBestSeenHeight; - if (nFileVersion < 139900) { - TxConfirmStats priStats; - priStats.Read(filein); - } + // if nVersionThatWrote < 139900 then another TxConfirmStats (for priority) follows but can be ignored. } FeeFilterRounder::FeeFilterRounder(const CFeeRate& minIncrementalFee) { CAmount minFeeLimit = std::max(CAmount(1), minIncrementalFee.GetFeePerK() / 2); feeset.insert(0); - for (double bucketBoundary = minFeeLimit; bucketBoundary <= MAX_FEERATE; bucketBoundary *= FEE_SPACING) { + for (double bucketBoundary = minFeeLimit; bucketBoundary <= MAX_BUCKET_FEERATE; bucketBoundary *= FEE_SPACING) { feeset.insert(bucketBoundary); } } diff --git a/src/policy/fees.h b/src/policy/fees.h index 064466afe4..dd01c90c45 100644 --- a/src/policy/fees.h +++ b/src/policy/fees.h @@ -179,10 +179,14 @@ static const double MIN_SUCCESS_PCT = .95; static const double SUFFICIENT_FEETXS = 1; // Minimum and Maximum values for tracking feerates -static constexpr double MIN_FEERATE = 10; -static const double MAX_FEERATE = 1e7; +// The MIN_BUCKET_FEERATE should just be set to the lowest reasonable feerate we +// might ever want to track. Historically this has been 1000 since it was +// inheriting DEFAULT_MIN_RELAY_TX_FEE and changing it is disruptive as it +// invalidates old estimates files. So leave it at 1000 unless it becomes +// necessary to lower it, and then lower it substantially. +static constexpr double MIN_BUCKET_FEERATE = 1000; +static const double MAX_BUCKET_FEERATE = 1e7; static const double INF_FEERATE = MAX_MONEY; -static const double INF_PRIORITY = 1e9 * MAX_MONEY; // We have to lump transactions into buckets based on feerate, but we want to be able // to give accurate estimates over a large range of potential feerates @@ -199,7 +203,7 @@ class CBlockPolicyEstimator { public: /** Create new BlockPolicyEstimator and initialize stats tracking classes with default values */ - CBlockPolicyEstimator(const CFeeRate& minRelayFee); + CBlockPolicyEstimator(); /** Process all the transactions that have been included in a block */ void processBlock(unsigned int nBlockHeight, @@ -223,20 +227,6 @@ public: */ CFeeRate estimateSmartFee(int confTarget, int *answerFoundAtTarget, const CTxMemPool& pool); - /** Return a priority estimate. - * DEPRECATED - * Returns -1 - */ - double estimatePriority(int confTarget); - - /** Estimate priority needed to get be included in a block within - * confTarget blocks. - * DEPRECATED - * Returns -1 unless mempool is currently limited then returns INF_PRIORITY - * answerFoundAtTarget is set to confTarget - */ - double estimateSmartPriority(int confTarget, int *answerFoundAtTarget, const CTxMemPool& pool); - /** Write estimation data to a file */ void Write(CAutoFile& fileout); diff --git a/src/policy/policy.cpp b/src/policy/policy.cpp index d318a0997c..ec398f6627 100644 --- a/src/policy/policy.cpp +++ b/src/policy/policy.cpp @@ -105,7 +105,7 @@ bool IsStandardTx(const CTransaction& tx, std::string& reason, const bool witnes else if ((whichType == TX_MULTISIG) && (!fIsBareMultisigStd)) { reason = "bare-multisig"; return false; - } else if (txout.IsDust(::minRelayTxFee)) { + } else if (txout.IsDust(dustRelayFee)) { reason = "dust"; return false; } @@ -206,6 +206,8 @@ bool IsWitnessStandard(const CTransaction& tx, const CCoinsViewCache& mapInputs) return true; } +CFeeRate incrementalRelayFee = CFeeRate(DEFAULT_INCREMENTAL_RELAY_FEE); +CFeeRate dustRelayFee = CFeeRate(DUST_RELAY_TX_FEE); unsigned int nBytesPerSigOp = DEFAULT_BYTES_PER_SIGOP; int64_t GetVirtualTransactionSize(int64_t nWeight, int64_t nSigOpCost) diff --git a/src/policy/policy.h b/src/policy/policy.h index 764ee27806..6df541bc0f 100644 --- a/src/policy/policy.h +++ b/src/policy/policy.h @@ -16,10 +16,10 @@ class CCoinsViewCache; /** Default for -blockmaxsize, which controls the maximum size of block the mining code will create **/ static const unsigned int DEFAULT_BLOCK_MAX_SIZE = 750000; -/** Default for -blockprioritysize, maximum space for zero/low-fee transactions **/ -static const unsigned int DEFAULT_BLOCK_PRIORITY_SIZE = 0; /** Default for -blockmaxweight, which controls the range of block weights the mining code will create **/ static const unsigned int DEFAULT_BLOCK_MAX_WEIGHT = 3000000; +/** Default for -blockmintxfee, which sets the minimum feerate for a transaction in blocks created by mining code **/ +static const unsigned int DEFAULT_BLOCK_MIN_TX_FEE = 1000; /** The maximum weight for transactions we're willing to relay/mine */ static const unsigned int MAX_STANDARD_TX_WEIGHT = 400000; /** Maximum number of signature check operations in an IsStandard() P2SH script */ @@ -28,6 +28,8 @@ static const unsigned int MAX_P2SH_SIGOPS = 15; static const unsigned int MAX_STANDARD_TX_SIGOPS_COST = MAX_BLOCK_SIGOPS_COST/5; /** Default for -maxmempool, maximum megabytes of mempool memory usage */ static const unsigned int DEFAULT_MAX_MEMPOOL_SIZE = 300; +/** Default for -incrementalrelayfee, which sets the minimum feerate increase for mempool limiting or BIP 125 replacement **/ +static const unsigned int DEFAULT_INCREMENTAL_RELAY_FEE = 1000; /** Default for -bytespersigop */ static const unsigned int DEFAULT_BYTES_PER_SIGOP = 20; /** The maximum number of witness stack items in a standard P2WSH script */ @@ -36,6 +38,12 @@ static const unsigned int MAX_STANDARD_P2WSH_STACK_ITEMS = 100; static const unsigned int MAX_STANDARD_P2WSH_STACK_ITEM_SIZE = 80; /** The maximum size of a standard witnessScript */ static const unsigned int MAX_STANDARD_P2WSH_SCRIPT_SIZE = 3600; +/** Min feerate for defining dust. Historically this has been the same as the + * minRelayTxFee, however changing the dust limit changes which transactions are + * standard and should be done with care and ideally rarely. It makes sense to + * only increase the dust limit after prior releases were already not creating + * outputs below the new threshold */ +static const unsigned int DUST_RELAY_TX_FEE = 1000; /** * Standard script verification flags that standard transactions will comply * with. However scripts violating these flags may still be present in valid @@ -83,6 +91,8 @@ bool AreInputsStandard(const CTransaction& tx, const CCoinsViewCache& mapInputs) */ bool IsWitnessStandard(const CTransaction& tx, const CCoinsViewCache& mapInputs); +extern CFeeRate incrementalRelayFee; +extern CFeeRate dustRelayFee; extern unsigned int nBytesPerSigOp; /** Compute the virtual transaction size (weight reinterpreted as bytes). */ diff --git a/src/pow.cpp b/src/pow.cpp index e57fd866f8..e06d9662e6 100644 --- a/src/pow.cpp +++ b/src/pow.cpp @@ -12,12 +12,9 @@ unsigned int GetNextWorkRequired(const CBlockIndex* pindexLast, const CBlockHeader *pblock, const Consensus::Params& params) { + assert(pindexLast != NULL); unsigned int nProofOfWorkLimit = UintToArith256(params.powLimit).GetCompact(); - // Genesis block - if (pindexLast == NULL) - return nProofOfWorkLimit; - // Only change once per difficulty adjustment interval if ((pindexLast->nHeight+1) % params.DifficultyAdjustmentInterval() != 0) { diff --git a/src/prevector.h b/src/prevector.h index 9eb6f8c68f..177d81383e 100644 --- a/src/prevector.h +++ b/src/prevector.h @@ -5,6 +5,7 @@ #ifndef _BITCOIN_PREVECTOR_H_ #define _BITCOIN_PREVECTOR_H_ +#include <assert.h> #include <stdlib.h> #include <stdint.h> #include <string.h> @@ -171,10 +172,15 @@ private: } } else { if (!is_direct()) { + /* FIXME: Because malloc/realloc here won't call new_handler if allocation fails, assert + success. These should instead use an allocator or new/delete so that handlers + are called as necessary, but performance would be slightly degraded by doing so. */ _union.indirect = static_cast<char*>(realloc(_union.indirect, ((size_t)sizeof(T)) * new_capacity)); + assert(_union.indirect); _union.capacity = new_capacity; } else { char* new_indirect = static_cast<char*>(malloc(((size_t)sizeof(T)) * new_capacity)); + assert(new_indirect); T* src = direct_ptr(0); T* dst = reinterpret_cast<T*>(new_indirect); memcpy(dst, src, size() * sizeof(T)); diff --git a/src/primitives/transaction.cpp b/src/primitives/transaction.cpp index 790bc71d14..a0d7793f97 100644 --- a/src/primitives/transaction.cpp +++ b/src/primitives/transaction.cpp @@ -69,6 +69,9 @@ uint256 CTransaction::ComputeHash() const uint256 CTransaction::GetWitnessHash() const { + if (!HasWitness()) { + return GetHash(); + } return SerializeHash(*this, SER_GETHASH, 0); } @@ -89,32 +92,6 @@ CAmount CTransaction::GetValueOut() const return nValueOut; } -double CTransaction::ComputePriority(double dPriorityInputs, unsigned int nTxSize) const -{ - nTxSize = CalculateModifiedSize(nTxSize); - if (nTxSize == 0) return 0.0; - - return dPriorityInputs / nTxSize; -} - -unsigned int CTransaction::CalculateModifiedSize(unsigned int nTxSize) const -{ - // In order to avoid disincentivizing cleaning up the UTXO set we don't count - // the constant overhead for each txin and up to 110 bytes of scriptSig (which - // is enough to cover a compressed pubkey p2sh redemption) for priority. - // Providing any more cleanup incentive than making additional inputs free would - // risk encouraging people to create junk outputs to redeem later. - if (nTxSize == 0) - nTxSize = (GetTransactionWeight(*this) + WITNESS_SCALE_FACTOR - 1) / WITNESS_SCALE_FACTOR; - for (std::vector<CTxIn>::const_iterator it(vin.begin()); it != vin.end(); ++it) - { - unsigned int offset = 41U + std::min(110U, (unsigned int)it->scriptSig.size()); - if (nTxSize > offset) - nTxSize -= offset; - } - return nTxSize; -} - unsigned int CTransaction::GetTotalSize() const { return ::GetSerializeSize(*this, SER_NETWORK, PROTOCOL_VERSION); diff --git a/src/primitives/transaction.h b/src/primitives/transaction.h index af2986a41b..d413e8b087 100644 --- a/src/primitives/transaction.h +++ b/src/primitives/transaction.h @@ -361,12 +361,6 @@ public: // GetValueIn() is a method on CCoinsViewCache, because // inputs must be known to compute value in. - // Compute priority, given priority of inputs and (optionally) tx size - double ComputePriority(double dPriorityInputs, unsigned int nTxSize=0) const; - - // Compute modified tx size for priority calculation (optionally given tx size) - unsigned int CalculateModifiedSize(unsigned int nTxSize=0) const; - /** * Get the total transaction size in bytes, including witness data. * "Total Size" defined in BIP141 and BIP144. diff --git a/src/qt/bantablemodel.cpp b/src/qt/bantablemodel.cpp index 00a915dd8d..4b34e73eb7 100644 --- a/src/qt/bantablemodel.cpp +++ b/src/qt/bantablemodel.cpp @@ -64,7 +64,7 @@ public: } if (sortColumn >= 0) - // sort cachedBanlist (use stable sort to prevent rows jumping around unneceesarily) + // sort cachedBanlist (use stable sort to prevent rows jumping around unnecessarily) qStableSort(cachedBanlist.begin(), cachedBanlist.end(), BannedNodeLessThan(sortColumn, sortOrder)); } diff --git a/src/qt/bitcoin.cpp b/src/qt/bitcoin.cpp index 72f5f4aac9..662e8037ca 100644 --- a/src/qt/bitcoin.cpp +++ b/src/qt/bitcoin.cpp @@ -178,8 +178,8 @@ public Q_SLOTS: void shutdown(); Q_SIGNALS: - void initializeResult(int retval); - void shutdownResult(int retval); + void initializeResult(bool success); + void shutdownResult(); void runawayException(const QString &message); private: @@ -223,8 +223,8 @@ public: WId getMainWinId() const; public Q_SLOTS: - void initializeResult(int retval); - void shutdownResult(int retval); + void initializeResult(bool success); + void shutdownResult(); /// Handle runaway exceptions. Shows a message box with the problem and quits the program. void handleRunawayException(const QString &message); @@ -268,7 +268,7 @@ void BitcoinCore::initialize() { try { - qDebug() << __func__ << ": Running AppInit2 in thread"; + qDebug() << __func__ << ": Running initialization in thread"; if (!AppInitBasicSetup()) { Q_EMIT initializeResult(false); @@ -284,7 +284,7 @@ void BitcoinCore::initialize() Q_EMIT initializeResult(false); return; } - int rv = AppInitMain(threadGroup, scheduler); + bool rv = AppInitMain(threadGroup, scheduler); Q_EMIT initializeResult(rv); } catch (const std::exception& e) { handleRunawayException(&e); @@ -302,7 +302,7 @@ void BitcoinCore::shutdown() threadGroup.join_all(); Shutdown(); qDebug() << __func__ << ": Shutdown finished"; - Q_EMIT shutdownResult(1); + Q_EMIT shutdownResult(); } catch (const std::exception& e) { handleRunawayException(&e); } catch (...) { @@ -398,8 +398,8 @@ void BitcoinApplication::startThread() executor->moveToThread(coreThread); /* communication to and from thread */ - connect(executor, SIGNAL(initializeResult(int)), this, SLOT(initializeResult(int))); - connect(executor, SIGNAL(shutdownResult(int)), this, SLOT(shutdownResult(int))); + connect(executor, SIGNAL(initializeResult(bool)), this, SLOT(initializeResult(bool))); + connect(executor, SIGNAL(shutdownResult()), this, SLOT(shutdownResult())); connect(executor, SIGNAL(runawayException(QString)), this, SLOT(handleRunawayException(QString))); connect(this, SIGNAL(requestedInitialize()), executor, SLOT(initialize())); connect(this, SIGNAL(requestedShutdown()), executor, SLOT(shutdown())); @@ -450,14 +450,14 @@ void BitcoinApplication::requestShutdown() Q_EMIT requestedShutdown(); } -void BitcoinApplication::initializeResult(int retval) +void BitcoinApplication::initializeResult(bool success) { - qDebug() << __func__ << ": Initialization result: " << retval; - // Set exit result: 0 if successful, 1 if failure - returnValue = retval ? 0 : 1; - if(retval) + qDebug() << __func__ << ": Initialization result: " << success; + // Set exit result. + returnValue = success ? EXIT_SUCCESS : EXIT_FAILURE; + if(success) { - // Log this only after AppInit2 finishes, as then logging setup is guaranteed complete + // Log this only after AppInitMain finishes, as then logging setup is guaranteed complete qWarning() << "Platform customization:" << platformStyle->getName(); #ifdef ENABLE_WALLET PaymentServer::LoadRootCAs(); @@ -507,9 +507,8 @@ void BitcoinApplication::initializeResult(int retval) } } -void BitcoinApplication::shutdownResult(int retval) +void BitcoinApplication::shutdownResult() { - qDebug() << __func__ << ": Shutdown result: " << retval; quit(); // Exit main loop after shutdown finished } diff --git a/src/qt/bitcoin_locale.qrc b/src/qt/bitcoin_locale.qrc index 8dd07c3d41..f195b23d81 100644 --- a/src/qt/bitcoin_locale.qrc +++ b/src/qt/bitcoin_locale.qrc @@ -4,12 +4,11 @@ <file alias="af_ZA">locale/bitcoin_af_ZA.qm</file> <file alias="ar">locale/bitcoin_ar.qm</file> <file alias="be_BY">locale/bitcoin_be_BY.qm</file> - <file alias="bg">locale/bitcoin_bg.qm</file> <file alias="bg_BG">locale/bitcoin_bg_BG.qm</file> + <file alias="bg">locale/bitcoin_bg.qm</file> <file alias="ca_ES">locale/bitcoin_ca_ES.qm</file> <file alias="ca">locale/bitcoin_ca.qm</file> <file alias="ca@valencia">locale/bitcoin_ca@valencia.qm</file> - <file alias="cs_CZ">locale/bitcoin_cs_CZ.qm</file> <file alias="cs">locale/bitcoin_cs.qm</file> <file alias="cy">locale/bitcoin_cy.qm</file> <file alias="da">locale/bitcoin_da.qm</file> @@ -28,6 +27,7 @@ <file alias="es">locale/bitcoin_es.qm</file> <file alias="es_UY">locale/bitcoin_es_UY.qm</file> <file alias="es_VE">locale/bitcoin_es_VE.qm</file> + <file alias="et_EE">locale/bitcoin_et_EE.qm</file> <file alias="et">locale/bitcoin_et.qm</file> <file alias="eu_ES">locale/bitcoin_eu_ES.qm</file> <file alias="fa_IR">locale/bitcoin_fa_IR.qm</file> @@ -57,6 +57,7 @@ <file alias="mn">locale/bitcoin_mn.qm</file> <file alias="ms_MY">locale/bitcoin_ms_MY.qm</file> <file alias="nb">locale/bitcoin_nb.qm</file> + <file alias="ne">locale/bitcoin_ne.qm</file> <file alias="nl">locale/bitcoin_nl.qm</file> <file alias="pam">locale/bitcoin_pam.qm</file> <file alias="pl">locale/bitcoin_pl.qm</file> diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp index 9d5ff31fb4..be79a67990 100644 --- a/src/qt/bitcoingui.cpp +++ b/src/qt/bitcoingui.cpp @@ -31,6 +31,7 @@ #include "macdockiconhandler.h" #endif +#include "chainparams.h" #include "init.h" #include "ui_interface.h" #include "util.h" @@ -517,7 +518,10 @@ void BitcoinGUI::setClientModel(ClientModel *_clientModel) // Propagate cleared model to child objects rpcConsole->setClientModel(nullptr); #ifdef ENABLE_WALLET - walletFrame->setClientModel(nullptr); + if (walletFrame) + { + walletFrame->setClientModel(nullptr); + } #endif // ENABLE_WALLET unitDisplayControl->setOptionsModel(nullptr); } @@ -748,6 +752,15 @@ void BitcoinGUI::setNetworkActive(bool networkActive) updateNetworkState(); } +void BitcoinGUI::updateHeadersSyncProgressLabel() +{ + int64_t headersTipTime = clientModel->getHeaderTipTime(); + int headersTipHeight = clientModel->getHeaderTipHeight(); + int estHeadersLeft = (GetTime() - headersTipTime) / Params().GetConsensus().nPowTargetSpacing; + if (estHeadersLeft > HEADER_HEIGHT_DELTA_SYNC) + progressBarLabel->setText(tr("Syncing Headers (%1%)...").arg(QString::number(100.0 / (headersTipHeight+estHeadersLeft)*headersTipHeight, 'f', 1))); +} + void BitcoinGUI::setNumBlocks(int count, const QDateTime& blockDate, double nVerificationProgress, bool header) { if (modalOverlay) @@ -760,7 +773,7 @@ void BitcoinGUI::setNumBlocks(int count, const QDateTime& blockDate, double nVer if (!clientModel) return; - // Prevent orphan statusbar messages (e.g. hover Quit in main menu, wait until chain-sync starts -> garbelled text) + // Prevent orphan statusbar messages (e.g. hover Quit in main menu, wait until chain-sync starts -> garbled text) statusBar()->clearMessage(); // Acquire current block source @@ -768,9 +781,11 @@ void BitcoinGUI::setNumBlocks(int count, const QDateTime& blockDate, double nVer switch (blockSource) { case BLOCK_SOURCE_NETWORK: if (header) { + updateHeadersSyncProgressLabel(); return; } progressBarLabel->setText(tr("Synchronizing with network...")); + updateHeadersSyncProgressLabel(); break; case BLOCK_SOURCE_DISK: if (header) { @@ -786,8 +801,7 @@ void BitcoinGUI::setNumBlocks(int count, const QDateTime& blockDate, double nVer if (header) { return; } - // Case: not Importing, not Reindexing and no network connection - progressBarLabel->setText(tr("No block source available...")); + progressBarLabel->setText(tr("Connecting to peers...")); break; } @@ -817,7 +831,7 @@ void BitcoinGUI::setNumBlocks(int count, const QDateTime& blockDate, double nVer } else { - QString timeBehindText = GUIUtil::formateNiceTimeOffset(secs); + QString timeBehindText = GUIUtil::formatNiceTimeOffset(secs); progressBarLabel->setVisible(true); progressBar->setFormat(tr("%1 behind").arg(timeBehindText)); diff --git a/src/qt/bitcoingui.h b/src/qt/bitcoingui.h index c8b6ce5474..62d419d3ef 100644 --- a/src/qt/bitcoingui.h +++ b/src/qt/bitcoingui.h @@ -149,6 +149,8 @@ private: /** Update UI with latest network info from model. */ void updateNetworkState(); + void updateHeadersSyncProgressLabel(); + Q_SIGNALS: /** Signal raised when a URI was entered or dragged to the GUI */ void receivedURI(const QString &uri); diff --git a/src/qt/bitcoinstrings.cpp b/src/qt/bitcoinstrings.cpp index ace085382b..a1e5cccc0b 100644 --- a/src/qt/bitcoinstrings.cpp +++ b/src/qt/bitcoinstrings.cpp @@ -78,6 +78,9 @@ QT_TRANSLATE_NOOP("bitcoin-core", "" "Execute command when the best block changes (%s in cmd is replaced by block " "hash)"), QT_TRANSLATE_NOOP("bitcoin-core", "" +"Extra transactions to keep in memory for compact block reconstructions " +"(default: %u)"), +QT_TRANSLATE_NOOP("bitcoin-core", "" "Fees (in %s/kB) smaller than this are considered zero fee for relaying, " "mining and transaction creation (default: %s)"), QT_TRANSLATE_NOOP("bitcoin-core", "" @@ -95,6 +98,10 @@ QT_TRANSLATE_NOOP("bitcoin-core", "" "If paytxfee is not set, include enough fee so transactions begin " "confirmation on average within n blocks (default: %u)"), QT_TRANSLATE_NOOP("bitcoin-core", "" +"If this block is in the chain assume that it and its ancestors are valid and " +"potentially skip their script verification (0 to verify all, default: %s, " +"testnet: %s)"), +QT_TRANSLATE_NOOP("bitcoin-core", "" "Invalid amount for -maxtxfee=<amount>: '%s' (must be at least the minrelay " "fee of %s to prevent stuck transactions)"), QT_TRANSLATE_NOOP("bitcoin-core", "" @@ -132,14 +139,21 @@ QT_TRANSLATE_NOOP("bitcoin-core", "" "Randomize credentials for every proxy connection. This enables Tor stream " "isolation (default: %u)"), QT_TRANSLATE_NOOP("bitcoin-core", "" -"Reduce storage requirements by pruning (deleting) old blocks. This mode is " -"incompatible with -txindex and -rescan. Warning: Reverting this setting " -"requires re-downloading the entire blockchain. (default: 0 = disable pruning " -"blocks, >%u = target size in MiB to use for block files)"), +"Reduce storage requirements by enabling pruning (deleting) of old blocks. " +"This allows the pruneblockchain RPC to be called to delete specific blocks, " +"and enables automatic pruning of old blocks if a target size in MiB is " +"provided. This mode is incompatible with -txindex and -rescan. Warning: " +"Reverting this setting requires re-downloading the entire blockchain. " +"(default: 0 = disable pruning blocks, 1 = allow manual pruning via RPC, >%u " +"= automatically prune block files to stay under the specified target size in " +"MiB)"), QT_TRANSLATE_NOOP("bitcoin-core", "" "Rescans are not possible in pruned mode. You will need to use -reindex which " "will download the whole blockchain again."), QT_TRANSLATE_NOOP("bitcoin-core", "" +"Set lowest fee rate (in %s/kB) for transactions to be included in block " +"creation. (default: %s)"), +QT_TRANSLATE_NOOP("bitcoin-core", "" "Set maximum size of high-priority/low-fee transactions in bytes (default: %d)"), QT_TRANSLATE_NOOP("bitcoin-core", "" "Set the number of script verification threads (%u to %d, 0 = auto, <0 = " @@ -191,7 +205,9 @@ QT_TRANSLATE_NOOP("bitcoin-core", "" QT_TRANSLATE_NOOP("bitcoin-core", "" "Username and hashed password for JSON-RPC connections. The field <userpw> " "comes in the format: <USERNAME>:<SALT>$<HASH>. A canonical python script is " -"included in share/rpcuser. This option can be specified multiple times"), +"included in share/rpcuser. The client then connects normally using the " +"rpcuser=<USERNAME>/rpcpassword=<PASSWORD> pair of arguments. This option can " +"be specified multiple times"), QT_TRANSLATE_NOOP("bitcoin-core", "" "Wallet will not create transactions that violate mempool chain limits " "(default: %u)"), diff --git a/src/qt/clientmodel.cpp b/src/qt/clientmodel.cpp index 20a04dc8a8..bb10e49422 100644 --- a/src/qt/clientmodel.cpp +++ b/src/qt/clientmodel.cpp @@ -130,7 +130,7 @@ double ClientModel::getVerificationProgress(const CBlockIndex *tipIn) const LOCK(cs_main); tip = chainActive.Tip(); } - return Checkpoints::GuessVerificationProgress(Params().Checkpoints(), tip); + return GuessVerificationProgress(Params().TxData(), tip); } void ClientModel::updateTimer() diff --git a/src/qt/clientmodel.h b/src/qt/clientmodel.h index c01c1a84cf..2c10e633b8 100644 --- a/src/qt/clientmodel.h +++ b/src/qt/clientmodel.h @@ -66,7 +66,7 @@ public: //! Return true if core is doing initial block download bool inInitialBlockDownload() const; - //! Return true if core is importing blocks + //! Returns enum BlockSource of the current importing/syncing state enum BlockSource getBlockSource() const; //! Return true if network activity in core is enabled bool getNetworkActive() const; diff --git a/src/qt/coincontroldialog.cpp b/src/qt/coincontroldialog.cpp index a0c2813477..1d19c65753 100644 --- a/src/qt/coincontroldialog.cpp +++ b/src/qt/coincontroldialog.cpp @@ -15,7 +15,8 @@ #include "wallet/coincontrol.h" #include "init.h" -#include "validation.h" // For minRelayTxFee +#include "policy/policy.h" +#include "validation.h" // For mempool #include "wallet/wallet.h" #include <boost/assign/list_of.hpp> // for 'map_list_of()' @@ -432,7 +433,7 @@ void CoinControlDialog::updateLabels(WalletModel *model, QDialog* dialog) { CTxOut txout(amount, (CScript)std::vector<unsigned char>(24, 0)); txDummy.vout.push_back(txout); - if (txout.IsDust(::minRelayTxFee)) + if (txout.IsDust(dustRelayFee)) fDust = true; } } @@ -443,11 +444,7 @@ void CoinControlDialog::updateLabels(WalletModel *model, QDialog* dialog) CAmount nChange = 0; unsigned int nBytes = 0; unsigned int nBytesInputs = 0; - double dPriority = 0; - double dPriorityInputs = 0; unsigned int nQuantity = 0; - int nQuantityUncompressed = 0; - bool fAllowFree = false; bool fWitness = false; std::vector<COutPoint> vCoinControl; @@ -472,9 +469,6 @@ void CoinControlDialog::updateLabels(WalletModel *model, QDialog* dialog) // Amount nAmount += out.tx->tx->vout[out.i].nValue; - // Priority - dPriorityInputs += (double)out.tx->tx->vout[out.i].nValue * (out.nDepth+1); - // Bytes CTxDestination address; int witnessversion = 0; @@ -491,8 +485,6 @@ void CoinControlDialog::updateLabels(WalletModel *model, QDialog* dialog) if (keyid && model->getPubKey(*keyid, pubkey)) { nBytesInputs += (pubkey.IsCompressed() ? 148 : 180); - if (!pubkey.IsCompressed()) - nQuantityUncompressed++; } else nBytesInputs += 148; // in all error cases, simply assume 148 here @@ -524,17 +516,6 @@ void CoinControlDialog::updateLabels(WalletModel *model, QDialog* dialog) if (nPayFee > 0 && coinControl->nMinimumTotalFee > nPayFee) nPayFee = coinControl->nMinimumTotalFee; - - // Allow free? (require at least hard-coded threshold and default to that if no estimate) - double mempoolEstimatePriority = mempool.estimateSmartPriority(nTxConfirmTarget); - dPriority = dPriorityInputs / (nBytes - nBytesInputs + (nQuantityUncompressed * 29)); // 29 = 180 - 151 (uncompressed public keys are over the limit. max 151 bytes of the input are ignored for priority) - double dPriorityNeeded = std::max(mempoolEstimatePriority, AllowFreeThreshold()); - fAllowFree = (dPriority >= dPriorityNeeded); - - if (fSendFreeTransactions) - if (fAllowFree && nBytes <= MAX_FREE_TRANSACTION_CREATE_SIZE) - nPayFee = 0; - if (nPayAmount > 0) { nChange = nAmount - nPayAmount; @@ -545,10 +526,10 @@ void CoinControlDialog::updateLabels(WalletModel *model, QDialog* dialog) if (nChange > 0 && nChange < MIN_CHANGE) { CTxOut txout(nChange, (CScript)std::vector<unsigned char>(24, 0)); - if (txout.IsDust(::minRelayTxFee)) + if (txout.IsDust(dustRelayFee)) { if (CoinControlDialog::fSubtractFeeFromAmount) // dust-change will be raised until no dust - nChange = txout.GetDustThreshold(::minRelayTxFee); + nChange = txout.GetDustThreshold(dustRelayFee); else { nPayFee += nChange; @@ -562,9 +543,7 @@ void CoinControlDialog::updateLabels(WalletModel *model, QDialog* dialog) } // after fee - nAfterFee = nAmount - nPayFee; - if (nAfterFee < 0) - nAfterFee = 0; + nAfterFee = std::max<CAmount>(nAmount - nPayFee, 0); } // actually update labels diff --git a/src/qt/forms/intro.ui b/src/qt/forms/intro.ui index e4ff3da1ab..cfdd8482e3 100644 --- a/src/qt/forms/intro.ui +++ b/src/qt/forms/intro.ui @@ -7,7 +7,7 @@ <x>0</x> <y>0</y> <width>674</width> - <height>363</height> + <height>415</height> </rect> </property> <property name="windowTitle"> @@ -55,9 +55,6 @@ </item> <item> <widget class="QLabel" name="sizeWarningLabel"> - <property name="text"> - <string>%1 will download and store a copy of the Bitcoin block chain. At least %2GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</string> - </property> <property name="wordWrap"> <bool>true</bool> </property> @@ -204,6 +201,36 @@ </layout> </item> <item> + <widget class="QLabel" name="lblExplanation1"> + <property name="text"> + <string>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.</string> + </property> + <property name="wordWrap"> + <bool>true</bool> + </property> + </widget> + </item> + <item> + <widget class="QLabel" name="lblExplanation2"> + <property name="text"> + <string>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.</string> + </property> + <property name="wordWrap"> + <bool>true</bool> + </property> + </widget> + </item> + <item> + <widget class="QLabel" name="lblExplanation3"> + <property name="text"> + <string>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.</string> + </property> + <property name="wordWrap"> + <bool>true</bool> + </property> + </widget> + </item> + <item> <spacer name="verticalSpacer"> <property name="orientation"> <enum>Qt::Vertical</enum> diff --git a/src/qt/guiutil.cpp b/src/qt/guiutil.cpp index 4463cfdaef..fd3dcac424 100644 --- a/src/qt/guiutil.cpp +++ b/src/qt/guiutil.cpp @@ -11,7 +11,7 @@ #include "primitives/transaction.h" #include "init.h" -#include "validation.h" // For minRelayTxFee +#include "policy/policy.h" #include "protocol.h" #include "script/script.h" #include "script/standard.h" @@ -37,9 +37,7 @@ #include <boost/filesystem.hpp> #include <boost/filesystem/fstream.hpp> -#if BOOST_FILESYSTEM_VERSION >= 3 #include <boost/filesystem/detail/utf8_codecvt_facet.hpp> -#endif #include <boost/scoped_array.hpp> #include <QAbstractItemView> @@ -67,9 +65,7 @@ #include <QFontDatabase> #endif -#if BOOST_FILESYSTEM_VERSION >= 3 static boost::filesystem::detail::utf8_codecvt_facet utf8; -#endif #if defined(Q_OS_MAC) extern double NSAppKitVersionNumber; @@ -257,7 +253,7 @@ bool isDust(const QString& address, const CAmount& amount) CTxDestination dest = CBitcoinAddress(address.toStdString()).Get(); CScript script = GetScriptForDestination(dest); CTxOut txOut(amount, script); - return txOut.IsDust(::minRelayTxFee); + return txOut.IsDust(dustRelayFee); } QString HtmlEscape(const QString& str, bool fMultiLine) @@ -536,7 +532,7 @@ int TableViewLastColumnResizingFixer::getAvailableWidthForColumn(int column) return nResult; } -// Make sure we don't make the columns wider than the tables viewport width. +// Make sure we don't make the columns wider than the table's viewport width. void TableViewLastColumnResizingFixer::adjustTableColumnsWidth() { disconnectViewHeadersSignals(); @@ -570,7 +566,7 @@ void TableViewLastColumnResizingFixer::on_sectionResized(int logicalIndex, int o } } -// When the tabless geometry is ready, we manually perform the stretch of the "Message" column, +// When the table's geometry is ready, we manually perform the stretch of the "Message" column, // as the "Stretch" resize mode does not allow for interactive resizing. void TableViewLastColumnResizingFixer::on_geometriesChanged() { @@ -762,6 +758,8 @@ bool SetStartOnSystemStartup(bool fAutoStart) #elif defined(Q_OS_MAC) +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" // based on: https://github.com/Mozketo/LaunchAtLoginController/blob/master/LaunchAtLoginController.m #include <CoreFoundation/CoreFoundation.h> @@ -824,6 +822,7 @@ bool SetStartOnSystemStartup(bool fAutoStart) } return true; } +#pragma GCC diagnostic pop #else bool GetStartOnSystemStartup() { return false; } @@ -860,7 +859,6 @@ void setClipboard(const QString& str) QApplication::clipboard()->setText(str, QClipboard::Selection); } -#if BOOST_FILESYSTEM_VERSION >= 3 boost::filesystem::path qstringToBoostPath(const QString &path) { return boost::filesystem::path(path.toStdString(), utf8); @@ -870,18 +868,6 @@ QString boostPathToQString(const boost::filesystem::path &path) { return QString::fromStdString(path.string(utf8)); } -#else -#warning Conversion between boost path and QString can use invalid character encoding with boost_filesystem v2 and older -boost::filesystem::path qstringToBoostPath(const QString &path) -{ - return boost::filesystem::path(path.toStdString()); -} - -QString boostPathToQString(const boost::filesystem::path &path) -{ - return QString::fromStdString(path.string()); -} -#endif QString formatDurationStr(int secs) { @@ -951,7 +937,7 @@ QString formatTimeOffset(int64_t nTimeOffset) return QString(QObject::tr("%1 s")).arg(QString::number((int)nTimeOffset, 10)); } -QString formateNiceTimeOffset(qint64 secs) +QString formatNiceTimeOffset(qint64 secs) { // Represent time from last generated block in human readable text QString timeBehindText; diff --git a/src/qt/guiutil.h b/src/qt/guiutil.h index b2c9338b56..913aa5e24b 100644 --- a/src/qt/guiutil.h +++ b/src/qt/guiutil.h @@ -140,7 +140,7 @@ namespace GUIUtil * Also makes sure the column widths are never larger than the table's viewport. * In Qt, all columns are resizable from the right, but it's not intuitive resizing the last column from the right. * Usually our second to last columns behave as if stretched, and when on strech mode, columns aren't resizable - * interactively or programatically. + * interactively or programmatically. * * This helper object takes care of this issue. * @@ -200,7 +200,7 @@ namespace GUIUtil /* Format a CNodeCombinedStats.nTimeOffset into a user-readable string. */ QString formatTimeOffset(int64_t nTimeOffset); - QString formateNiceTimeOffset(qint64 secs); + QString formatNiceTimeOffset(qint64 secs); class ClickableLabel : public QLabel { diff --git a/src/qt/intro.cpp b/src/qt/intro.cpp index e0678f45fc..4939648ff0 100644 --- a/src/qt/intro.cpp +++ b/src/qt/intro.cpp @@ -23,7 +23,7 @@ static const uint64_t GB_BYTES = 1000000000LL; /* Minimum free space (in GB) needed for data directory */ -static const uint64_t BLOCK_CHAIN_SIZE = 80; +static const uint64_t BLOCK_CHAIN_SIZE = 120; /* Minimum free space (in GB) needed for data directory when pruned; Does not include prune target */ static const uint64_t CHAIN_STATE_SIZE = 2; /* Total required space (in GB) depending on user choice (prune, not prune) */ @@ -124,11 +124,34 @@ Intro::Intro(QWidget *parent) : ui->setupUi(this); ui->welcomeLabel->setText(ui->welcomeLabel->text().arg(tr(PACKAGE_NAME))); ui->storageLabel->setText(ui->storageLabel->text().arg(tr(PACKAGE_NAME))); + + ui->lblExplanation1->setText(ui->lblExplanation1->text() + .arg(tr(PACKAGE_NAME)) + .arg(BLOCK_CHAIN_SIZE) + .arg(2009) + .arg(tr("Bitcoin")) + ); + ui->lblExplanation2->setText(ui->lblExplanation2->text().arg(tr(PACKAGE_NAME))); + uint64_t pruneTarget = std::max<int64_t>(0, GetArg("-prune", 0)); requiredSpace = BLOCK_CHAIN_SIZE; - if (pruneTarget) - requiredSpace = CHAIN_STATE_SIZE + std::ceil(pruneTarget * 1024 * 1024.0 / GB_BYTES); - ui->sizeWarningLabel->setText(ui->sizeWarningLabel->text().arg(tr(PACKAGE_NAME)).arg(requiredSpace)); + QString storageRequiresMsg = tr("At least %1 GB of data will be stored in this directory, and it will grow over time."); + if (pruneTarget) { + uint64_t prunedGBs = std::ceil(pruneTarget * 1024 * 1024.0 / GB_BYTES); + if (prunedGBs <= requiredSpace) { + requiredSpace = prunedGBs; + storageRequiresMsg = tr("Approximately %1 GB of data will be stored in this directory."); + } + ui->lblExplanation3->setVisible(true); + } else { + ui->lblExplanation3->setVisible(false); + } + requiredSpace += CHAIN_STATE_SIZE; + ui->sizeWarningLabel->setText( + tr("%1 will download and store a copy of the Bitcoin block chain.").arg(tr(PACKAGE_NAME)) + " " + + storageRequiresMsg.arg(requiredSpace) + " " + + tr("The wallet will also be stored in this directory.") + ); startThread(); } diff --git a/src/qt/locale/bitcoin_af.ts b/src/qt/locale/bitcoin_af.ts index 97ada8dd5c..9726987b63 100644 --- a/src/qt/locale/bitcoin_af.ts +++ b/src/qt/locale/bitcoin_af.ts @@ -22,6 +22,10 @@ <translation>&Dupliseer</translation> </message> <message> + <source>C&lose</source> + <translation>S&luit</translation> + </message> + <message> <source>Delete the currently selected address from the list</source> <translation>Verwyder die adres wat u gekies het van die lys</translation> </message> @@ -37,6 +41,73 @@ <source>&Delete</source> <translation>&Vee uit</translation> </message> + <message> + <source>Choose the address to send coins to</source> + <translation>Kies die adres waarheen u munte wil stuur</translation> + </message> + <message> + <source>Choose the address to receive coins with</source> + <translation>Kies die adres wat die munte moet ontvang</translation> + </message> + <message> + <source>C&hoose</source> + <translation>K&ies</translation> + </message> + <message> + <source>Sending addresses</source> + <translation>Stuurders adresse</translation> + </message> + <message> + <source>Receiving addresses</source> + <translation>Ontvanger adresse</translation> + </message> + <message> + <source>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source> + <translation>Hierdie is die adresse vanwaar u Bitcoin betalings stuur. U moet altyd die bedrag en die adres van die ontvanger nagaan voordat u enige munte stuur.</translation> + </message> + <message> + <source>These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction.</source> + <translation>Hierdie is die adresse waar u Bitcoins sal ontvang. Ons beveel aan dat u 'n nuwe adres kies vir elke transaksie</translation> + </message> + <message> + <source>&Copy Address</source> + <translation>&Dupliseer Adres</translation> + </message> + <message> + <source>&Edit</source> + <translation>&Verander</translation> + </message> + <message> + <source>Export Address List</source> + <translation>Voer adreslys uit</translation> + </message> + <message> + <source>Comma separated file (*.csv)</source> + <translation>Comma separated file (*.csv)</translation> + </message> + <message> + <source>Exporting Failed</source> + <translation>Uitvoer was onsuksesvol</translation> + </message> + <message> + <source>There was an error trying to save the address list to %1. Please try again.</source> + <translation>Die adreslys kon nie in %1 gestoor word nie. Probeer asseblief weer.</translation> + </message> +</context> +<context> + <name>AddressTableModel</name> + <message> + <source>Label</source> + <translation>Merk</translation> + </message> + <message> + <source>Address</source> + <translation>Adres</translation> + </message> + <message> + <source>(no label)</source> + <translation>(geen etiket)</translation> + </message> </context> <context> <name>AskPassphraseDialog</name> @@ -56,6 +127,82 @@ <source>Repeat new passphrase</source> <translation>Herhaal nuwe wagwoord</translation> </message> + <message> + <source>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>.</source> + <translation>Tik die nuwe wagwoord vir u beursie.<br/>Gerbuik asseblief 'n wagwoord met <b>tien of meer lukrake karakters</b>, of <b>agt of meer woorde</b>.</translation> + </message> + <message> + <source>Encrypt wallet</source> + <translation>Kodifiseer beursie</translation> + </message> + <message> + <source>This operation needs your wallet passphrase to unlock the wallet.</source> + <translation>U het u beursie se wagwoord nodig om toegang tot u beursie te verkry.</translation> + </message> + <message> + <source>Unlock wallet</source> + <translation>Sluit beursie oop</translation> + </message> + <message> + <source>This operation needs your wallet passphrase to decrypt the wallet.</source> + <translation>U het u beursie se wagwoord nodig om u beursie se kode te ontsyfer.</translation> + </message> + <message> + <source>Decrypt wallet</source> + <translation>Ontsleutel beursie</translation> + </message> + <message> + <source>Change passphrase</source> + <translation>Verander wagwoord</translation> + </message> + <message> + <source>Enter the old passphrase and new passphrase to the wallet.</source> + <translation>Tik die ou en die nuwe wagwoorde vir die beursie.</translation> + </message> + <message> + <source>Confirm wallet encryption</source> + <translation>Bevestig dat die beursie gekodifiseer is</translation> + </message> + <message> + <source>Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR BITCOINS</b>!</source> + <translation>Waarskuwing: Indien u die beursie kodifiseer en u vergeet u wagwoord <b>VERLOOR U AL U BITCOINS</b>!</translation> + </message> + <message> + <source>Are you sure you wish to encrypt your wallet?</source> + <translation>Is u seker dat u die beursie wil kodifiseer?</translation> + </message> + <message> + <source>Wallet encrypted</source> + <translation>Beursie gekodifiseer</translation> + </message> + <message> + <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source> + <translation>BELANGRIK: Alle vorige kopieë en rugsteun-weergawes wat u tevore van die gemaak het, moet vervang word met die jongste weergawe van u nuutste gekodifiseerde beursie. Alle vorige weergawes en rugsteun-kopieë van u beursie sal nutteloos raak die oomblik wat u die nuut-gekodifiseerde beursie begin gebruik.</translation> + </message> + <message> + <source>Wallet encryption failed</source> + <translation>Kodifikasie was onsuksesvol</translation> + </message> + <message> + <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source> + <translation>Weens 'n interne fout het kodifikasie het nie geslaag nie. U beursie is nie gekodifiseer nie</translation> + </message> + <message> + <source>The supplied passphrases do not match.</source> + <translation>Die wagwoorde stem nie ooreen nie.</translation> + </message> + <message> + <source>Wallet unlock failed</source> + <translation>Die beursie is nie oopgesluit nie</translation> + </message> + <message> + <source>The passphrase entered for the wallet decryption was incorrect.</source> + <translation>U het die verkeerde wagwoord ingetik.</translation> + </message> + <message> + <source>Warning: The Caps Lock key is on!</source> + <translation>WAARSKUWING: Outomatiese Kapitalisering is aktief op u sleutelbord!</translation> + </message> </context> <context> <name>BanTableModel</name> @@ -87,14 +234,42 @@ <translation>&Transaksies</translation> </message> <message> + <source>Browse transaction history</source> + <translation>Blaai deur transaksiegeskiedenis</translation> + </message> + <message> + <source>E&xit</source> + <translation>&Sluit</translation> + </message> + <message> <source>Quit application</source> <translation>Stop en verlaat die applikasie</translation> </message> <message> + <source>&About %1</source> + <translation>&Oor %1</translation> + </message> + <message> + <source>Show information about %1</source> + <translation>Wys inligting oor %1</translation> + </message> + <message> + <source>About &Qt</source> + <translation>Oor &Qt</translation> + </message> + <message> + <source>Show information about Qt</source> + <translation>Wys inligting oor Qt</translation> + </message> + <message> <source>&Options...</source> <translation>&Opsies</translation> </message> <message> + <source>Modify configuration options for %1</source> + <translation>Verander konfigurasie-opsies vir %1</translation> + </message> + <message> <source>&Encrypt Wallet...</source> <translation>&Kodifiseer Beursie</translation> </message> @@ -151,6 +326,10 @@ <translation>&Ontvang</translation> </message> <message> + <source>&Show / Hide</source> + <translation>&Wys / Versteek</translation> + </message> + <message> <source>Show or hide the main Window</source> <translation>Wys of versteek die hoofbladsy</translation> </message> @@ -167,10 +346,18 @@ <translation>Verifieër boodskappe om seker te maak dat dit met die gespesifiseerde Bitcoin adresse</translation> </message> <message> + <source>&File</source> + <translation>&Leër</translation> + </message> + <message> <source>&Help</source> <translation>&Help</translation> </message> <message> + <source>Tabs toolbar</source> + <translation>Orebalk</translation> + </message> + <message> <source>Request payments (generates QR codes and bitcoin: URIs)</source> <translation>Versoek betalings (genereer QR-kodes en bitcoin: URI's)</translation> </message> @@ -186,53 +373,455 @@ <source>Open a bitcoin: URI or payment request</source> <translation>Skep 'n bitcoin: URI of betalingsversoek</translation> </message> + <message> + <source>Indexing blocks on disk...</source> + <translation>Blokke op skyf word geïndekseer...</translation> + </message> + <message> + <source>Processing blocks on disk...</source> + <translation>Blokke op skyf word geprosesseer...</translation> + </message> + <message> + <source>%1 behind</source> + <translation>%1 agter</translation> + </message> + <message> + <source>Last received block was generated %1 ago.</source> + <translation>Laaste ontvange blok is %1 gelede gegenereer.</translation> + </message> + <message> + <source>Transactions after this will not yet be visible.</source> + <translation>Transaksies hierna sal nog nie sigbaar wees nie.</translation> + </message> + <message> + <source>Error</source> + <translation>Fout</translation> + </message> + <message> + <source>Warning</source> + <translation>Waarskuwing</translation> + </message> + <message> + <source>Information</source> + <translation>Inligting</translation> + </message> + <message> + <source>Up to date</source> + <translation>Op datum</translation> + </message> + <message> + <source>Catching up...</source> + <translation>Word op datum gebring...</translation> + </message> + <message> + <source>Date: %1 +</source> + <translation>Datum: %1 +</translation> + </message> + <message> + <source>Address: %1 +</source> + <translation>Adres: %1 +</translation> + </message> + <message> + <source>Sent transaction</source> + <translation>Gestuurde transaksie</translation> + </message> + <message> + <source>Incoming transaction</source> + <translation>Inkomende transaksie</translation> + </message> </context> <context> <name>CoinControlDialog</name> + <message> + <source>Bytes:</source> + <translation>Grepe:</translation> + </message> + <message> + <source>Fee:</source> + <translation>Fooi:</translation> + </message> + <message> + <source>Dust:</source> + <translation>Stof:</translation> + </message> + <message> + <source>After Fee:</source> + <translation>Na Fooi:</translation> + </message> + <message> + <source>(un)select all</source> + <translation>(de)selekteer alle</translation> + </message> + <message> + <source>List mode</source> + <translation>Lysmodus</translation> + </message> + <message> + <source>Date</source> + <translation>Datum</translation> + </message> + <message> + <source>Confirmations</source> + <translation>Bevestigings</translation> + </message> + <message> + <source>Confirmed</source> + <translation>Bevestig</translation> + </message> + <message> + <source>(no label)</source> + <translation>(geen etiket)</translation> + </message> </context> <context> <name>EditAddressDialog</name> + <message> + <source>Edit Address</source> + <translation>Wysig Adres</translation> + </message> </context> <context> <name>FreespaceChecker</name> + <message> + <source>name</source> + <translation>naam</translation> + </message> </context> <context> <name>HelpMessageDialog</name> - </context> + <message> + <source>version</source> + <translation>weergawe</translation> + </message> + <message> + <source>About %1</source> + <translation>Ongeveer %1</translation> + </message> + <message> + <source>UI Options:</source> + <translation>Gebruikerkoppelvlakopsies:</translation> + </message> + <message> + <source>Start minimized</source> + <translation>Begin geminimeer</translation> + </message> + <message> + <source>Reset all settings changed in the GUI</source> + <translation>Alle instellings wat in die grafiese gebruikerkoppelvlak gewysig is, terugstel</translation> + </message> +</context> <context> <name>Intro</name> + <message> + <source>Welcome</source> + <translation>Welkom</translation> + </message> + <message> + <source>Welcome to %1.</source> + <translation>Welkom by %1.</translation> + </message> + <message> + <source>Error</source> + <translation>Fout</translation> + </message> + </context> +<context> + <name>ModalOverlay</name> + <message> + <source>Hide</source> + <translation>Versteek</translation> + </message> </context> <context> <name>OpenURIDialog</name> </context> <context> <name>OptionsDialog</name> + <message> + <source>Options</source> + <translation>Opsies</translation> + </message> + <message> + <source>MB</source> + <translation>MG</translation> + </message> + <message> + <source>Accept connections from outside</source> + <translation>Verbindings van buite toelaat</translation> + </message> + <message> + <source>Allow incoming connections</source> + <translation>Inkomende verbindings toelaat</translation> + </message> + <message> + <source>Reset all client options to default.</source> + <translation>Alle kliëntopsies na verstek terugstel.</translation> + </message> + <message> + <source>Expert</source> + <translation>Kenner</translation> + </message> + <message> + <source>IPv6</source> + <translation>IPv6</translation> + </message> + <message> + <source>Tor</source> + <translation>Tor</translation> + </message> + <message> + <source>default</source> + <translation>verstek</translation> + </message> + <message> + <source>none</source> + <translation>geen</translation> + </message> + <message> + <source>Confirm options reset</source> + <translation>Bevestig terugstel van opsies</translation> + </message> + <message> + <source>Client restart required to activate changes.</source> + <translation>Kliënt moet herbegin word om veranderinge te aktiveer.</translation> + </message> </context> <context> <name>OverviewPage</name> + <message> + <source>Available:</source> + <translation>Beskikbaar:</translation> + </message> + <message> + <source>Pending:</source> + <translation>Hangend:</translation> + </message> + <message> + <source>Immature:</source> + <translation>Onvolwasse:</translation> + </message> + <message> + <source>Balances</source> + <translation>Balanse</translation> + </message> + <message> + <source>Total:</source> + <translation>Totaal:</translation> + </message> + <message> + <source>Your current total balance</source> + <translation>U huidige totale balans</translation> + </message> + <message> + <source>Spendable:</source> + <translation>Besteebaar:</translation> + </message> + <message> + <source>Recent transactions</source> + <translation>Onlangse transaksies</translation> + </message> + </context> +<context> + <name>PaymentServer</name> </context> <context> <name>PeerTableModel</name> + <message> + <source>User Agent</source> + <translation>Gebruikeragent</translation> + </message> </context> <context> <name>QObject</name> + <message> + <source>%1 d</source> + <translation>%1 d</translation> + </message> + <message> + <source>%1 h</source> + <translation>%1 u</translation> + </message> + <message> + <source>%1 m</source> + <translation>%1 m</translation> + </message> + <message> + <source>%1 s</source> + <translation>%1 s</translation> + </message> + <message> + <source>None</source> + <translation>Geen</translation> + </message> + <message> + <source>N/A</source> + <translation>n.v.t.</translation> + </message> + <message> + <source>%1 ms</source> + <translation>%1 ms</translation> + </message> + <message> + <source>%1 and %2</source> + <translation>%1 en %2</translation> + </message> + </context> +<context> + <name>QObject::QObject</name> + </context> +<context> + <name>QRImageWidget</name> </context> <context> <name>RPCConsole</name> + <message> + <source>N/A</source> + <translation>n.v.t.</translation> + </message> + <message> + <source>Client version</source> + <translation>Kliëntweergawe</translation> + </message> + <message> + <source>General</source> + <translation>Algemeen</translation> + </message> + <message> + <source>Network</source> + <translation>Netwerk</translation> + </message> + <message> + <source>Name</source> + <translation>Naam</translation> + </message> + <message> + <source>Number of connections</source> + <translation>Aantal verbindings</translation> + </message> + <message> + <source>Block chain</source> + <translation>Blokketting</translation> + </message> + <message> + <source>Current number of blocks</source> + <translation>Huidige aantal blokke</translation> + </message> + <message> + <source>Received</source> + <translation>Ontvang</translation> + </message> + <message> + <source>Sent</source> + <translation>Gestuur</translation> + </message> + <message> + <source>Banned peers</source> + <translation>Verbanne porture</translation> + </message> + <message> + <source>Whitelisted</source> + <translation>Gewitlys</translation> + </message> + <message> + <source>Direction</source> + <translation>Rigting</translation> + </message> + <message> + <source>Version</source> + <translation>Weergawe</translation> + </message> + <message> + <source>User Agent</source> + <translation>Gebruikeragent</translation> + </message> </context> <context> <name>ReceiveCoinsDialog</name> </context> <context> <name>ReceiveRequestDialog</name> + <message> + <source>Address</source> + <translation>Adres</translation> + </message> + <message> + <source>Label</source> + <translation>Merk</translation> + </message> </context> <context> - <name>SendCoinsDialog</name> + <name>RecentRequestsTableModel</name> + <message> + <source>Date</source> + <translation>Datum</translation> + </message> + <message> + <source>Label</source> + <translation>Merk</translation> + </message> + <message> + <source>(no label)</source> + <translation>(geen etiket)</translation> + </message> </context> <context> + <name>SendCoinsDialog</name> + <message> + <source>Bytes:</source> + <translation>Grepe:</translation> + </message> + <message> + <source>Fee:</source> + <translation>Fooi:</translation> + </message> + <message> + <source>After Fee:</source> + <translation>Na Fooi:</translation> + </message> + <message> + <source>Transaction Fee:</source> + <translation>Transaksiefooi:</translation> + </message> + <message> + <source>Choose...</source> + <translation>Kies...</translation> + </message> + <message> + <source>per kilobyte</source> + <translation>per kilogreep</translation> + </message> + <message> + <source>Hide</source> + <translation>Versteek</translation> + </message> + <message> + <source>total at least</source> + <translation>totaal ten minste</translation> + </message> + <message> + <source>Dust:</source> + <translation>Stof:</translation> + </message> + <message> + <source>Balance:</source> + <translation>Balans:</translation> + </message> + <message> + <source>(no label)</source> + <translation>(geen etiket)</translation> + </message> +</context> +<context> <name>SendCoinsEntry</name> </context> <context> + <name>SendConfirmationDialog</name> + </context> +<context> <name>ShutdownWindow</name> </context> <context> @@ -245,20 +834,118 @@ <name>TrafficGraphWidget</name> </context> <context> + <name>TransactionDesc</name> + <message> + <source>Date</source> + <translation>Datum</translation> + </message> + </context> +<context> <name>TransactionDescDialog</name> </context> <context> + <name>TransactionTableModel</name> + <message> + <source>Date</source> + <translation>Datum</translation> + </message> + <message> + <source>Label</source> + <translation>Merk</translation> + </message> + <message> + <source>(no label)</source> + <translation>(geen etiket)</translation> + </message> + </context> +<context> + <name>TransactionView</name> + <message> + <source>Comma separated file (*.csv)</source> + <translation>Comma separated file (*.csv)</translation> + </message> + <message> + <source>Confirmed</source> + <translation>Bevestig</translation> + </message> + <message> + <source>Date</source> + <translation>Datum</translation> + </message> + <message> + <source>Label</source> + <translation>Merk</translation> + </message> + <message> + <source>Address</source> + <translation>Adres</translation> + </message> + <message> + <source>Exporting Failed</source> + <translation>Uitvoer was onsuksesvol</translation> + </message> + </context> +<context> <name>UnitDisplayStatusBarControl</name> </context> <context> + <name>WalletFrame</name> + </context> +<context> + <name>WalletModel</name> + </context> +<context> + <name>WalletView</name> + <message> + <source>&Export</source> + <translation>&Voer uit</translation> + </message> + <message> + <source>Export the data in the current tab to a file</source> + <translation>Voer die inligting op hierdie bladsy uit na 'n leer</translation> + </message> + </context> +<context> <name>bitcoin-core</name> <message> <source>Bitcoin Core</source> <translation>Bitcoin Kern</translation> </message> <message> + <source>Information</source> + <translation>Inligting</translation> + </message> + <message> + <source>Warning</source> + <translation>Waarskuwing</translation> + </message> + <message> <source>Do not keep transactions in the mempool longer than <n> hours (default: %u)</source> <translation>Moenie transaksies vir langer as <n> ure in die geheuepoel hou nie (verstek: %u)</translation> </message> - </context> + <message> + <source>Insufficient funds</source> + <translation>Onvoldoende fondse</translation> + </message> + <message> + <source>Loading block index...</source> + <translation>Blokindeks word gelaai...</translation> + </message> + <message> + <source>Loading wallet...</source> + <translation>Beursie word gelaai...</translation> + </message> + <message> + <source>Rescanning...</source> + <translation>Word herskandeer...</translation> + </message> + <message> + <source>Done loading</source> + <translation>Klaar met laai</translation> + </message> + <message> + <source>Error</source> + <translation>Fout</translation> + </message> +</context> </TS>
\ No newline at end of file diff --git a/src/qt/locale/bitcoin_af_ZA.ts b/src/qt/locale/bitcoin_af_ZA.ts index e553fc7759..1679482c77 100644 --- a/src/qt/locale/bitcoin_af_ZA.ts +++ b/src/qt/locale/bitcoin_af_ZA.ts @@ -10,9 +10,36 @@ <translation>Maak 'n kopie van die huidige adres na die stelsel klipbord</translation> </message> <message> + <source>&Copy</source> + <translation>&Kopie</translation> + </message> + <message> + <source>Delete the currently selected address from the list</source> + <translation>Verwyder die huidiglik gekieste address van die lys</translation> + </message> + <message> <source>&Delete</source> <translation>&Verwyder</translation> </message> + <message> + <source>Choose the address to send coins to</source> + <translation>Kies die address na wie die muntstukke gestuur moet word</translation> + </message> + </context> +<context> + <name>AddressTableModel</name> + <message> + <source>Label</source> + <translation>Etiket</translation> + </message> + <message> + <source>Address</source> + <translation>Adres</translation> + </message> + <message> + <source>(no label)</source> + <translation>(geen etiket)</translation> + </message> </context> <context> <name>AskPassphraseDialog</name> @@ -32,7 +59,71 @@ <source>Repeat new passphrase</source> <translation>Herhaal nuwe wagfrase</translation> </message> -</context> + <message> + <source>Encrypt wallet</source> + <translation>Enkripteer beursie</translation> + </message> + <message> + <source>This operation needs your wallet passphrase to unlock the wallet.</source> + <translation>Hierdie operasie benodig 'n wagwoord om die beursie oop te sluit.</translation> + </message> + <message> + <source>Unlock wallet</source> + <translation>Sluit beursie oop</translation> + </message> + <message> + <source>This operation needs your wallet passphrase to decrypt the wallet.</source> + <translation>Hierdie operasie benodig 'n wagwoord om die beursie oop te sluit.</translation> + </message> + <message> + <source>Decrypt wallet</source> + <translation>Sluit beursie oop</translation> + </message> + <message> + <source>Change passphrase</source> + <translation>Verander wagfrase</translation> + </message> + <message> + <source>Enter the old passphrase and new passphrase to the wallet.</source> + <translation>Tik in die ou wagfrase en die nuwe wagfrase vir die beursie.</translation> + </message> + <message> + <source>Confirm wallet encryption</source> + <translation>Bevestig beursie enkripsie.</translation> + </message> + <message> + <source>Wallet encrypted</source> + <translation>Die beursie is nou bewaak</translation> + </message> + <message> + <source>Wallet encryption failed</source> + <translation>Die beursie kon nie bewaak word nie</translation> + </message> + <message> + <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source> + <translation>Beursie bewaaking het misluk as gevolg van 'n interne fout. Die beursie is nie bewaak nie!</translation> + </message> + <message> + <source>The supplied passphrases do not match.</source> + <translation>Die wagfrase stem nie ooreen nie</translation> + </message> + <message> + <source>Wallet unlock failed</source> + <translation>Beursie oopsluiting het misluk</translation> + </message> + <message> + <source>The passphrase entered for the wallet decryption was incorrect.</source> + <translation>Die wagfrase wat ingetik was om die beursie oop te sluit, was verkeerd.</translation> + </message> + <message> + <source>Wallet decryption failed</source> + <translation>Beursie dekripsie het misluk</translation> + </message> + <message> + <source>Wallet passphrase was successfully changed.</source> + <translation>Die beursie se wagfrase verandering was suksesvol.</translation> + </message> + </context> <context> <name>BanTableModel</name> </context> @@ -129,6 +220,18 @@ <source>Date</source> <translation>Datum</translation> </message> + <message> + <source>Copy address</source> + <translation>Maak kopie van adres</translation> + </message> + <message> + <source>Copy amount</source> + <translation>Kopieer bedrag</translation> + </message> + <message> + <source>(no label)</source> + <translation>(geen etiket)</translation> + </message> </context> <context> <name>EditAddressDialog</name> @@ -140,7 +243,27 @@ <source>&Address</source> <translation>&Adres</translation> </message> -</context> + <message> + <source>New receiving address</source> + <translation>Nuwe ontvangende adres</translation> + </message> + <message> + <source>New sending address</source> + <translation>Nuwe stuurende adres</translation> + </message> + <message> + <source>Edit receiving address</source> + <translation>Wysig ontvangende adres</translation> + </message> + <message> + <source>Edit sending address</source> + <translation>Wysig stuurende adres</translation> + </message> + <message> + <source>Could not unlock wallet.</source> + <translation>Kon nie die beursie oopsluit nie.</translation> + </message> + </context> <context> <name>FreespaceChecker</name> </context> @@ -159,6 +282,13 @@ </message> </context> <context> + <name>ModalOverlay</name> + <message> + <source>Form</source> + <translation>Vorm</translation> + </message> + </context> +<context> <name>OpenURIDialog</name> </context> <context> @@ -180,6 +310,9 @@ </message> </context> <context> + <name>PaymentServer</name> + </context> +<context> <name>PeerTableModel</name> </context> <context> @@ -190,6 +323,12 @@ </message> </context> <context> + <name>QObject::QObject</name> + </context> +<context> + <name>QRImageWidget</name> + </context> +<context> <name>RPCConsole</name> <message> <source>&Information</source> @@ -206,9 +345,48 @@ <source>&Message:</source> <translation>&Boodskap:</translation> </message> - </context> + <message> + <source>Copy amount</source> + <translation>Kopieer bedrag</translation> + </message> +</context> <context> <name>ReceiveRequestDialog</name> + <message> + <source>Address</source> + <translation>Adres</translation> + </message> + <message> + <source>Amount</source> + <translation>Bedrag</translation> + </message> + <message> + <source>Label</source> + <translation>Etiket</translation> + </message> + <message> + <source>Message</source> + <translation>Boodskap</translation> + </message> + </context> +<context> + <name>RecentRequestsTableModel</name> + <message> + <source>Date</source> + <translation>Datum</translation> + </message> + <message> + <source>Label</source> + <translation>Etiket</translation> + </message> + <message> + <source>Message</source> + <translation>Boodskap</translation> + </message> + <message> + <source>(no label)</source> + <translation>(geen etiket)</translation> + </message> </context> <context> <name>SendCoinsDialog</name> @@ -240,6 +418,22 @@ <source>S&end</source> <translation>S&tuur</translation> </message> + <message> + <source>Copy amount</source> + <translation>Kopieer bedrag</translation> + </message> + <message> + <source>%1 to %2</source> + <translation>%1 tot %2</translation> + </message> + <message> + <source>or</source> + <translation>of</translation> + </message> + <message> + <source>(no label)</source> + <translation>(geen etiket)</translation> + </message> </context> <context> <name>SendCoinsEntry</name> @@ -253,6 +447,9 @@ </message> </context> <context> + <name>SendConfirmationDialog</name> + </context> +<context> <name>ShutdownWindow</name> </context> <context> @@ -277,12 +474,238 @@ <name>TrafficGraphWidget</name> </context> <context> + <name>TransactionDesc</name> + <message> + <source>Date</source> + <translation>Datum</translation> + </message> + <message> + <source>From</source> + <translation>Van</translation> + </message> + <message> + <source>unknown</source> + <translation>onbekend</translation> + </message> + <message> + <source>To</source> + <translation>Na</translation> + </message> + <message> + <source>own address</source> + <translation>eie adres</translation> + </message> + <message> + <source>label</source> + <translation>etiket</translation> + </message> + <message> + <source>Credit</source> + <translation>Krediet</translation> + </message> + <message> + <source>not accepted</source> + <translation>nie aanvaar nie</translation> + </message> + <message> + <source>Debit</source> + <translation>Debiet</translation> + </message> + <message> + <source>Transaction fee</source> + <translation>Transaksie fooi</translation> + </message> + <message> + <source>Net amount</source> + <translation>Netto bedrag</translation> + </message> + <message> + <source>Message</source> + <translation>Boodskap</translation> + </message> + <message> + <source>Transaction ID</source> + <translation>Transaksie ID</translation> + </message> + <message> + <source>Transaction</source> + <translation>Transaksie</translation> + </message> + <message> + <source>Amount</source> + <translation>Bedrag</translation> + </message> + <message> + <source>true</source> + <translation>waar</translation> + </message> + <message> + <source>false</source> + <translation>onwaar</translation> + </message> +</context> +<context> <name>TransactionDescDialog</name> </context> <context> + <name>TransactionTableModel</name> + <message> + <source>Date</source> + <translation>Datum</translation> + </message> + <message> + <source>Type</source> + <translation>Tipe</translation> + </message> + <message> + <source>Label</source> + <translation>Etiket</translation> + </message> + <message> + <source>Received with</source> + <translation>Ontvang met</translation> + </message> + <message> + <source>Received from</source> + <translation>Ontvang van</translation> + </message> + <message> + <source>Sent to</source> + <translation>Gestuur na</translation> + </message> + <message> + <source>Payment to yourself</source> + <translation>Betalings Aan/na jouself</translation> + </message> + <message> + <source>Mined</source> + <translation>Gemyn</translation> + </message> + <message> + <source>(n/a)</source> + <translation>(n.v.t)</translation> + </message> + <message> + <source>(no label)</source> + <translation>(geen etiket)</translation> + </message> + <message> + <source>Date and time that the transaction was received.</source> + <translation>Datum en tyd wat die transaksie ontvang was.</translation> + </message> + <message> + <source>Type of transaction.</source> + <translation>Tipe transaksie.</translation> + </message> + </context> +<context> + <name>TransactionView</name> + <message> + <source>All</source> + <translation>Alles</translation> + </message> + <message> + <source>Today</source> + <translation>Vandag</translation> + </message> + <message> + <source>This week</source> + <translation>Hierdie week</translation> + </message> + <message> + <source>This month</source> + <translation>Hierdie maand</translation> + </message> + <message> + <source>Last month</source> + <translation>Verlede maand</translation> + </message> + <message> + <source>This year</source> + <translation>Hierdie jaar</translation> + </message> + <message> + <source>Range...</source> + <translation>Reeks...</translation> + </message> + <message> + <source>Received with</source> + <translation>Ontvang met</translation> + </message> + <message> + <source>Sent to</source> + <translation>Gestuur na</translation> + </message> + <message> + <source>To yourself</source> + <translation>Aan/na jouself</translation> + </message> + <message> + <source>Mined</source> + <translation>Gemyn</translation> + </message> + <message> + <source>Other</source> + <translation>Ander</translation> + </message> + <message> + <source>Min amount</source> + <translation>Min bedrag</translation> + </message> + <message> + <source>Copy address</source> + <translation>Maak kopie van adres</translation> + </message> + <message> + <source>Copy amount</source> + <translation>Kopieer bedrag</translation> + </message> + <message> + <source>Date</source> + <translation>Datum</translation> + </message> + <message> + <source>Type</source> + <translation>Tipe</translation> + </message> + <message> + <source>Label</source> + <translation>Etiket</translation> + </message> + <message> + <source>Address</source> + <translation>Adres</translation> + </message> + <message> + <source>ID</source> + <translation>ID</translation> + </message> + <message> + <source>Range:</source> + <translation>Reeks:</translation> + </message> + <message> + <source>to</source> + <translation>aan</translation> + </message> +</context> +<context> <name>UnitDisplayStatusBarControl</name> </context> <context> + <name>WalletFrame</name> + </context> +<context> + <name>WalletModel</name> + <message> + <source>Send Coins</source> + <translation>Stuur Munstukke</translation> + </message> +</context> +<context> + <name>WalletView</name> + </context> +<context> <name>bitcoin-core</name> <message> <source>Options:</source> diff --git a/src/qt/locale/bitcoin_ar.ts b/src/qt/locale/bitcoin_ar.ts index af62207df2..9b865f29bf 100644 --- a/src/qt/locale/bitcoin_ar.ts +++ b/src/qt/locale/bitcoin_ar.ts @@ -23,7 +23,7 @@ </message> <message> <source>C&lose</source> - <translation>&اغلاق</translation> + <translation>ا&غلاق</translation> </message> <message> <source>Delete the currently selected address from the list</source> @@ -41,6 +41,77 @@ <source>&Delete</source> <translation>&أمسح</translation> </message> + <message> + <source>Choose the address to send coins to</source> + <translation>اختر العنوان الذي سترسل له العملات</translation> + </message> + <message> + <source>Choose the address to receive coins with</source> + <translation>اختر العنوان الذي تستقبل عليه العملات</translation> + </message> + <message> + <source>C&hoose</source> + <translation>&اختر</translation> + </message> + <message> + <source>Sending addresses</source> + <translation>ارسال العناوين</translation> + </message> + <message> + <source>Receiving addresses</source> + <translation>استقبال العناوين</translation> + </message> + <message> + <source>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source> + <translation>هذه هي عناوين Bitcion التابعة لك من أجل إرسال الدفعات. تحقق دائما من المبلغ و عنوان المرسل المستقبل قبل إرسال العملات</translation> + </message> + <message> + <source>These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction.</source> + <translation>هذه هي عناوين Bitcion التابعة لك من أجل إستقبال الدفعات. ينصح استخدام عنوان جديد من أجل كل صفقة</translation> + </message> + <message> + <source>&Copy Address</source> + <translation>انسخ العنوان</translation> + </message> + <message> + <source>Copy &Label</source> + <translation>نسخ &الوصف</translation> + </message> + <message> + <source>&Edit</source> + <translation>تعديل</translation> + </message> + <message> + <source>Export Address List</source> + <translation>تصدير قائمة العناوين</translation> + </message> + <message> + <source>Comma separated file (*.csv)</source> + <translation>ملف مفصول بفواصل (*.csv)</translation> + </message> + <message> + <source>Exporting Failed</source> + <translation>فشل التصدير</translation> + </message> + <message> + <source>There was an error trying to save the address list to %1. Please try again.</source> + <translation>لقد حدث خطأ أثناء حفظ قائمة العناوين إلى %1. يرجى المحاولة مرة أخرى.</translation> + </message> +</context> +<context> + <name>AddressTableModel</name> + <message> + <source>Label</source> + <translation>وصف</translation> + </message> + <message> + <source>Address</source> + <translation>عنوان</translation> + </message> + <message> + <source>(no label)</source> + <translation>(لا وصف)</translation> + </message> </context> <context> <name>AskPassphraseDialog</name> @@ -60,6 +131,90 @@ <source>Repeat new passphrase</source> <translation>ادخل كلمة المرور الجديدة مرة أخرى</translation> </message> + <message> + <source>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>.</source> + <translation>أدخل عبارة مرور جديدة إلى المحفظة. الرجاء استخدام عبارة مرور تتكون من10 حروف عشوائية على الاقل, أو أكثر من 7 كلمات</translation> + </message> + <message> + <source>Encrypt wallet</source> + <translation>تشفير المحفظة</translation> + </message> + <message> + <source>This operation needs your wallet passphrase to unlock the wallet.</source> + <translation>هذه العملية تحتاج كلمة مرور محفظتك لفتحها</translation> + </message> + <message> + <source>Unlock wallet</source> + <translation>إفتح المحفظة</translation> + </message> + <message> + <source>This operation needs your wallet passphrase to decrypt the wallet.</source> + <translation>هذه العملية تحتاج كلمة مرور محفظتك لفك تشفيرها </translation> + </message> + <message> + <source>Decrypt wallet</source> + <translation>فك تشفير المحفظة</translation> + </message> + <message> + <source>Change passphrase</source> + <translation>تغيير كلمة المرور</translation> + </message> + <message> + <source>Enter the old passphrase and new passphrase to the wallet.</source> + <translation>أدخل كلمة المرور القديمة والجديدة للمحفظة.</translation> + </message> + <message> + <source>Confirm wallet encryption</source> + <translation>تأكيد تشفير المحفظة</translation> + </message> + <message> + <source>Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR BITCOINS</b>!</source> + <translation>تحذير: إذا قمت بتشفير محفظتك وفقدت كلمة المرور الخاص بك, ستفقد كل عملات BITCOINS الخاصة بك.</translation> + </message> + <message> + <source>Are you sure you wish to encrypt your wallet?</source> + <translation>هل أنت متأكد من رغبتك في تشفير محفظتك ؟</translation> + </message> + <message> + <source>Wallet encrypted</source> + <translation>محفظة مشفرة</translation> + </message> + <message> + <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source> + <translation>هام: أي نسخة إحتياطية سابقة قمت بها لمحفظتك يجب استبدالها بأخرى حديثة، مشفرة. لأسباب أمنية، النسخ الاحتياطية السابقة لملفات المحفظة الغير مشفرة تصبح عديمة الفائدة مع بداية استخدام المحفظة المشفرة الجديدة.</translation> + </message> + <message> + <source>Wallet encryption failed</source> + <translation>فشل تشفير المحفظة</translation> + </message> + <message> + <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source> + <translation>فشل تشفير المحفظة بسبب خطأ داخلي. لم يتم تشفير محفظتك.</translation> + </message> + <message> + <source>The supplied passphrases do not match.</source> + <translation>كلمتي المرور ليستا متطابقتان</translation> + </message> + <message> + <source>Wallet unlock failed</source> + <translation>فشل فتح المحفظة</translation> + </message> + <message> + <source>The passphrase entered for the wallet decryption was incorrect.</source> + <translation>كلمة المرور التي تم إدخالها لفك تشفير المحفظة غير صحيحة.</translation> + </message> + <message> + <source>Wallet decryption failed</source> + <translation>فشل فك التشفير المحفظة</translation> + </message> + <message> + <source>Wallet passphrase was successfully changed.</source> + <translation>لقد تم تغير عبارة مرور المحفظة بنجاح</translation> + </message> + <message> + <source>Warning: The Caps Lock key is on!</source> + <translation>تحذير: مفتاح الحروف الكبيرة مفعل</translation> + </message> </context> <context> <name>BanTableModel</name> @@ -111,6 +266,10 @@ <translation>الخروج من التطبيق</translation> </message> <message> + <source>&About %1</source> + <translation>حوالي %1</translation> + </message> + <message> <source>Show information about %1</source> <translation>أظهر المعلومات حولة %1</translation> </message> @@ -127,6 +286,10 @@ <translation>&خيارات ...</translation> </message> <message> + <source>Modify configuration options for %1</source> + <translation>تغيير خيارات الإعداد لأساس ل%1</translation> + </message> + <message> <source>&Encrypt Wallet...</source> <translation>&تشفير المحفظة</translation> </message> @@ -259,20 +422,8 @@ <translation>معالجة الكتل على القرص...</translation> </message> <message> - <source>No block source available...</source> - <translation>لا يوجد أي مصدر الكتلة</translation> - </message> - <message numerus="yes"> - <source>Processed %n block(s) of transaction history.</source> - <translation><numerusform>لم يتم معالجة أي كتلة سجل المعاملات</numerusform><numerusform>تم معالجة كتلة واحدة سجل المعاملات</numerusform><numerusform>تم معالجة كتلتين سجل المعاملات</numerusform><numerusform>تم معالجة %n كتل سجل المعاملات</numerusform><numerusform>تم معالجة %n كتلة سجل المعاملات</numerusform><numerusform>تم معالجة %n كتلة سجل المعاملات</numerusform></translation> - </message> - <message numerus="yes"> - <source>%n hour(s)</source> - <translation><numerusform>0 ساعة</numerusform><numerusform>%n ساعة</numerusform><numerusform>%n ساعتين</numerusform><numerusform>%n ساعات</numerusform><numerusform>%n ساعة</numerusform><numerusform>%n ساعات</numerusform></translation> - </message> - <message> - <source>%1 and %2</source> - <translation>%1 و %2</translation> + <source>%1 behind</source> + <translation>خلف %1</translation> </message> <message> <source>Last received block was generated %1 ago.</source> @@ -299,6 +450,14 @@ <translation>محدث</translation> </message> <message> + <source>Show the %1 help message to get a list with possible Bitcoin command-line options</source> + <translation>بين اشارة المساعدة %1 للحصول على قائمة من خيارات اوامر البت كوين المحتملة </translation> + </message> + <message> + <source>%1 client</source> + <translation>الزبون %1</translation> + </message> + <message> <source>Catching up...</source> <translation>اللحاق بالركب ...</translation> </message> @@ -311,12 +470,30 @@ </translation> </message> <message> + <source>Amount: %1 +</source> + <translation>الكمية %1 +</translation> + </message> + <message> + <source>Type: %1 +</source> + <translation>نوع %1 +</translation> + </message> + <message> <source>Label: %1 </source> <translation>علامه: %1 </translation> </message> <message> + <source>Address: %1 +</source> + <translation>عنوان %1 +</translation> + </message> + <message> <source>Sent transaction</source> <translation>المعاملات المرسلة</translation> </message> @@ -332,7 +509,7 @@ <source>Wallet is <b>encrypted</b> and currently <b>locked</b></source> <translation>المحفظة <b>مشفرة</b> و <b>مقفلة</b> حاليا</translation> </message> -</context> + </context> <context> <name>CoinControlDialog</name> <message> @@ -352,10 +529,6 @@ <translation>القيمة :</translation> </message> <message> - <source>Priority:</source> - <translation>افضلية :</translation> - </message> - <message> <source>Fee:</source> <translation>رسوم :</translation> </message> @@ -408,8 +581,52 @@ <translation>تأكيد</translation> </message> <message> - <source>Priority</source> - <translation>أفضلية</translation> + <source>Copy address</source> + <translation> انسخ عنوان</translation> + </message> + <message> + <source>Copy label</source> + <translation> انسخ التسمية</translation> + </message> + <message> + <source>Copy amount</source> + <translation>نسخ الكمية</translation> + </message> + <message> + <source>Copy transaction ID</source> + <translation>نسخ رقم العملية</translation> + </message> + <message> + <source>Copy quantity</source> + <translation>نسخ الكمية </translation> + </message> + <message> + <source>Copy fee</source> + <translation>نسخ الرسوم</translation> + </message> + <message> + <source>Copy after fee</source> + <translation>نسخ بعد الرسوم</translation> + </message> + <message> + <source>Copy change</source> + <translation>نسخ التعديل</translation> + </message> + <message> + <source>yes</source> + <translation>نعم</translation> + </message> + <message> + <source>no</source> + <translation>لا</translation> + </message> + <message> + <source>(no label)</source> + <translation>(لا وصف)</translation> + </message> + <message> + <source>(change)</source> + <translation>(تغير)</translation> </message> </context> <context> @@ -434,6 +651,38 @@ <source>&Address</source> <translation>&العنوان</translation> </message> + <message> + <source>New receiving address</source> + <translation>عنوان أستلام جديد</translation> + </message> + <message> + <source>New sending address</source> + <translation>عنوان إرسال جديد</translation> + </message> + <message> + <source>Edit receiving address</source> + <translation>تعديل عنوان الأستلام</translation> + </message> + <message> + <source>Edit sending address</source> + <translation>تعديل عنوان الارسال</translation> + </message> + <message> + <source>The entered address "%1" is not a valid Bitcoin address.</source> + <translation>العنوان المدخل "%1" ليس عنوان بيت كوين صحيح.</translation> + </message> + <message> + <source>The entered address "%1" is already in the address book.</source> + <translation>هدا العنوان "%1" موجود مسبقا في دفتر العناوين</translation> + </message> + <message> + <source>Could not unlock wallet.</source> + <translation> يمكن فتح المحفظة.</translation> + </message> + <message> + <source>New key generation failed.</source> + <translation>فشل توليد مفتاح جديد.</translation> + </message> </context> <context> <name>FreespaceChecker</name> @@ -465,6 +714,10 @@ <translation>النسخة</translation> </message> <message> + <source>About %1</source> + <translation>حوالي %1</translation> + </message> + <message> <source>Command-line options</source> <translation>خيارات سطر الأوامر</translation> </message> @@ -512,6 +765,14 @@ <translation>أهلا</translation> </message> <message> + <source>Welcome to %1.</source> + <translation> اهلا بكم في %1</translation> + </message> + <message> + <source>As this is the first time the program is launched, you can choose where %1 will store its data.</source> + <translation>بما انه هذه اول مرة لانطلاق هذا البرنامج, فيمكنك ان تختار اين سيخزن %1 بياناته</translation> + </message> + <message> <source>Use the default data directory</source> <translation>استخدام دليل البانات الافتراضي</translation> </message> @@ -520,11 +781,26 @@ <translation>استخدام دليل بيانات مخصص:</translation> </message> <message> + <source>Error: Specified data directory "%1" cannot be created.</source> + <translation>خطأ: لا يمكن تكوين دليل بيانات مخصص ل %1</translation> + </message> + <message> <source>Error</source> <translation>خطأ</translation> </message> </context> <context> + <name>ModalOverlay</name> + <message> + <source>Form</source> + <translation>نمودج</translation> + </message> + <message> + <source>Hide</source> + <translation>إخفاء</translation> + </message> + </context> +<context> <name>OpenURIDialog</name> <message> <source>Open URI</source> @@ -538,6 +814,10 @@ <source>Select payment request file</source> <translation>حدد ملف طلب الدفع</translation> </message> + <message> + <source>Select payment request file to open</source> + <translation>حدد ملف طلب الدفع لفتحه</translation> + </message> </context> <context> <name>OptionsDialog</name> @@ -662,13 +942,20 @@ </message> </context> <context> + <name>PaymentServer</name> + <message> + <source>Bad response from server %1</source> + <translation>استجابة سيئة من الملقم %1</translation> + </message> + </context> +<context> <name>PeerTableModel</name> </context> <context> <name>QObject</name> <message> <source>Amount</source> - <translation>المبلغ</translation> + <translation>مبلغ</translation> </message> <message> <source>%1 h</source> @@ -682,8 +969,34 @@ <source>N/A</source> <translation>غير معروف</translation> </message> + <message> + <source>%1 and %2</source> + <translation>%1 و %2</translation> + </message> + </context> +<context> + <name>QObject::QObject</name> </context> <context> + <name>QRImageWidget</name> + <message> + <source>&Save Image...</source> + <translation>&حفظ الصورة</translation> + </message> + <message> + <source>&Copy Image</source> + <translation>&نسخ الصورة</translation> + </message> + <message> + <source>Save QR Code</source> + <translation>حفظ رمز الاستجابة السريعة QR</translation> + </message> + <message> + <source>PNG Image (*.png)</source> + <translation>صورة PNG (*.png)</translation> + </message> +</context> +<context> <name>RPCConsole</name> <message> <source>N/A</source> @@ -868,6 +1181,18 @@ <source>Remove</source> <translation>ازل</translation> </message> + <message> + <source>Copy label</source> + <translation> انسخ التسمية</translation> + </message> + <message> + <source>Copy message</source> + <translation>انسخ الرسالة</translation> + </message> + <message> + <source>Copy amount</source> + <translation>نسخ الكمية</translation> + </message> </context> <context> <name>ReceiveRequestDialog</name> @@ -887,7 +1212,54 @@ <source>&Save Image...</source> <translation>&حفظ الصورة</translation> </message> -</context> + <message> + <source>Payment information</source> + <translation>معلومات الدفع</translation> + </message> + <message> + <source>URI</source> + <translation> URI</translation> + </message> + <message> + <source>Address</source> + <translation>عنوان</translation> + </message> + <message> + <source>Amount</source> + <translation>مبلغ</translation> + </message> + <message> + <source>Label</source> + <translation>وصف</translation> + </message> + <message> + <source>Message</source> + <translation>رسالة </translation> + </message> + </context> +<context> + <name>RecentRequestsTableModel</name> + <message> + <source>Date</source> + <translation>تاريخ</translation> + </message> + <message> + <source>Label</source> + <translation>وصف</translation> + </message> + <message> + <source>Message</source> + <translation>رسالة </translation> + </message> + <message> + <source>(no label)</source> + <translation>(لا وصف)</translation> + </message> + <message> + <source>(no message)</source> + <translation>( لا رسائل )</translation> + </message> + </context> <context> <name>SendCoinsDialog</name> <message> @@ -915,10 +1287,6 @@ <translation>القيمة :</translation> </message> <message> - <source>Priority:</source> - <translation>افضلية :</translation> - </message> - <message> <source>Fee:</source> <translation>رسوم :</translation> </message> @@ -960,7 +1328,7 @@ </message> <message> <source>Dust:</source> - <translation>غبار</translation> + <translation>غبار:</translation> </message> <message> <source>Clear &All</source> @@ -978,6 +1346,54 @@ <source>S&end</source> <translation>&ارسال</translation> </message> + <message> + <source>Copy quantity</source> + <translation>نسخ الكمية </translation> + </message> + <message> + <source>Copy amount</source> + <translation>نسخ الكمية</translation> + </message> + <message> + <source>Copy fee</source> + <translation>نسخ الرسوم</translation> + </message> + <message> + <source>Copy after fee</source> + <translation>نسخ بعد الرسوم</translation> + </message> + <message> + <source>Copy change</source> + <translation>نسخ التعديل</translation> + </message> + <message> + <source>%1 to %2</source> + <translation>%1 الى %2</translation> + </message> + <message> + <source>or</source> + <translation>أو</translation> + </message> + <message> + <source>Confirm send coins</source> + <translation>تأكيد الإرسال Coins</translation> + </message> + <message> + <source>The amount to pay must be larger than 0.</source> + <translation>المبلغ المدفوع يجب ان يكون اكبر من 0</translation> + </message> + <message> + <source>The amount exceeds your balance.</source> + <translation>القيمة تتجاوز رصيدك</translation> + </message> + <message> + <source>The total exceeds your balance when the %1 transaction fee is included.</source> + <translation>المجموع يتجاوز رصيدك عندما يتم اضافة %1 رسوم العملية</translation> + </message> + <message> + <source>(no label)</source> + <translation>(لا وصف)</translation> + </message> </context> <context> <name>SendCoinsEntry</name> @@ -1029,7 +1445,18 @@ <source>Pay To:</source> <translation>ادفع &الى :</translation> </message> - </context> + <message> + <source>Enter a label for this address to add it to your address book</source> + <translation>إدخال تسمية لهذا العنوان لإضافته إلى دفتر العناوين الخاص بك</translation> + </message> +</context> +<context> + <name>SendConfirmationDialog</name> + <message> + <source>Yes</source> + <translation>نعم</translation> + </message> +</context> <context> <name>ShutdownWindow</name> <message> @@ -1087,7 +1514,51 @@ <source>Verify &Message</source> <translation>تحقق &الرسالة</translation> </message> - </context> + <message> + <source>Click "Sign Message" to generate signature</source> + <translation>اضغط "توقيع الرسالة" لتوليد التوقيع</translation> + </message> + <message> + <source>The entered address is invalid.</source> + <translation>العنوان المدخل غير صالح</translation> + </message> + <message> + <source>Please check the address and try again.</source> + <translation>الرجاء التأكد من العنوان والمحاولة مرة اخرى</translation> + </message> + <message> + <source>The entered address does not refer to a key.</source> + <translation>العنوان المدخل لا يشير الى مفتاح</translation> + </message> + <message> + <source>Wallet unlock was cancelled.</source> + <translation>تم الغاء عملية فتح المحفظة</translation> + </message> + <message> + <source>Private key for the entered address is not available.</source> + <translation>المفتاح الخاص للعنوان المدخل غير موجود.</translation> + </message> + <message> + <source>Message signing failed.</source> + <translation>فشل توقيع الرسالة.</translation> + </message> + <message> + <source>Message signed.</source> + <translation>الرسالة موقعة.</translation> + </message> + <message> + <source>Please check the signature and try again.</source> + <translation>فضلا تاكد من التوقيع وحاول مرة اخرى</translation> + </message> + <message> + <source>Message verification failed.</source> + <translation>فشلت عملية التأكد من الرسالة.</translation> + </message> + <message> + <source>Message verified.</source> + <translation>تم تأكيد الرسالة.</translation> + </message> +</context> <context> <name>SplashScreen</name> <message> @@ -1099,16 +1570,358 @@ <name>TrafficGraphWidget</name> </context> <context> + <name>TransactionDesc</name> + <message> + <source>Open until %1</source> + <translation>مفتوح حتى %1</translation> + </message> + <message> + <source>%1/offline</source> + <translation>%1 غير متواجد</translation> + </message> + <message> + <source>%1/unconfirmed</source> + <translation>غير مؤكدة/%1</translation> + </message> + <message> + <source>%1 confirmations</source> + <translation>تأكيد %1</translation> + </message> + <message> + <source>Status</source> + <translation>الحالة.</translation> + </message> + <message> + <source>, has not been successfully broadcast yet</source> + <translation>, لم يتم حتى الآن البث بنجاح</translation> + </message> + <message> + <source>Date</source> + <translation>تاريخ</translation> + </message> + <message> + <source>Source</source> + <translation>المصدر</translation> + </message> + <message> + <source>Generated</source> + <translation>تم اصداره.</translation> + </message> + <message> + <source>From</source> + <translation>من</translation> + </message> + <message> + <source>unknown</source> + <translation>غير معروف</translation> + </message> + <message> + <source>To</source> + <translation>الى</translation> + </message> + <message> + <source>own address</source> + <translation>عنوانه</translation> + </message> + <message> + <source>label</source> + <translation>علامة</translation> + </message> + <message> + <source>not accepted</source> + <translation>غير مقبولة</translation> + </message> + <message> + <source>Debit</source> + <translation>دين</translation> + </message> + <message> + <source>Transaction fee</source> + <translation>رسوم المعاملة</translation> + </message> + <message> + <source>Message</source> + <translation>رسالة </translation> + </message> + <message> + <source>Comment</source> + <translation>تعليق</translation> + </message> + <message> + <source>Transaction ID</source> + <translation>رقم المعاملة</translation> + </message> + <message> + <source>Merchant</source> + <translation>تاجر</translation> + </message> + <message> + <source>Transaction</source> + <translation>معاملة</translation> + </message> + <message> + <source>Amount</source> + <translation>مبلغ</translation> + </message> + <message> + <source>true</source> + <translation>صحيح</translation> + </message> + <message> + <source>false</source> + <translation>خاطئ</translation> + </message> +</context> +<context> <name>TransactionDescDialog</name> <message> <source>This pane shows a detailed description of the transaction</source> <translation>يبين هذا الجزء وصفا مفصلا لهده المعاملة</translation> </message> + </context> +<context> + <name>TransactionTableModel</name> + <message> + <source>Date</source> + <translation>تاريخ</translation> + </message> + <message> + <source>Type</source> + <translation>النوع</translation> + </message> + <message> + <source>Label</source> + <translation>وصف</translation> + </message> + <message> + <source>Open until %1</source> + <translation>مفتوح حتى %1</translation> + </message> + <message> + <source>Offline</source> + <translation>غير متصل</translation> + </message> + <message> + <source>Conflicted</source> + <translation>يتعارض</translation> + </message> + <message> + <source>This block was not received by any other nodes and will probably not be accepted!</source> + <translation>لم يتم تلقى هذه الكتلة (Block) من قبل أي العقد الأخرى وربما لن تكون مقبولة!</translation> + </message> + <message> + <source>Generated but not accepted</source> + <translation>ولدت ولكن لم تقبل</translation> + </message> + <message> + <source>Received with</source> + <translation>استقبل مع</translation> + </message> + <message> + <source>Received from</source> + <translation>استقبل من</translation> + </message> + <message> + <source>Sent to</source> + <translation>أرسل إلى</translation> + </message> + <message> + <source>Payment to yourself</source> + <translation>دفع لنفسك</translation> + </message> + <message> + <source>Mined</source> + <translation>Mined</translation> + </message> + <message> + <source>(n/a)</source> + <translation>غير متوفر</translation> + </message> + <message> + <source>(no label)</source> + <translation>(لا وصف)</translation> + </message> + <message> + <source>Transaction status. Hover over this field to show number of confirmations.</source> + <translation>حالة المعاملة. تحوم حول هذا الحقل لعرض عدد التأكيدات.</translation> + </message> + <message> + <source>Date and time that the transaction was received.</source> + <translation>التاريخ والوقت الذي تم فيه تلقي المعاملة.</translation> + </message> + <message> + <source>Type of transaction.</source> + <translation>نوع المعاملات</translation> + </message> + <message> + <source>Amount removed from or added to balance.</source> + <translation>المبلغ الذي أزيل أو أضيف الى الرصيد</translation> + </message> +</context> +<context> + <name>TransactionView</name> + <message> + <source>All</source> + <translation>الكل</translation> + </message> + <message> + <source>Today</source> + <translation>اليوم</translation> + </message> + <message> + <source>This week</source> + <translation>هدا الاسبوع</translation> + </message> + <message> + <source>This month</source> + <translation>هدا الشهر</translation> + </message> + <message> + <source>Last month</source> + <translation>الشهر الماضي</translation> + </message> + <message> + <source>This year</source> + <translation>هدا العام</translation> + </message> + <message> + <source>Range...</source> + <translation>المدى...</translation> + </message> + <message> + <source>Received with</source> + <translation>استقبل مع</translation> + </message> + <message> + <source>Sent to</source> + <translation>أرسل إلى</translation> + </message> + <message> + <source>To yourself</source> + <translation>إليك</translation> + </message> + <message> + <source>Mined</source> + <translation>Mined</translation> + </message> + <message> + <source>Other</source> + <translation>اخرى</translation> + </message> + <message> + <source>Enter address or label to search</source> + <translation>ادخل عنوان أووصف للبحث</translation> + </message> + <message> + <source>Min amount</source> + <translation>الحد الأدنى</translation> + </message> + <message> + <source>Copy address</source> + <translation> انسخ عنوان</translation> + </message> + <message> + <source>Copy label</source> + <translation> انسخ التسمية</translation> + </message> + <message> + <source>Copy amount</source> + <translation>نسخ الكمية</translation> + </message> + <message> + <source>Copy transaction ID</source> + <translation>نسخ رقم العملية</translation> + </message> + <message> + <source>Edit label</source> + <translation>عدل الوصف</translation> + </message> + <message> + <source>Show transaction details</source> + <translation>عرض تفاصيل المعاملة</translation> + </message> + <message> + <source>Comma separated file (*.csv)</source> + <translation>ملف مفصول بفواصل (*.csv)</translation> + </message> + <message> + <source>Confirmed</source> + <translation>تأكيد</translation> + </message> + <message> + <source>Date</source> + <translation>تاريخ</translation> + </message> + <message> + <source>Type</source> + <translation>النوع</translation> + </message> + <message> + <source>Label</source> + <translation>وصف</translation> + </message> + <message> + <source>Address</source> + <translation>عنوان</translation> + </message> + <message> + <source>ID</source> + <translation>العنوان</translation> + </message> + <message> + <source>Exporting Failed</source> + <translation>فشل التصدير</translation> + </message> + <message> + <source>Exporting Successful</source> + <translation>نجح التصدير</translation> + </message> + <message> + <source>Range:</source> + <translation>المدى:</translation> + </message> + <message> + <source>to</source> + <translation>الى</translation> + </message> </context> <context> <name>UnitDisplayStatusBarControl</name> </context> <context> + <name>WalletFrame</name> + </context> +<context> + <name>WalletModel</name> + <message> + <source>Send Coins</source> + <translation>إرسال Coins</translation> + </message> +</context> +<context> + <name>WalletView</name> + <message> + <source>&Export</source> + <translation>&تصدير</translation> + </message> + <message> + <source>Export the data in the current tab to a file</source> + <translation>تحميل البيانات في علامة التبويب الحالية إلى ملف.</translation> + </message> + <message> + <source>Backup Wallet</source> + <translation>نسخ احتياط للمحفظة</translation> + </message> + <message> + <source>Backup Failed</source> + <translation>فشل النسخ الاحتياطي</translation> + </message> + <message> + <source>Backup Successful</source> + <translation>نجاح النسخ الاحتياطي</translation> + </message> + </context> +<context> <name>bitcoin-core</name> <message> <source>Options:</source> @@ -1119,14 +1932,14 @@ <translation>حدد مجلد المعلومات</translation> </message> <message> - <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> - <translation>قبول الاتصالات من خارج</translation> - </message> - <message> <source>Bitcoin Core</source> <translation>جوهر البيت كوين</translation> </message> <message> + <source>The %s developers</source> + <translation>%s المبرمجون</translation> + </message> + <message> <source>Error: Disk space is low!</source> <translation>تحذير: مساحة القرص منخفضة</translation> </message> @@ -1159,10 +1972,6 @@ <translation>قيمة العملية صغيره جدا</translation> </message> <message> - <source>Transaction amounts must be positive</source> - <translation>يجب ان يكون قيمة العملية بالموجب</translation> - </message> - <message> <source>Transaction too large</source> <translation>المعاملة طويلة جدا</translation> </message> diff --git a/src/qt/locale/bitcoin_be_BY.ts b/src/qt/locale/bitcoin_be_BY.ts index 5894148fe0..62f2ffc9e6 100644 --- a/src/qt/locale/bitcoin_be_BY.ts +++ b/src/qt/locale/bitcoin_be_BY.ts @@ -41,6 +41,77 @@ <source>&Delete</source> <translation>Выдаліць</translation> </message> + <message> + <source>Choose the address to send coins to</source> + <translation>Выбраць адрас, куды выслаць сродкі</translation> + </message> + <message> + <source>Choose the address to receive coins with</source> + <translation>Выбраць адрас, на які атрымаць сродкі</translation> + </message> + <message> + <source>C&hoose</source> + <translation>Выбраць</translation> + </message> + <message> + <source>Sending addresses</source> + <translation>адрасы Адпраўкі</translation> + </message> + <message> + <source>Receiving addresses</source> + <translation>адрасы Прымання</translation> + </message> + <message> + <source>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source> + <translation>Тут знаходзяцца Біткойн-адрасы для высылання плацяжоў. Заўсёды спраўджвайце колькасць і адрас прызначэння перад здзяйсненнем транзакцыі.</translation> + </message> + <message> + <source>These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction.</source> + <translation>Тут знаходзяцца Біткойн-адрасы для прымання плацяжоў. Пажадана выкарыстоўваць новы адрас для кожнай транзакцыі.</translation> + </message> + <message> + <source>&Copy Address</source> + <translation>Капіяваць адрас</translation> + </message> + <message> + <source>Copy &Label</source> + <translation>Капіяваць Метку</translation> + </message> + <message> + <source>&Edit</source> + <translation>Рэдагаваць</translation> + </message> + <message> + <source>Export Address List</source> + <translation>Экспартаваць Спіс Адрасоў</translation> + </message> + <message> + <source>Comma separated file (*.csv)</source> + <translation>Коскамі падзелены файл (*.csv)</translation> + </message> + <message> + <source>Exporting Failed</source> + <translation>Экспартаванне няўдалае</translation> + </message> + <message> + <source>There was an error trying to save the address list to %1. Please try again.</source> + <translation>Адбылася памылка падчас спробы захаваць адрас у %1. Паспрабуйце зноў.</translation> + </message> +</context> +<context> + <name>AddressTableModel</name> + <message> + <source>Label</source> + <translation>Метка</translation> + </message> + <message> + <source>Address</source> + <translation>Адрас</translation> + </message> + <message> + <source>(no label)</source> + <translation>непазначаны</translation> + </message> </context> <context> <name>AskPassphraseDialog</name> @@ -60,6 +131,90 @@ <source>Repeat new passphrase</source> <translation>Паўтарыце новую кодавую фразу</translation> </message> + <message> + <source>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>.</source> + <translation>Увядзіце новы пароль для гаманца.<br/>Парольная фраза павинна складацца<b> не меньш чым з дзесяці сімвалаў</b>, ці <b>больш чым з васьмі слоў</b>.</translation> + </message> + <message> + <source>Encrypt wallet</source> + <translation>Зашыфраваць гаманец.</translation> + </message> + <message> + <source>This operation needs your wallet passphrase to unlock the wallet.</source> + <translation>Гэтая аперацыя патрабуе кодавую фразу, каб рзблакаваць гаманец.</translation> + </message> + <message> + <source>Unlock wallet</source> + <translation>Разблакаваць гаманец</translation> + </message> + <message> + <source>This operation needs your wallet passphrase to decrypt the wallet.</source> + <translation>Гэтая аперацыя патрабуе пароль каб расшыфраваць гаманец.</translation> + </message> + <message> + <source>Decrypt wallet</source> + <translation>Рачшыфраваць гаманец</translation> + </message> + <message> + <source>Change passphrase</source> + <translation>Змяніць пароль</translation> + </message> + <message> + <source>Enter the old passphrase and new passphrase to the wallet.</source> + <translation>Увядзіце стары пароль і новы пароль для гаманца.</translation> + </message> + <message> + <source>Confirm wallet encryption</source> + <translation>Пацвердзіце шыфраванне гаманца</translation> + </message> + <message> + <source>Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR BITCOINS</b>!</source> + <translation>Увага: калі вы зашыфруеце свой гаманец і страціце парольную фразу, то <b>СТРАЦІЦЕ ЎСЕ СВАЕ БІТКОЙНЫ</b>!</translation> + </message> + <message> + <source>Are you sure you wish to encrypt your wallet?</source> + <translation>Ці ўпэўненыя вы, што жадаеце зашыфраваць свой гаманец?</translation> + </message> + <message> + <source>Wallet encrypted</source> + <translation>Гаманец зашыфраваны</translation> + </message> + <message> + <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source> + <translation>ВАЖНА: Усе папярэднія копіі гаманца варта замяніць новым зашыфраваным файлам. У мэтах бяспекі папярэднія копіі незашыфраванага файла-гаманца стануць неўжывальнымі, калі вы станеце карыстацца новым зашыфраваным гаманцом.</translation> + </message> + <message> + <source>Wallet encryption failed</source> + <translation>Шыфраванне гаманца няўдалае</translation> + </message> + <message> + <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source> + <translation>Шыфраванне гаманца не адбылося з-за ўнутранай памылкі. Гаманец незашыфраваны.</translation> + </message> + <message> + <source>The supplied passphrases do not match.</source> + <translation>Уведдзеныя паролі не супадаюць</translation> + </message> + <message> + <source>Wallet unlock failed</source> + <translation>Разблакаванне гаманца няўдалае</translation> + </message> + <message> + <source>The passphrase entered for the wallet decryption was incorrect.</source> + <translation>Уведзены пароль для расшыфравання гаманца памылковы</translation> + </message> + <message> + <source>Wallet decryption failed</source> + <translation>Расшыфраванне гаманца няўдалае</translation> + </message> + <message> + <source>Wallet passphrase was successfully changed.</source> + <translation>Парольная фраза гаманца паспяхова зменена.</translation> + </message> + <message> + <source>Warning: The Caps Lock key is on!</source> + <translation>Увага: Caps Lock уключаны!</translation> + </message> </context> <context> <name>BanTableModel</name> @@ -234,38 +389,6 @@ <source>&Command-line options</source> <translation>Опцыі каманднага радка</translation> </message> - <message numerus="yes"> - <source>%n active connection(s) to Bitcoin network</source> - <translation><numerusform>%n актыўнае злучэнне з сецівам Bitcoin</numerusform><numerusform>%n актыўных злучэнняў з сецівам Bitcoin</numerusform><numerusform>%n актыўных злучэнняў з сецівам Bitcoin</numerusform><numerusform>%n актыўных злучэнняў з сецівам Bitcoin</numerusform></translation> - </message> - <message> - <source>No block source available...</source> - <translation>Крыніца блокаў недасяжная...</translation> - </message> - <message numerus="yes"> - <source>Processed %n block(s) of transaction history.</source> - <translation><numerusform>Апрацаваны %n блок гісторыі транзакцый.</numerusform><numerusform>Апрацавана %n блокі гісторыі транзакцый.</numerusform><numerusform>Апрацавана %n блокаў гісторыі транзакцый.</numerusform><numerusform>Апрацавана %n блокаў гісторыі транзакцый.</numerusform></translation> - </message> - <message numerus="yes"> - <source>%n hour(s)</source> - <translation><numerusform>%n гадзіна</numerusform><numerusform>%n гадзіны</numerusform><numerusform>%n гадзін</numerusform><numerusform>%n гадзін</numerusform></translation> - </message> - <message numerus="yes"> - <source>%n day(s)</source> - <translation><numerusform>%n дзень</numerusform><numerusform>%n дні</numerusform><numerusform>%n дзён</numerusform><numerusform>%n дзён</numerusform></translation> - </message> - <message numerus="yes"> - <source>%n week(s)</source> - <translation><numerusform>%n тыдзень</numerusform><numerusform>%n тыдні</numerusform><numerusform>%n тыдняў</numerusform><numerusform>%n тыдняў</numerusform></translation> - </message> - <message> - <source>%1 and %2</source> - <translation>%1 і %2</translation> - </message> - <message numerus="yes"> - <source>%n year(s)</source> - <translation><numerusform>%n год</numerusform><numerusform>%n гады</numerusform><numerusform>%n гадоў</numerusform><numerusform>%n гадоў</numerusform></translation> - </message> <message> <source>%1 behind</source> <translation>%1 таму</translation> @@ -344,7 +467,7 @@ <source>Wallet is <b>encrypted</b> and currently <b>locked</b></source> <translation>Гаманец <b>зашыфраваны</b> і зараз <b>заблакаваны</b></translation> </message> -</context> + </context> <context> <name>CoinControlDialog</name> <message> @@ -360,10 +483,6 @@ <translation>Колькасць:</translation> </message> <message> - <source>Priority:</source> - <translation>Прыярытэт:</translation> - </message> - <message> <source>Fee:</source> <translation>Камісія:</translation> </message> @@ -412,10 +531,62 @@ <translation>Пацверджана</translation> </message> <message> - <source>Priority</source> - <translation>Прыярытэт</translation> + <source>Copy address</source> + <translation>Капіяваць адрас</translation> </message> -</context> + <message> + <source>Copy label</source> + <translation>Капіяваць пазнаку</translation> + </message> + <message> + <source>Copy amount</source> + <translation>Капіяваць колькасць</translation> + </message> + <message> + <source>Copy transaction ID</source> + <translation>Капіяваць ID транзакцыі</translation> + </message> + <message> + <source>Lock unspent</source> + <translation>Замкнуць непатрачанае</translation> + </message> + <message> + <source>Unlock unspent</source> + <translation>Адамкнуць непатрачанае</translation> + </message> + <message> + <source>Copy quantity</source> + <translation>Капіяваць колькасць</translation> + </message> + <message> + <source>Copy fee</source> + <translation>Капіяваць камісію</translation> + </message> + <message> + <source>Copy after fee</source> + <translation>Капіяваць з выняткам камісіі</translation> + </message> + <message> + <source>Copy bytes</source> + <translation>Капіяваць байты</translation> + </message> + <message> + <source>Copy dust</source> + <translation>Капіяваць пыл</translation> + </message> + <message> + <source>yes</source> + <translation>так</translation> + </message> + <message> + <source>no</source> + <translation>не</translation> + </message> + <message> + <source>(no label)</source> + <translation>непазначаны</translation> + </message> + </context> <context> <name>EditAddressDialog</name> <message> @@ -430,6 +601,34 @@ <source>&Address</source> <translation>Адрас</translation> </message> + <message> + <source>New receiving address</source> + <translation>Новы адрас для атрымання</translation> + </message> + <message> + <source>New sending address</source> + <translation>Новы адрас для дасылання</translation> + </message> + <message> + <source>Edit receiving address</source> + <translation>Рэдагаваць адрас прымання</translation> + </message> + <message> + <source>Edit sending address</source> + <translation>Рэдагаваць адрас дасылання</translation> + </message> + <message> + <source>The entered address "%1" is already in the address book.</source> + <translation>Уведзены адрас "%1" ужо ў кніге адрасоў</translation> + </message> + <message> + <source>Could not unlock wallet.</source> + <translation>Немагчыма разблакаваць гаманец</translation> + </message> + <message> + <source>New key generation failed.</source> + <translation>Генерацыя новага ключа няўдалая</translation> + </message> </context> <context> <name>FreespaceChecker</name> @@ -464,6 +663,10 @@ <source>command-line options</source> <translation>опцыі каманднага радка</translation> </message> + <message> + <source>Start minimized</source> + <translation>Стартаваць ммінімізаванай</translation> + </message> </context> <context> <name>Intro</name> @@ -475,15 +678,14 @@ <source>Error</source> <translation>Памылка</translation> </message> - <message numerus="yes"> - <source>%n GB of free space available</source> - <translation><numerusform>%n Гб вольнага месца даступна</numerusform><numerusform>%n Гб вольнага месца даступна</numerusform><numerusform>%n Гб вольнага месца даступна</numerusform><numerusform>%n Гб вольнага месца даступна</numerusform></translation> - </message> - <message numerus="yes"> - <source>(of %n GB needed)</source> - <translation><numerusform>(з %n Гб патрэбна)</numerusform><numerusform>(з %n Гб патрэбна)</numerusform><numerusform>(з %n Гб патрэбна)</numerusform><numerusform>(з %n Гб патрэбна)</numerusform></translation> + </context> +<context> + <name>ModalOverlay</name> + <message> + <source>Form</source> + <translation>Форма</translation> </message> -</context> + </context> <context> <name>OpenURIDialog</name> <message> @@ -514,6 +716,9 @@ </message> </context> <context> + <name>PaymentServer</name> + </context> +<context> <name>PeerTableModel</name> </context> <context> @@ -522,6 +727,16 @@ <source>Amount</source> <translation>Колькасць</translation> </message> + <message> + <source>%1 and %2</source> + <translation>%1 і %2</translation> + </message> + </context> +<context> + <name>QObject::QObject</name> + </context> +<context> + <name>QRImageWidget</name> </context> <context> <name>RPCConsole</name> @@ -544,13 +759,56 @@ <source>&Label:</source> <translation>Метка:</translation> </message> - </context> + <message> + <source>Copy label</source> + <translation>Капіяваць пазнаку</translation> + </message> + <message> + <source>Copy amount</source> + <translation>Капіяваць колькасць</translation> + </message> +</context> <context> <name>ReceiveRequestDialog</name> <message> <source>Copy &Address</source> <translation>Капіяваць адрас</translation> </message> + <message> + <source>Address</source> + <translation>Адрас</translation> + </message> + <message> + <source>Amount</source> + <translation>Колькасць</translation> + </message> + <message> + <source>Label</source> + <translation>Метка</translation> + </message> + <message> + <source>Message</source> + <translation>Паведамленне</translation> + </message> + </context> +<context> + <name>RecentRequestsTableModel</name> + <message> + <source>Date</source> + <translation>Дата</translation> + </message> + <message> + <source>Label</source> + <translation>Метка</translation> + </message> + <message> + <source>Message</source> + <translation>Паведамленне</translation> + </message> + <message> + <source>(no label)</source> + <translation>непазначаны</translation> + </message> </context> <context> <name>SendCoinsDialog</name> @@ -575,10 +833,6 @@ <translation>Колькасць:</translation> </message> <message> - <source>Priority:</source> - <translation>Прыярытэт:</translation> - </message> - <message> <source>Fee:</source> <translation>Камісія:</translation> </message> @@ -602,7 +856,43 @@ <source>Confirm the send action</source> <translation>Пацвердзіць дасыланне</translation> </message> - </context> + <message> + <source>Copy quantity</source> + <translation>Капіяваць колькасць</translation> + </message> + <message> + <source>Copy amount</source> + <translation>Капіяваць колькасць</translation> + </message> + <message> + <source>Copy fee</source> + <translation>Капіяваць камісію</translation> + </message> + <message> + <source>Copy after fee</source> + <translation>Капіяваць з выняткам камісіі</translation> + </message> + <message> + <source>Copy bytes</source> + <translation>Капіяваць байты</translation> + </message> + <message> + <source>Copy dust</source> + <translation>Капіяваць пыл</translation> + </message> + <message> + <source>Confirm send coins</source> + <translation>Пацвердзіць дасыланне манет</translation> + </message> + <message> + <source>The amount to pay must be larger than 0.</source> + <translation>Велічыня плацяжу мае быць больш за 0.</translation> + </message> + <message> + <source>(no label)</source> + <translation>непазначаны</translation> + </message> +</context> <context> <name>SendCoinsEntry</name> <message> @@ -641,8 +931,15 @@ <source>Memo:</source> <translation>Памятка:</translation> </message> + <message> + <source>Enter a label for this address to add it to your address book</source> + <translation>Увядзіце пазнаку гэтаму адрасу, каб дадаць яго ў адрасную кнігу</translation> + </message> </context> <context> + <name>SendConfirmationDialog</name> + </context> +<context> <name>ShutdownWindow</name> </context> <context> @@ -675,16 +972,274 @@ </message> </context> <context> + <name>TransactionDesc</name> + <message> + <source>%1/offline</source> + <translation>%1/offline</translation> + </message> + <message> + <source>%1/unconfirmed</source> + <translation>%1/непацверджана</translation> + </message> + <message> + <source>%1 confirmations</source> + <translation>%1 пацверджанняў</translation> + </message> + <message> + <source>Status</source> + <translation>Статус</translation> + </message> + <message> + <source>, has not been successfully broadcast yet</source> + <translation>, пакуль не было паспяхова транслявана</translation> + </message> + <message> + <source>Date</source> + <translation>Дата</translation> + </message> + <message> + <source>unknown</source> + <translation>невядома</translation> + </message> + <message> + <source>Message</source> + <translation>Паведамленне</translation> + </message> + <message> + <source>Comment</source> + <translation>Каментар</translation> + </message> + <message> + <source>Transaction ID</source> + <translation>ID</translation> + </message> + <message> + <source>Amount</source> + <translation>Колькасць</translation> + </message> + </context> +<context> <name>TransactionDescDialog</name> <message> <source>This pane shows a detailed description of the transaction</source> <translation>Гэтая панэль паказвае дэтальнае апісанне транзакцыі</translation> </message> + </context> +<context> + <name>TransactionTableModel</name> + <message> + <source>Date</source> + <translation>Дата</translation> + </message> + <message> + <source>Type</source> + <translation>Тып</translation> + </message> + <message> + <source>Label</source> + <translation>Метка</translation> + </message> + <message> + <source>Confirmed (%1 confirmations)</source> + <translation>Пацверджана (%1 пацверджанняў)</translation> + </message> + <message> + <source>This block was not received by any other nodes and will probably not be accepted!</source> + <translation>Гэты блок не быў прыняты іншымі вузламі і магчыма не будзе ўхвалены!</translation> + </message> + <message> + <source>Generated but not accepted</source> + <translation>Згенеравана, але не прынята</translation> + </message> + <message> + <source>Received with</source> + <translation>Прынята з</translation> + </message> + <message> + <source>Received from</source> + <translation>Прынята ад</translation> + </message> + <message> + <source>Sent to</source> + <translation>Даслана да</translation> + </message> + <message> + <source>Payment to yourself</source> + <translation>Плацёж самому сабе</translation> + </message> + <message> + <source>Mined</source> + <translation>Здабыта</translation> + </message> + <message> + <source>(n/a)</source> + <translation>(n/a)</translation> + </message> + <message> + <source>(no label)</source> + <translation>непазначаны</translation> + </message> + <message> + <source>Transaction status. Hover over this field to show number of confirmations.</source> + <translation>Статус транзакцыі. Навядзіце курсар на гэтае поле, каб паказаць колькасць пацверджанняў.</translation> + </message> + <message> + <source>Date and time that the transaction was received.</source> + <translation>Дата і час, калі транзакцыя была прынята.</translation> + </message> + <message> + <source>Type of transaction.</source> + <translation>Тып транзакцыі</translation> + </message> + <message> + <source>Amount removed from or added to balance.</source> + <translation>Колькасць аднятая ці даданая да балансу.</translation> + </message> +</context> +<context> + <name>TransactionView</name> + <message> + <source>All</source> + <translation>Усё</translation> + </message> + <message> + <source>Today</source> + <translation>Сёння</translation> + </message> + <message> + <source>This week</source> + <translation>Гэты тыдзень</translation> + </message> + <message> + <source>This month</source> + <translation>Гэты месяц</translation> + </message> + <message> + <source>Last month</source> + <translation>Мінулы месяц</translation> + </message> + <message> + <source>This year</source> + <translation>Гэты год</translation> + </message> + <message> + <source>Range...</source> + <translation>Прамежак...</translation> + </message> + <message> + <source>Received with</source> + <translation>Прынята з</translation> + </message> + <message> + <source>Sent to</source> + <translation>Даслана да</translation> + </message> + <message> + <source>To yourself</source> + <translation>Да сябе</translation> + </message> + <message> + <source>Mined</source> + <translation>Здабыта</translation> + </message> + <message> + <source>Other</source> + <translation>Іншыя</translation> + </message> + <message> + <source>Enter address or label to search</source> + <translation>Увядзіце адрас ці пазнаку для пошуку</translation> + </message> + <message> + <source>Min amount</source> + <translation>Мін. колькасць</translation> + </message> + <message> + <source>Copy address</source> + <translation>Капіяваць адрас</translation> + </message> + <message> + <source>Copy label</source> + <translation>Капіяваць пазнаку</translation> + </message> + <message> + <source>Copy amount</source> + <translation>Капіяваць колькасць</translation> + </message> + <message> + <source>Copy transaction ID</source> + <translation>Капіяваць ID транзакцыі</translation> + </message> + <message> + <source>Edit label</source> + <translation>Рэдагаваць пазнаку</translation> + </message> + <message> + <source>Comma separated file (*.csv)</source> + <translation>Коскамі падзелены файл (*.csv)</translation> + </message> + <message> + <source>Confirmed</source> + <translation>Пацверджана</translation> + </message> + <message> + <source>Date</source> + <translation>Дата</translation> + </message> + <message> + <source>Type</source> + <translation>Тып</translation> + </message> + <message> + <source>Label</source> + <translation>Метка</translation> + </message> + <message> + <source>Address</source> + <translation>Адрас</translation> + </message> + <message> + <source>ID</source> + <translation>ID</translation> + </message> + <message> + <source>Exporting Failed</source> + <translation>Экспартаванне няўдалае</translation> + </message> + <message> + <source>Range:</source> + <translation>Прамежак:</translation> + </message> + <message> + <source>to</source> + <translation>да</translation> + </message> </context> <context> <name>UnitDisplayStatusBarControl</name> </context> <context> + <name>WalletFrame</name> + </context> +<context> + <name>WalletModel</name> + <message> + <source>Send Coins</source> + <translation>Даслаць Манеты</translation> + </message> +</context> +<context> + <name>WalletView</name> + <message> + <source>&Export</source> + <translation>Экспарт</translation> + </message> + <message> + <source>Export the data in the current tab to a file</source> + <translation>Экспартаваць гэтыя звесткі у файл</translation> + </message> + </context> +<context> <name>bitcoin-core</name> <message> <source>Options:</source> diff --git a/src/qt/locale/bitcoin_bg.ts b/src/qt/locale/bitcoin_bg.ts index acb60cf41c..c571698304 100644 --- a/src/qt/locale/bitcoin_bg.ts +++ b/src/qt/locale/bitcoin_bg.ts @@ -41,6 +41,77 @@ <source>&Delete</source> <translation>&Изтриване</translation> </message> + <message> + <source>Choose the address to send coins to</source> + <translation>Изберете адрес, на който да се изпращат монети</translation> + </message> + <message> + <source>Choose the address to receive coins with</source> + <translation>Изберете адрес, на който ще получавате монети</translation> + </message> + <message> + <source>C&hoose</source> + <translation>Избери</translation> + </message> + <message> + <source>Sending addresses</source> + <translation>Адреси за изпращане</translation> + </message> + <message> + <source>Receiving addresses</source> + <translation>Адреси за получаване</translation> + </message> + <message> + <source>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source> + <translation>Това са адресите на получателите на плащания. Винаги проверявайте размера на сумата и адреса на получателя, преди да изпратите монети.</translation> + </message> + <message> + <source>These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction.</source> + <translation>Това са Вашите Биткойн адреси,благодарение на които ще получавате плащания.Препоръчително е да използвате нови адреси за получаване на всяка транзакция.</translation> + </message> + <message> + <source>&Copy Address</source> + <translation>&Копирай адрес</translation> + </message> + <message> + <source>Copy &Label</source> + <translation>Копирай &име</translation> + </message> + <message> + <source>&Edit</source> + <translation>&Редактирай</translation> + </message> + <message> + <source>Export Address List</source> + <translation>Изнасяне на списъка с адреси</translation> + </message> + <message> + <source>Comma separated file (*.csv)</source> + <translation>CSV файл (*.csv)</translation> + </message> + <message> + <source>Exporting Failed</source> + <translation>Грешка при изнасянето</translation> + </message> + <message> + <source>There was an error trying to save the address list to %1. Please try again.</source> + <translation>Възникна грешка при опита за запазване на списъка с адреси в %1.Моля опитайте отново.</translation> + </message> +</context> +<context> + <name>AddressTableModel</name> + <message> + <source>Label</source> + <translation>Име</translation> + </message> + <message> + <source>Address</source> + <translation>Адрес</translation> + </message> + <message> + <source>(no label)</source> + <translation>(без име)</translation> + </message> </context> <context> <name>AskPassphraseDialog</name> @@ -60,6 +131,90 @@ <source>Repeat new passphrase</source> <translation>Въведете новата парола повторно</translation> </message> + <message> + <source>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>.</source> + <translation>Въведете новата парола към портфейла.<br/>Моля ползвайте парола съставена от <b>десет или повече произволни символа</b>, или <b>осем или повече думи</b>.</translation> + </message> + <message> + <source>Encrypt wallet</source> + <translation>Шифриране на портфейла</translation> + </message> + <message> + <source>This operation needs your wallet passphrase to unlock the wallet.</source> + <translation>Тази операция изисква Вашата парола за отключване на портфейла.</translation> + </message> + <message> + <source>Unlock wallet</source> + <translation>Отключване на портфейла</translation> + </message> + <message> + <source>This operation needs your wallet passphrase to decrypt the wallet.</source> + <translation>Тази операция изисква Вашата парола за дешифриране на портфейла.</translation> + </message> + <message> + <source>Decrypt wallet</source> + <translation>Дешифриране на портфейла</translation> + </message> + <message> + <source>Change passphrase</source> + <translation>Смяна на паролата</translation> + </message> + <message> + <source>Enter the old passphrase and new passphrase to the wallet.</source> + <translation>Въведете старата парола и новата прола към портфейла.</translation> + </message> + <message> + <source>Confirm wallet encryption</source> + <translation>Потвърдете на шифрирането на портфейла</translation> + </message> + <message> + <source>Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR BITCOINS</b>!</source> + <translation>ВНИМАНИЕ: Ако шифрирате вашият портфейл и изгубите паролата си, <b>ЩЕ ИЗГУБИТЕ ВСИЧКИТЕ СИ БИТКОИНИ</b>!</translation> + </message> + <message> + <source>Are you sure you wish to encrypt your wallet?</source> + <translation>Наистина ли желаете да шифрирате портфейла си?</translation> + </message> + <message> + <source>Wallet encrypted</source> + <translation>Портфейлът е шифриран</translation> + </message> + <message> + <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source> + <translation>ВАЖНО: Всички стари запазвания, които сте направили на Вашият портфейл трябва да замените с запазване на новополучения, шифриран портфейл. От съображения за сигурност, предишните запазвания на нешифрирани портфейли ще станат неизползваеми веднага, щом започнете да използвате новият, шифриран портфейл.</translation> + </message> + <message> + <source>Wallet encryption failed</source> + <translation>Шифрирането беше неуспешно</translation> + </message> + <message> + <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source> + <translation>Шифрирането на портфейла беше неуспешно, поради софтуерен проблем. Портфейлът не е шифриран.</translation> + </message> + <message> + <source>The supplied passphrases do not match.</source> + <translation>Паролите не съвпадат</translation> + </message> + <message> + <source>Wallet unlock failed</source> + <translation>Неуспешно отключване на портфейла</translation> + </message> + <message> + <source>The passphrase entered for the wallet decryption was incorrect.</source> + <translation>Паролата въведена за дешифриране на портфейла е грешна.</translation> + </message> + <message> + <source>Wallet decryption failed</source> + <translation>Дешифрирането на портфейла беше неуспешно</translation> + </message> + <message> + <source>Wallet passphrase was successfully changed.</source> + <translation>Паролата на портфейла беше променена успешно.</translation> + </message> + <message> + <source>Warning: The Caps Lock key is on!</source> + <translation>Внимание: Caps Lock (главни букви) е включен.</translation> + </message> </context> <context> <name>BanTableModel</name> @@ -258,10 +413,6 @@ <source>&Command-line options</source> <translation>&Налични команди</translation> </message> - <message numerus="yes"> - <source>%n active connection(s) to Bitcoin network</source> - <translation><numerusform>%n активна връзка към Биткойн мрежата</numerusform><numerusform>%n активни връзки към Биткойн мрежата</numerusform></translation> - </message> <message> <source>Indexing blocks on disk...</source> <translation>Индексиране на блокове на диска...</translation> @@ -271,34 +422,6 @@ <translation>Обработване на блокове на диска...</translation> </message> <message> - <source>No block source available...</source> - <translation>Липсва източник на блоковете...</translation> - </message> - <message numerus="yes"> - <source>Processed %n block(s) of transaction history.</source> - <translation><numerusform>Преработен %n блок от историята с транзакции.</numerusform><numerusform>Преработени %n блокове от историята с транзакции.</numerusform></translation> - </message> - <message numerus="yes"> - <source>%n hour(s)</source> - <translation><numerusform>%n час</numerusform><numerusform>%n часа</numerusform></translation> - </message> - <message numerus="yes"> - <source>%n day(s)</source> - <translation><numerusform>%n ден</numerusform><numerusform>%n дни</numerusform></translation> - </message> - <message numerus="yes"> - <source>%n week(s)</source> - <translation><numerusform>%n седмица</numerusform><numerusform>%n седмици</numerusform></translation> - </message> - <message> - <source>%1 and %2</source> - <translation>%1 и %2</translation> - </message> - <message numerus="yes"> - <source>%n year(s)</source> - <translation><numerusform>%n година</numerusform><numerusform>%n години</numerusform></translation> - </message> - <message> <source>%1 behind</source> <translation>%1 зад</translation> </message> @@ -384,7 +507,7 @@ <source>Wallet is <b>encrypted</b> and currently <b>locked</b></source> <translation>Портфейлът е <b>криптиран</b> и <b>заключен</b></translation> </message> -</context> + </context> <context> <name>CoinControlDialog</name> <message> @@ -404,10 +527,6 @@ <translation>Сума:</translation> </message> <message> - <source>Priority:</source> - <translation>Приоритет:</translation> - </message> - <message> <source>Fee:</source> <translation>Такса:</translation> </message> @@ -460,8 +579,76 @@ <translation>Потвърдени</translation> </message> <message> - <source>Priority</source> - <translation>Приоритет</translation> + <source>Copy address</source> + <translation>Копирай адрес</translation> + </message> + <message> + <source>Copy label</source> + <translation>Копирай име</translation> + </message> + <message> + <source>Copy amount</source> + <translation>Копирай сума</translation> + </message> + <message> + <source>Copy transaction ID</source> + <translation>Копирай транзакция с ID</translation> + </message> + <message> + <source>Lock unspent</source> + <translation>Заключване на неизхарченото</translation> + </message> + <message> + <source>Unlock unspent</source> + <translation>Отключване на неизхарченото</translation> + </message> + <message> + <source>Copy quantity</source> + <translation>Копиране на количеството</translation> + </message> + <message> + <source>Copy fee</source> + <translation>Копиране на данък добавена стойност</translation> + </message> + <message> + <source>Copy after fee</source> + <translation>Копиране след прилагане на данък добавена стойност</translation> + </message> + <message> + <source>Copy bytes</source> + <translation>Копиране на байтовете</translation> + </message> + <message> + <source>Copy dust</source> + <translation>Копирай прахта:</translation> + </message> + <message> + <source>Copy change</source> + <translation>Копирай рестото</translation> + </message> + <message> + <source>(%1 locked)</source> + <translation>(%1 заключен)</translation> + </message> + <message> + <source>yes</source> + <translation>да</translation> + </message> + <message> + <source>no</source> + <translation>не</translation> + </message> + <message> + <source>(no label)</source> + <translation>(без име)</translation> + </message> + <message> + <source>change from %1 (%2)</source> + <translation>ресто от %1 (%2)</translation> + </message> + <message> + <source>(change)</source> + <translation>(промени)</translation> </message> </context> <context> @@ -486,6 +673,38 @@ <source>&Address</source> <translation>&Адрес</translation> </message> + <message> + <source>New receiving address</source> + <translation>Нов адрес за получаване</translation> + </message> + <message> + <source>New sending address</source> + <translation>Нов адрес за изпращане</translation> + </message> + <message> + <source>Edit receiving address</source> + <translation>Редактиране на адрес за получаване</translation> + </message> + <message> + <source>Edit sending address</source> + <translation>Редактиране на адрес за изпращане</translation> + </message> + <message> + <source>The entered address "%1" is not a valid Bitcoin address.</source> + <translation>"%1" не е валиден Биткоин адрес.</translation> + </message> + <message> + <source>The entered address "%1" is already in the address book.</source> + <translation>Вече има адрес "%1" в списъка с адреси.</translation> + </message> + <message> + <source>Could not unlock wallet.</source> + <translation>Отключването на портфейла беше неуспешно.</translation> + </message> + <message> + <source>New key generation failed.</source> + <translation>Създаването на ключ беше неуспешно.</translation> + </message> </context> <context> <name>FreespaceChecker</name> @@ -587,15 +806,22 @@ <source>Error</source> <translation>Грешка</translation> </message> - <message numerus="yes"> - <source>%n GB of free space available</source> - <translation><numerusform>%n GB свободно пространство на разположение</numerusform><numerusform>%n GB свободно пространство на разположение</numerusform></translation> + </context> +<context> + <name>ModalOverlay</name> + <message> + <source>Form</source> + <translation>Формуляр</translation> + </message> + <message> + <source>Last block time</source> + <translation>Време на последния блок</translation> </message> - <message numerus="yes"> - <source>(of %n GB needed)</source> - <translation><numerusform>(%n GB е нужен)</numerusform><numerusform>(%n GB са нужни)</numerusform></translation> + <message> + <source>Hide</source> + <translation>Скрий</translation> </message> -</context> + </context> <context> <name>OpenURIDialog</name> <message> @@ -830,17 +1056,80 @@ </message> </context> <context> - <name>PeerTableModel</name> + <name>PaymentServer</name> <message> - <source>User Agent</source> - <translation>Клиент на потребителя</translation> + <source>Payment request error</source> + <translation>Възникна грешка по време назаявката за плащане</translation> </message> <message> - <source>Ping Time</source> - <translation>Време за отговор</translation> + <source>Cannot start bitcoin: click-to-pay handler</source> + <translation>Биткойн не можe да се стартира: click-to-pay handler</translation> + </message> + <message> + <source>URI handling</source> + <translation>Справяне с URI</translation> + </message> + <message> + <source>Invalid payment address %1</source> + <translation>Невалиден адрес на плащане %1</translation> + </message> + <message> + <source>Payment request file handling</source> + <translation>Файл за справяне със заявки</translation> + </message> + <message> + <source>Payment request rejected</source> + <translation>Заявката за плащане беше отхвърлена</translation> + </message> + <message> + <source>Payment request network doesn't match client network.</source> + <translation>Мрежата от която се извършва заявката за плащане не съвпада с мрежата на клиента.</translation> + </message> + <message> + <source>Payment request expired.</source> + <translation>Заявката за плащане е изтекла.</translation> + </message> + <message> + <source>Invalid payment request.</source> + <translation>Невалидна заявка за плащане.</translation> + </message> + <message> + <source>Requested payment amount of %1 is too small (considered dust).</source> + <translation>Заявената сума за плащане: %1 е твърде малка (счита се за отпадък)</translation> + </message> + <message> + <source>Refund from %1</source> + <translation>Възстановяване на сума от %1</translation> + </message> + <message> + <source>Payment request %1 is too large (%2 bytes, allowed %3 bytes).</source> + <translation>Заявката за плащане %1 е твърде голям (%2 байта, позволени %3 байта).</translation> + </message> + <message> + <source>Error communicating with %1: %2</source> + <translation>Грешка при комуникацията с %1: %2</translation> + </message> + <message> + <source>Bad response from server %1</source> + <translation>Възникна проблем при свързването със сървър %1</translation> + </message> + <message> + <source>Network request error</source> + <translation>Грешка в мрежата по време на заявката</translation> + </message> + <message> + <source>Payment acknowledged</source> + <translation>Плащането е прието</translation> </message> </context> <context> + <name>PeerTableModel</name> + <message> + <source>User Agent</source> + <translation>Клиент на потребителя</translation> + </message> + </context> +<context> <name>QObject</name> <message> <source>Amount</source> @@ -878,6 +1167,32 @@ <source>%1 ms</source> <translation>%1 милисекунда</translation> </message> + <message> + <source>%1 and %2</source> + <translation>%1 и %2</translation> + </message> + </context> +<context> + <name>QObject::QObject</name> + </context> +<context> + <name>QRImageWidget</name> + <message> + <source>&Save Image...</source> + <translation>&Запиши изображение...</translation> + </message> + <message> + <source>&Copy Image</source> + <translation>&Копирай изображение</translation> + </message> + <message> + <source>Save QR Code</source> + <translation>Запази QR Код</translation> + </message> + <message> + <source>PNG Image (*.png)</source> + <translation>PNG Изображение (*.png)</translation> + </message> </context> <context> <name>RPCConsole</name> @@ -1112,6 +1427,18 @@ <source>Remove</source> <translation>Премахване</translation> </message> + <message> + <source>Copy label</source> + <translation>Копирай име</translation> + </message> + <message> + <source>Copy message</source> + <translation>Копиране на съобщението</translation> + </message> + <message> + <source>Copy amount</source> + <translation>Копирай сума</translation> + </message> </context> <context> <name>ReceiveRequestDialog</name> @@ -1131,8 +1458,59 @@ <source>&Save Image...</source> <translation>&Запиши изображение...</translation> </message> + <message> + <source>Request payment to %1</source> + <translation>Изискване на плащане от %1</translation> + </message> + <message> + <source>Payment information</source> + <translation>Данни за плащането</translation> + </message> + <message> + <source>Address</source> + <translation>Адрес</translation> + </message> + <message> + <source>Amount</source> + <translation>Сума</translation> + </message> + <message> + <source>Label</source> + <translation>Име</translation> + </message> + <message> + <source>Message</source> + <translation>Съобщение</translation> + </message> + <message> + <source>Error encoding URI into QR Code.</source> + <translation>Грешка при създаването на QR Code от URI.</translation> + </message> </context> <context> + <name>RecentRequestsTableModel</name> + <message> + <source>Date</source> + <translation>Дата</translation> + </message> + <message> + <source>Label</source> + <translation>Име</translation> + </message> + <message> + <source>Message</source> + <translation>Съобщение</translation> + </message> + <message> + <source>(no label)</source> + <translation>(без име)</translation> + </message> + <message> + <source>(no message)</source> + <translation>(без съобщение)</translation> + </message> + </context> +<context> <name>SendCoinsDialog</name> <message> <source>Send Coins</source> @@ -1163,10 +1541,6 @@ <translation>Сума:</translation> </message> <message> - <source>Priority:</source> - <translation>Приоритет:</translation> - </message> - <message> <source>Fee:</source> <translation>Такса:</translation> </message> @@ -1211,10 +1585,6 @@ <translation>По избор:</translation> </message> <message> - <source>Confirmation time:</source> - <translation>Време за потвърждение:</translation> - </message> - <message> <source>normal</source> <translation>нормален</translation> </message> @@ -1254,6 +1624,82 @@ <source>S&end</source> <translation>И&зпрати</translation> </message> + <message> + <source>Copy quantity</source> + <translation>Копиране на количеството</translation> + </message> + <message> + <source>Copy amount</source> + <translation>Копирай сума</translation> + </message> + <message> + <source>Copy fee</source> + <translation>Копиране на данък добавена стойност</translation> + </message> + <message> + <source>Copy after fee</source> + <translation>Копиране след прилагане на данък добавена стойност</translation> + </message> + <message> + <source>Copy bytes</source> + <translation>Копиране на байтовете</translation> + </message> + <message> + <source>Copy dust</source> + <translation>Копирай прахта:</translation> + </message> + <message> + <source>Copy change</source> + <translation>Копирай рестото</translation> + </message> + <message> + <source>Are you sure you want to send?</source> + <translation>Наистина ли искате да изпратите?</translation> + </message> + <message> + <source>added as transaction fee</source> + <translation>добавено като такса за транзакция</translation> + </message> + <message> + <source>or</source> + <translation>или</translation> + </message> + <message> + <source>Confirm send coins</source> + <translation>Потвърждаване</translation> + </message> + <message> + <source>The amount to pay must be larger than 0.</source> + <translation>Сумата трябва да е по-голяма от 0.</translation> + </message> + <message> + <source>The amount exceeds your balance.</source> + <translation>Сумата надвишава текущия баланс</translation> + </message> + <message> + <source>The total exceeds your balance when the %1 transaction fee is included.</source> + <translation>Сумата при добавяне на данък добавена стойност по %1 транзакцията надвишава сумата по вашата сметка.</translation> + </message> + <message> + <source>Transaction creation failed!</source> + <translation>Грешка при създаването на транзакция!</translation> + </message> + <message> + <source>Payment request expired.</source> + <translation>Заявката за плащане е изтекла.</translation> + </message> + <message> + <source>Warning: Invalid Bitcoin address</source> + <translation>Внимание: Невалиден Биткойн адрес</translation> + </message> + <message> + <source>Warning: Unknown change address</source> + <translation>Внимание:Неизвестен адрес за промяна</translation> + </message> + <message> + <source>(no label)</source> + <translation>(без име)</translation> + </message> </context> <context> <name>SendCoinsEntry</name> @@ -1305,6 +1751,17 @@ <source>Memo:</source> <translation>Бележка:</translation> </message> + <message> + <source>Enter a label for this address to add it to your address book</source> + <translation>Въведете име за този адрес, за да го добавите в списъка с адреси</translation> + </message> +</context> +<context> + <name>SendConfirmationDialog</name> + <message> + <source>Yes</source> + <translation>Да</translation> + </message> </context> <context> <name>ShutdownWindow</name> @@ -1375,7 +1832,59 @@ <source>Verify &Message</source> <translation>Потвърди &съобщението</translation> </message> - </context> + <message> + <source>Click "Sign Message" to generate signature</source> + <translation>Натиснете "Подписване на съобщение" за да създадете подпис</translation> + </message> + <message> + <source>The entered address is invalid.</source> + <translation>Въведеният адрес е невалиден.</translation> + </message> + <message> + <source>Please check the address and try again.</source> + <translation>Моля проверете адреса и опитайте отново.</translation> + </message> + <message> + <source>The entered address does not refer to a key.</source> + <translation>Въведеният адрес не може да се съпостави с валиден ключ.</translation> + </message> + <message> + <source>Wallet unlock was cancelled.</source> + <translation>Отключването на портфейла беше отменено.</translation> + </message> + <message> + <source>Private key for the entered address is not available.</source> + <translation>Не е наличен частен ключ за въведеният адрес.</translation> + </message> + <message> + <source>Message signing failed.</source> + <translation>Подписването на съобщение беше неуспешно.</translation> + </message> + <message> + <source>Message signed.</source> + <translation>Съобщението е подписано.</translation> + </message> + <message> + <source>The signature could not be decoded.</source> + <translation>Подписът не може да бъде декодиран.</translation> + </message> + <message> + <source>Please check the signature and try again.</source> + <translation>Проверете подписа и опитайте отново.</translation> + </message> + <message> + <source>The signature did not match the message digest.</source> + <translation>Подписът не отговаря на комбинацията от съобщение и адрес.</translation> + </message> + <message> + <source>Message verification failed.</source> + <translation>Проверката на съобщението беше неуспешна.</translation> + </message> + <message> + <source>Message verified.</source> + <translation>Съобщението е потвърдено.</translation> + </message> +</context> <context> <name>SplashScreen</name> <message> @@ -1391,16 +1900,434 @@ </message> </context> <context> + <name>TransactionDesc</name> + <message> + <source>Open until %1</source> + <translation>Подлежи на промяна до %1</translation> + </message> + <message> + <source>%1/offline</source> + <translation>%1/офлайн</translation> + </message> + <message> + <source>%1/unconfirmed</source> + <translation>%1/непотвърдени</translation> + </message> + <message> + <source>%1 confirmations</source> + <translation>включена в %1 блока</translation> + </message> + <message> + <source>Status</source> + <translation>Статус</translation> + </message> + <message> + <source>, has not been successfully broadcast yet</source> + <translation>, все още не е изпратено</translation> + </message> + <message> + <source>Date</source> + <translation>Дата</translation> + </message> + <message> + <source>Source</source> + <translation>Източник</translation> + </message> + <message> + <source>Generated</source> + <translation>Издадени</translation> + </message> + <message> + <source>From</source> + <translation>От</translation> + </message> + <message> + <source>unknown</source> + <translation>неизвестен</translation> + </message> + <message> + <source>To</source> + <translation>За</translation> + </message> + <message> + <source>own address</source> + <translation>собствен адрес</translation> + </message> + <message> + <source>watch-only</source> + <translation>само гледане</translation> + </message> + <message> + <source>label</source> + <translation>име</translation> + </message> + <message> + <source>Credit</source> + <translation>Кредит</translation> + </message> + <message> + <source>not accepted</source> + <translation>не е приет</translation> + </message> + <message> + <source>Debit</source> + <translation>Дебит</translation> + </message> + <message> + <source>Total debit</source> + <translation>Общ дълг</translation> + </message> + <message> + <source>Total credit</source> + <translation>Общ дълг</translation> + </message> + <message> + <source>Transaction fee</source> + <translation>Такса</translation> + </message> + <message> + <source>Net amount</source> + <translation>Нетна сума</translation> + </message> + <message> + <source>Message</source> + <translation>Съобщение</translation> + </message> + <message> + <source>Comment</source> + <translation>Коментар</translation> + </message> + <message> + <source>Transaction ID</source> + <translation>ID</translation> + </message> + <message> + <source>Merchant</source> + <translation>Търговец</translation> + </message> + <message> + <source>Generated coins must mature %1 blocks before they can be spent. When you generated this block, it was broadcast to the network to be added to the block chain. If it fails to get into the chain, its state will change to "not accepted" and it won't be spendable. This may occasionally happen if another node generates a block within a few seconds of yours.</source> + <translation>Генерираните монети трябва да отлежат %1 блока преди да могат да бъдат похарчени. Когато генерираш блока, той се разпространява в мрежата, за да се добави в блок-веригата. Ако не успее да се добави във веригата, неговия статус ще се стане "неприет" и няма да може да се похарчи. Това е възможно да се случи случайно, ако друг възел генерира блок няколко секунди след твоя.</translation> + </message> + <message> + <source>Debug information</source> + <translation>Информация за грешките</translation> + </message> + <message> + <source>Transaction</source> + <translation>Транзакция</translation> + </message> + <message> + <source>Amount</source> + <translation>Сума</translation> + </message> + <message> + <source>true</source> + <translation>true</translation> + </message> + <message> + <source>false</source> + <translation>false</translation> + </message> +</context> +<context> <name>TransactionDescDialog</name> <message> <source>This pane shows a detailed description of the transaction</source> <translation>Описание на транзакцията</translation> </message> + </context> +<context> + <name>TransactionTableModel</name> + <message> + <source>Date</source> + <translation>Дата</translation> + </message> + <message> + <source>Type</source> + <translation>Тип</translation> + </message> + <message> + <source>Label</source> + <translation>Име</translation> + </message> + <message> + <source>Open until %1</source> + <translation>Подлежи на промяна до %1</translation> + </message> + <message> + <source>Offline</source> + <translation>Извън линия</translation> + </message> + <message> + <source>Unconfirmed</source> + <translation>Непотвърдено</translation> + </message> + <message> + <source>Confirming (%1 of %2 recommended confirmations)</source> + <translation>Потвърждаване (%1 от %2 препоръчвани потвърждения)</translation> + </message> + <message> + <source>Confirmed (%1 confirmations)</source> + <translation>Потвърдени (%1 потвърждения)</translation> + </message> + <message> + <source>Conflicted</source> + <translation>Конфликтно</translation> + </message> + <message> + <source>Immature (%1 confirmations, will be available after %2)</source> + <translation>Неплатим (%1 потвърждения, ще бъде платим след %2)</translation> + </message> + <message> + <source>This block was not received by any other nodes and will probably not be accepted!</source> + <translation>Блокът не е получен от останалите участници и най-вероятно няма да бъде одобрен.</translation> + </message> + <message> + <source>Generated but not accepted</source> + <translation>Генерирана, но отхвърлена от мрежата</translation> + </message> + <message> + <source>Received with</source> + <translation>Получени</translation> + </message> + <message> + <source>Received from</source> + <translation>Получен от</translation> + </message> + <message> + <source>Sent to</source> + <translation>Изпратени на</translation> + </message> + <message> + <source>Payment to yourself</source> + <translation>Плащане към себе си</translation> + </message> + <message> + <source>Mined</source> + <translation>Емитирани</translation> + </message> + <message> + <source>watch-only</source> + <translation>само гледане</translation> + </message> + <message> + <source>(n/a)</source> + <translation>(n/a)</translation> + </message> + <message> + <source>(no label)</source> + <translation>(без име)</translation> + </message> + <message> + <source>Transaction status. Hover over this field to show number of confirmations.</source> + <translation>Състояние на транзакцията. Задръжте върху това поле за брой потвърждения.</translation> + </message> + <message> + <source>Date and time that the transaction was received.</source> + <translation>Дата и час на получаване на транзакцията.</translation> + </message> + <message> + <source>Type of transaction.</source> + <translation>Вид транзакция.</translation> + </message> + <message> + <source>Amount removed from or added to balance.</source> + <translation>Сума извадена или добавена към баланса.</translation> + </message> +</context> +<context> + <name>TransactionView</name> + <message> + <source>All</source> + <translation>Всички</translation> + </message> + <message> + <source>Today</source> + <translation>Днес</translation> + </message> + <message> + <source>This week</source> + <translation>Тази седмица</translation> + </message> + <message> + <source>This month</source> + <translation>Този месец</translation> + </message> + <message> + <source>Last month</source> + <translation>Предния месец</translation> + </message> + <message> + <source>This year</source> + <translation>Тази година</translation> + </message> + <message> + <source>Range...</source> + <translation>От - до...</translation> + </message> + <message> + <source>Received with</source> + <translation>Получени</translation> + </message> + <message> + <source>Sent to</source> + <translation>Изпратени на</translation> + </message> + <message> + <source>To yourself</source> + <translation>Собствени</translation> + </message> + <message> + <source>Mined</source> + <translation>Емитирани</translation> + </message> + <message> + <source>Other</source> + <translation>Други</translation> + </message> + <message> + <source>Enter address or label to search</source> + <translation>Търсене по адрес или име</translation> + </message> + <message> + <source>Min amount</source> + <translation>Минимална сума</translation> + </message> + <message> + <source>Copy address</source> + <translation>Копирай адрес</translation> + </message> + <message> + <source>Copy label</source> + <translation>Копирай име</translation> + </message> + <message> + <source>Copy amount</source> + <translation>Копирай сума</translation> + </message> + <message> + <source>Copy transaction ID</source> + <translation>Копирай транзакция с ID</translation> + </message> + <message> + <source>Edit label</source> + <translation>Редактирай име</translation> + </message> + <message> + <source>Show transaction details</source> + <translation>Подробности за транзакцията</translation> + </message> + <message> + <source>Export Transaction History</source> + <translation>Изнасяне историята на транзакциите</translation> + </message> + <message> + <source>Comma separated file (*.csv)</source> + <translation>CSV файл (*.csv)</translation> + </message> + <message> + <source>Confirmed</source> + <translation>Потвърдени</translation> + </message> + <message> + <source>Watch-only</source> + <translation>само гледане</translation> + </message> + <message> + <source>Date</source> + <translation>Дата</translation> + </message> + <message> + <source>Type</source> + <translation>Тип</translation> + </message> + <message> + <source>Label</source> + <translation>Име</translation> + </message> + <message> + <source>Address</source> + <translation>Адрес</translation> + </message> + <message> + <source>ID</source> + <translation>ИД</translation> + </message> + <message> + <source>Exporting Failed</source> + <translation>Грешка при изнасянето</translation> + </message> + <message> + <source>Exporting Successful</source> + <translation>Изнасянето е успешна</translation> + </message> + <message> + <source>The transaction history was successfully saved to %1.</source> + <translation>Историята с транзакциите беше успешно запазена в %1.</translation> + </message> + <message> + <source>Range:</source> + <translation>От:</translation> + </message> + <message> + <source>to</source> + <translation>до</translation> + </message> </context> <context> <name>UnitDisplayStatusBarControl</name> </context> <context> + <name>WalletFrame</name> + <message> + <source>No wallet has been loaded.</source> + <translation>Няма зареден портфейл.</translation> + </message> +</context> +<context> + <name>WalletModel</name> + <message> + <source>Send Coins</source> + <translation>Изпращане</translation> + </message> +</context> +<context> + <name>WalletView</name> + <message> + <source>&Export</source> + <translation>Изнеси</translation> + </message> + <message> + <source>Export the data in the current tab to a file</source> + <translation>Запишете данните от текущия раздел във файл</translation> + </message> + <message> + <source>Backup Wallet</source> + <translation>Запазване на портфейла</translation> + </message> + <message> + <source>Wallet Data (*.dat)</source> + <translation>Информация за портфейла (*.dat)</translation> + </message> + <message> + <source>Backup Failed</source> + <translation>Неуспешно запазване на портфейла</translation> + </message> + <message> + <source>There was an error trying to save the wallet data to %1.</source> + <translation>Възникна грешка при запазването на информацията за портфейла в %1.</translation> + </message> + <message> + <source>Backup Successful</source> + <translation>Успешно запазване на портфейла</translation> + </message> + <message> + <source>The wallet data was successfully saved to %1.</source> + <translation>Информацията за портфейла беше успешно запазена в %1.</translation> + </message> +</context> +<context> <name>bitcoin-core</name> <message> <source>Options:</source> @@ -1419,18 +2346,10 @@ <translation>Въведете Ваш публичен адрес</translation> </message> <message> - <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> - <translation>Приемайте връзки отвън.(по подразбиране:1 в противен случай -proxy или -connect)</translation> - </message> - <message> <source>Bitcoin Core</source> <translation>Биткойн ядро</translation> </message> <message> - <source>Whitelist peers connecting from the given netmask or IP address. Can be specified multiple times.</source> - <translation>Сложете в бял списък пиъри,свързващи се от дадената интернет маска или айпи адрес.Може да бъде заложено неколкократно.</translation> - </message> - <message> <source><category> can be:</source> <translation><category> може да бъде:</translation> </message> @@ -1491,10 +2410,6 @@ <translation>Сумата на транзакцията е твърде малка</translation> </message> <message> - <source>Transaction amounts must be positive</source> - <translation>Сумите на транзакциите трябва да са положителни</translation> - </message> - <message> <source>Transaction too large</source> <translation>Транзакцията е твърде голяма</translation> </message> diff --git a/src/qt/locale/bitcoin_bg_BG.ts b/src/qt/locale/bitcoin_bg_BG.ts index 4bddb5ff4a..d982da4dd8 100644 --- a/src/qt/locale/bitcoin_bg_BG.ts +++ b/src/qt/locale/bitcoin_bg_BG.ts @@ -41,6 +41,77 @@ <source>&Delete</source> <translation>Изтрий</translation> </message> + <message> + <source>Choose the address to send coins to</source> + <translation>Избери адреса на който да пратиш монети</translation> + </message> + <message> + <source>Choose the address to receive coins with</source> + <translation>Избери адреса на който да получиш монети</translation> + </message> + <message> + <source>C&hoose</source> + <translation>Избери</translation> + </message> + <message> + <source>Sending addresses</source> + <translation>Адрес за пращане</translation> + </message> + <message> + <source>Receiving addresses</source> + <translation>Адрес за получаване</translation> + </message> + <message> + <source>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source> + <translation>Тези са вашите Биткойн адреси за изпращане на монети. Винаги проверявайте количеството и получаващия адрес преди изпращане. </translation> + </message> + <message> + <source>These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction.</source> + <translation>Това са вашите Биткойн адреси за получаване на монети. Препоръчително е да ползвате нов адрес на всяка транзакция.</translation> + </message> + <message> + <source>&Copy Address</source> + <translation>Копирай адрес</translation> + </message> + <message> + <source>Copy &Label</source> + <translation>Копирай етикет</translation> + </message> + <message> + <source>&Edit</source> + <translation>Редактирай</translation> + </message> + <message> + <source>Export Address List</source> + <translation>Изнеси лист с адреси</translation> + </message> + <message> + <source>Comma separated file (*.csv)</source> + <translation>Comma separated file (*.csv)</translation> + </message> + <message> + <source>Exporting Failed</source> + <translation>Изнасянето се провали</translation> + </message> + <message> + <source>There was an error trying to save the address list to %1. Please try again.</source> + <translation>Получи се грешка при запазването на листа с адреси към %1. Моля опитайте пак.</translation> + </message> +</context> +<context> + <name>AddressTableModel</name> + <message> + <source>Label</source> + <translation>Етикет</translation> + </message> + <message> + <source>Address</source> + <translation>Адрес</translation> + </message> + <message> + <source>(no label)</source> + <translation>(без етикет)</translation> + </message> </context> <context> <name>AskPassphraseDialog</name> @@ -60,7 +131,35 @@ <source>Repeat new passphrase</source> <translation>Повтори парола</translation> </message> -</context> + <message> + <source>Encrypt wallet</source> + <translation>Криптирай портфейл</translation> + </message> + <message> + <source>This operation needs your wallet passphrase to unlock the wallet.</source> + <translation>Тази операция изисква вашата парола на портфейла за отключването на портфейла.</translation> + </message> + <message> + <source>Unlock wallet</source> + <translation>Отключи портфейла</translation> + </message> + <message> + <source>This operation needs your wallet passphrase to decrypt the wallet.</source> + <translation>Тази операция изисква вашата парола на портфейла за декриптирането на портфейла.</translation> + </message> + <message> + <source>Decrypt wallet</source> + <translation>Декриптирай портфейл</translation> + </message> + <message> + <source>Change passphrase</source> + <translation>Промени парола</translation> + </message> + <message> + <source>Confirm wallet encryption</source> + <translation>Потвърди криптирането на порфейла</translation> + </message> + </context> <context> <name>BanTableModel</name> <message> @@ -165,6 +264,10 @@ </context> <context> <name>CoinControlDialog</name> + <message> + <source>(no label)</source> + <translation>(без етикет)</translation> + </message> </context> <context> <name>EditAddressDialog</name> @@ -179,6 +282,9 @@ <name>Intro</name> </context> <context> + <name>ModalOverlay</name> + </context> +<context> <name>OpenURIDialog</name> </context> <context> @@ -188,12 +294,21 @@ <name>OverviewPage</name> </context> <context> + <name>PaymentServer</name> + </context> +<context> <name>PeerTableModel</name> </context> <context> <name>QObject</name> </context> <context> + <name>QObject::QObject</name> + </context> +<context> + <name>QRImageWidget</name> + </context> +<context> <name>RPCConsole</name> </context> <context> @@ -201,14 +316,40 @@ </context> <context> <name>ReceiveRequestDialog</name> + <message> + <source>Address</source> + <translation>Адрес</translation> + </message> + <message> + <source>Label</source> + <translation>Етикет</translation> + </message> </context> <context> - <name>SendCoinsDialog</name> + <name>RecentRequestsTableModel</name> + <message> + <source>Label</source> + <translation>Етикет</translation> + </message> + <message> + <source>(no label)</source> + <translation>(без етикет)</translation> + </message> </context> <context> + <name>SendCoinsDialog</name> + <message> + <source>(no label)</source> + <translation>(без етикет)</translation> + </message> +</context> +<context> <name>SendCoinsEntry</name> </context> <context> + <name>SendConfirmationDialog</name> + </context> +<context> <name>ShutdownWindow</name> </context> <context> @@ -221,12 +362,62 @@ <name>TrafficGraphWidget</name> </context> <context> + <name>TransactionDesc</name> + </context> +<context> <name>TransactionDescDialog</name> </context> <context> + <name>TransactionTableModel</name> + <message> + <source>Label</source> + <translation>Етикет</translation> + </message> + <message> + <source>(no label)</source> + <translation>(без етикет)</translation> + </message> + </context> +<context> + <name>TransactionView</name> + <message> + <source>Comma separated file (*.csv)</source> + <translation>Comma separated file (*.csv)</translation> + </message> + <message> + <source>Label</source> + <translation>Етикет</translation> + </message> + <message> + <source>Address</source> + <translation>Адрес</translation> + </message> + <message> + <source>Exporting Failed</source> + <translation>Изнасянето се провали</translation> + </message> + </context> +<context> <name>UnitDisplayStatusBarControl</name> </context> <context> + <name>WalletFrame</name> + </context> +<context> + <name>WalletModel</name> + </context> +<context> + <name>WalletView</name> + <message> + <source>&Export</source> + <translation>Изнеси</translation> + </message> + <message> + <source>Export the data in the current tab to a file</source> + <translation>Изнеси данните в избрания раздел към файл</translation> + </message> + </context> +<context> <name>bitcoin-core</name> <message> <source>Bitcoin Core</source> diff --git a/src/qt/locale/bitcoin_ca.ts b/src/qt/locale/bitcoin_ca.ts index ed259c4d08..84f51d18a8 100644 --- a/src/qt/locale/bitcoin_ca.ts +++ b/src/qt/locale/bitcoin_ca.ts @@ -41,6 +41,77 @@ <source>&Delete</source> <translation>&Elimina</translation> </message> + <message> + <source>Choose the address to send coins to</source> + <translation>Trieu l'adreça on enviar les monedes</translation> + </message> + <message> + <source>Choose the address to receive coins with</source> + <translation>Trieu l'adreça on rebre les monedes</translation> + </message> + <message> + <source>C&hoose</source> + <translation>&Tria</translation> + </message> + <message> + <source>Sending addresses</source> + <translation>Adreces d'enviament</translation> + </message> + <message> + <source>Receiving addresses</source> + <translation>Adreces de recepció</translation> + </message> + <message> + <source>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source> + <translation>Aquestes són les vostres adreces de Bitcoin per enviar els pagaments. Sempre reviseu l'import i l'adreça del destinatari abans de transferir monedes.</translation> + </message> + <message> + <source>These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction.</source> + <translation>Aquestes són les vostres adreces Bitcoin per rebre pagaments. Es recomana utilitzar una adreça nova de recepció per a cada transacció.</translation> + </message> + <message> + <source>&Copy Address</source> + <translation>&Copia l'adreça</translation> + </message> + <message> + <source>Copy &Label</source> + <translation>Copia l'eti&queta</translation> + </message> + <message> + <source>&Edit</source> + <translation>&Edita</translation> + </message> + <message> + <source>Export Address List</source> + <translation>Exporta la llista d'adreces</translation> + </message> + <message> + <source>Comma separated file (*.csv)</source> + <translation>Fitxer separat per comes (*.csv)</translation> + </message> + <message> + <source>Exporting Failed</source> + <translation>L'exportació ha fallat</translation> + </message> + <message> + <source>There was an error trying to save the address list to %1. Please try again.</source> + <translation>S'ha produït un error en desar la llista d'adreces a %1. Torneu-ho a provar.</translation> + </message> +</context> +<context> + <name>AddressTableModel</name> + <message> + <source>Label</source> + <translation>Etiqueta</translation> + </message> + <message> + <source>Address</source> + <translation>Adreça</translation> + </message> + <message> + <source>(no label)</source> + <translation>(sense etiqueta)</translation> + </message> </context> <context> <name>AskPassphraseDialog</name> @@ -60,6 +131,94 @@ <source>Repeat new passphrase</source> <translation>Repetiu la nova contrasenya</translation> </message> + <message> + <source>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>.</source> + <translation>Introduïu la contrasenya nova al moneder.<br/>Utilitzeu una contrasenya de <b>deu o més caràcters aleatoris</b>, o <b>vuit o més paraules</b>.</translation> + </message> + <message> + <source>Encrypt wallet</source> + <translation>Encripta el moneder</translation> + </message> + <message> + <source>This operation needs your wallet passphrase to unlock the wallet.</source> + <translation>Aquesta operació requereix la contrasenya del moneder per a desbloquejar-lo.</translation> + </message> + <message> + <source>Unlock wallet</source> + <translation>Desbloqueja el moneder</translation> + </message> + <message> + <source>This operation needs your wallet passphrase to decrypt the wallet.</source> + <translation>Aquesta operació requereix la contrasenya del moneder per desencriptar-lo.</translation> + </message> + <message> + <source>Decrypt wallet</source> + <translation>Desencripta el moneder</translation> + </message> + <message> + <source>Change passphrase</source> + <translation>Canvia la contrasenya</translation> + </message> + <message> + <source>Enter the old passphrase and new passphrase to the wallet.</source> + <translation>Introduïu la contrasenya antiga i la contrasenya nova al moneder.</translation> + </message> + <message> + <source>Confirm wallet encryption</source> + <translation>Confirma l'encriptació del moneder</translation> + </message> + <message> + <source>Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR BITCOINS</b>!</source> + <translation>Avís: si encripteu el vostre moneder i perdeu la contrasenya, <b>PERDREU TOTS ELS VOSTRES BITCOINS</b>!</translation> + </message> + <message> + <source>Are you sure you wish to encrypt your wallet?</source> + <translation>Esteu segur que voleu encriptar el vostre moneder?</translation> + </message> + <message> + <source>Wallet encrypted</source> + <translation>Moneder encriptat</translation> + </message> + <message> + <source>%1 will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your bitcoins from being stolen by malware infecting your computer.</source> + <translation>Ara es tancarà el %1 per finalitzar el procés d'encriptació. Recordeu que encriptar el vostre moneder no garanteix que les vostres bitcoins no puguin ser robades per programari maliciós que infecti l'ordinador.</translation> + </message> + <message> + <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source> + <translation>IMPORTANT: Tota copia de seguretat que hàgiu realitzat hauria de ser reemplaçada pel, recentment generat, fitxer encriptat del moneder. Per motius de seguretat, les còpies de seguretat anteriors del fitxer de moneder no encriptat esdevindran inusables tan aviat com començar a utilitzar el nou moneder encriptat.</translation> + </message> + <message> + <source>Wallet encryption failed</source> + <translation>L'encriptació del moneder ha fallat</translation> + </message> + <message> + <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source> + <translation>L'encriptació del moneder ha fallat per un error intern. El moneder no ha estat encriptat.</translation> + </message> + <message> + <source>The supplied passphrases do not match.</source> + <translation>Les contrasenyes introduïdes no coincideixen.</translation> + </message> + <message> + <source>Wallet unlock failed</source> + <translation>El desbloqueig del moneder ha fallat</translation> + </message> + <message> + <source>The passphrase entered for the wallet decryption was incorrect.</source> + <translation>La contrasenya introduïda per a desencriptar el moneder és incorrecta.</translation> + </message> + <message> + <source>Wallet decryption failed</source> + <translation>La desencriptació del moneder ha fallat</translation> + </message> + <message> + <source>Wallet passphrase was successfully changed.</source> + <translation>La contrasenya del moneder ha estat modificada correctament.</translation> + </message> + <message> + <source>Warning: The Caps Lock key is on!</source> + <translation>Avís: Les lletres majúscules estan activades!</translation> + </message> </context> <context> <name>BanTableModel</name> @@ -111,6 +270,14 @@ <translation>Surt de l'aplicació</translation> </message> <message> + <source>&About %1</source> + <translation>Qu&ant al %1</translation> + </message> + <message> + <source>Show information about %1</source> + <translation>Mosta informació sobre el %1</translation> + </message> + <message> <source>About &Qt</source> <translation>Quant a &Qt</translation> </message> @@ -123,6 +290,10 @@ <translation>&Opcions...</translation> </message> <message> + <source>Modify configuration options for %1</source> + <translation>Modifica les opcions de configuració de %1</translation> + </message> + <message> <source>&Encrypt Wallet...</source> <translation>&Encripta el moneder...</translation> </message> @@ -140,13 +311,25 @@ </message> <message> <source>&Receiving addresses...</source> - <translation>Adreces de &recepció</translation> + <translation>Adreces de &recepció...</translation> </message> <message> <source>Open &URI...</source> <translation>Obre un &URI...</translation> </message> <message> + <source>Click to disable network activity.</source> + <translation>Feu clic per inhabilitar l'activitat de la xarxa.</translation> + </message> + <message> + <source>Network activity disabled.</source> + <translation>S'ha inhabilitat l'activitat de la xarxa.</translation> + </message> + <message> + <source>Click to enable network activity again.</source> + <translation>Feu clic per tornar a habilitar l'activitat de la xarxa.</translation> + </message> + <message> <source>Reindexing blocks on disk...</source> <translation>S'estan reindexant els blocs al disc...</translation> </message> @@ -251,32 +434,16 @@ <translation><numerusform>%n connexió activa a la xarxa Bitcoin</numerusform><numerusform>%n connexions actives a la xarxa Bitcoin</numerusform></translation> </message> <message> - <source>No block source available...</source> - <translation>No hi ha cap font de bloc disponible...</translation> - </message> - <message numerus="yes"> - <source>Processed %n block(s) of transaction history.</source> - <translation><numerusform>S'han processat %n bloc de l'historial de transacció.</numerusform><numerusform>S'han processat %n blocs de l'historial de transacció.</numerusform></translation> - </message> - <message numerus="yes"> - <source>%n hour(s)</source> - <translation><numerusform>%n hora</numerusform><numerusform>%n hores</numerusform></translation> - </message> - <message numerus="yes"> - <source>%n day(s)</source> - <translation><numerusform>%n dia</numerusform><numerusform>%n dies</numerusform></translation> - </message> - <message numerus="yes"> - <source>%n week(s)</source> - <translation><numerusform>%n setmana</numerusform><numerusform>%n setmanes</numerusform></translation> + <source>Indexing blocks on disk...</source> + <translation>S'estan indexant els blocs al disc...</translation> </message> <message> - <source>%1 and %2</source> - <translation>%1 i %2</translation> + <source>Processing blocks on disk...</source> + <translation>S'estan processant els blocs al disc...</translation> </message> <message numerus="yes"> - <source>%n year(s)</source> - <translation><numerusform>%n any</numerusform><numerusform>%n anys</numerusform></translation> + <source>Processed %n block(s) of transaction history.</source> + <translation><numerusform>S'ha processat %n bloc de l'historial de transacció.</numerusform><numerusform>S'han processat %n blocs de l'historial de transacció.</numerusform></translation> </message> <message> <source>%1 behind</source> @@ -307,6 +474,14 @@ <translation>Al dia</translation> </message> <message> + <source>Show the %1 help message to get a list with possible Bitcoin command-line options</source> + <translation>Mostra el missatge d'ajuda del %1 per obtenir una llista amb les possibles opcions de línia d'ordres de Bitcoin</translation> + </message> + <message> + <source>%1 client</source> + <translation>Client de %1</translation> + </message> + <message> <source>Catching up...</source> <translation>S'està posant al dia ...</translation> </message> @@ -349,6 +524,14 @@ <translation>Transacció entrant</translation> </message> <message> + <source>HD key generation is <b>enabled</b></source> + <translation>La generació de la clau HD és <b>habilitada</b></translation> + </message> + <message> + <source>HD key generation is <b>disabled</b></source> + <translation>La generació de la clau HD és <b>inhabilitada</b></translation> + </message> + <message> <source>Wallet is <b>encrypted</b> and currently <b>unlocked</b></source> <translation>El moneder està <b>encriptat</b> i actualment <b>desbloquejat</b></translation> </message> @@ -356,6 +539,10 @@ <source>Wallet is <b>encrypted</b> and currently <b>locked</b></source> <translation>El moneder està <b>encriptat</b> i actualment <b>bloquejat</b></translation> </message> + <message> + <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> + <translation>S'ha produït un error fatal. Bitcoin no pot continuar amb seguretat i finalitzarà.</translation> + </message> </context> <context> <name>CoinControlDialog</name> @@ -376,12 +563,8 @@ <translation>Import:</translation> </message> <message> - <source>Priority:</source> - <translation>Prioritat:</translation> - </message> - <message> <source>Fee:</source> - <translation>Comissió</translation> + <translation>Comissió:</translation> </message> <message> <source>Dust:</source> @@ -432,8 +615,84 @@ <translation>Confirmat</translation> </message> <message> - <source>Priority</source> - <translation>Prioritat</translation> + <source>Copy address</source> + <translation>Copia l'adreça</translation> + </message> + <message> + <source>Copy label</source> + <translation>Copia l'etiqueta</translation> + </message> + <message> + <source>Copy amount</source> + <translation>Copia l'import</translation> + </message> + <message> + <source>Copy transaction ID</source> + <translation>Copia l'ID de transacció</translation> + </message> + <message> + <source>Lock unspent</source> + <translation>Bloqueja sense gastar</translation> + </message> + <message> + <source>Unlock unspent</source> + <translation>Desbloqueja sense gastar</translation> + </message> + <message> + <source>Copy quantity</source> + <translation>Copia la quantitat</translation> + </message> + <message> + <source>Copy fee</source> + <translation>Copia la comissió</translation> + </message> + <message> + <source>Copy after fee</source> + <translation>Copia la comissió posterior</translation> + </message> + <message> + <source>Copy bytes</source> + <translation>Copia els bytes</translation> + </message> + <message> + <source>Copy dust</source> + <translation>Copia el polsim</translation> + </message> + <message> + <source>Copy change</source> + <translation>Copia el canvi</translation> + </message> + <message> + <source>(%1 locked)</source> + <translation>(%1 bloquejada)</translation> + </message> + <message> + <source>yes</source> + <translation>sí</translation> + </message> + <message> + <source>no</source> + <translation>no</translation> + </message> + <message> + <source>This label turns red if any recipient receives an amount smaller than the current dust threshold.</source> + <translation>Aquesta etiqueta es torna vermella si cap recipient rep un import inferior al llindar de polsim actual.</translation> + </message> + <message> + <source>Can vary +/- %1 satoshi(s) per input.</source> + <translation>Pot variar en +/- %1 satoshi(s) per entrada.</translation> + </message> + <message> + <source>(no label)</source> + <translation>(sense etiqueta)</translation> + </message> + <message> + <source>change from %1 (%2)</source> + <translation>canvia de %1 (%2)</translation> + </message> + <message> + <source>(change)</source> + <translation>(canvia)</translation> </message> </context> <context> @@ -458,6 +717,38 @@ <source>&Address</source> <translation>&Adreça</translation> </message> + <message> + <source>New receiving address</source> + <translation>Nova adreça de recepció</translation> + </message> + <message> + <source>New sending address</source> + <translation>Nova adreça d'enviament</translation> + </message> + <message> + <source>Edit receiving address</source> + <translation>Edita l'adreça de recepció</translation> + </message> + <message> + <source>Edit sending address</source> + <translation>Edita l'adreça d'enviament</translation> + </message> + <message> + <source>The entered address "%1" is not a valid Bitcoin address.</source> + <translation>L'adreça introduïda «%1» no és una adreça de Bitcoin vàlida.</translation> + </message> + <message> + <source>The entered address "%1" is already in the address book.</source> + <translation>L'adreça introduïda «%1» ja és present a la llibreta d'adreces.</translation> + </message> + <message> + <source>Could not unlock wallet.</source> + <translation>No s'ha pogut desbloquejar el moneder.</translation> + </message> + <message> + <source>New key generation failed.</source> + <translation>Ha fallat la generació d'una clau nova.</translation> + </message> </context> <context> <name>FreespaceChecker</name> @@ -493,6 +784,10 @@ <translation>(%1-bit)</translation> </message> <message> + <source>About %1</source> + <translation>Quant al %1</translation> + </message> + <message> <source>Command-line options</source> <translation>Opcions de línia d'ordres</translation> </message> @@ -528,12 +823,28 @@ <source>Show splash screen on startup (default: %u)</source> <translation>Mostra la pantalla de benvinguda a l'inici (per defecte: %u)</translation> </message> - </context> + <message> + <source>Reset all settings changed in the GUI</source> + <translation>Reinicialitza tots els canvis de configuració fets des de la interfície gràfica</translation> + </message> +</context> <context> <name>Intro</name> <message> <source>Welcome</source> - <translation>Us donem la benviguda</translation> + <translation>Us donem la benvinguda</translation> + </message> + <message> + <source>Welcome to %1.</source> + <translation>Us donem la benvinguda a %1.</translation> + </message> + <message> + <source>As this is the first time the program is launched, you can choose where %1 will store its data.</source> + <translation>Com és la primera vegada que s'executa el programa, podeu triar on %1 emmagatzemarà les dades.</translation> + </message> + <message> + <source>%1 will download and store a copy of the Bitcoin block chain. At least %2GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source> + <translation>%1 baixarà i emmagatzemarà una còpia de la cadena de blocs de Bitcoin. Com a mínim %2GB de dades s'emmagatzemaran en aquest directori, i augmentarà al llarg del temps. El moneder també s'emmagatzemarà en aquest directori.</translation> </message> <message> <source>Use the default data directory</source> @@ -561,6 +872,37 @@ </message> </context> <context> + <name>ModalOverlay</name> + <message> + <source>Form</source> + <translation>Formulari</translation> + </message> + <message> + <source>Last block time</source> + <translation>Últim temps de bloc</translation> + </message> + <message> + <source>Progress</source> + <translation>Progrés</translation> + </message> + <message> + <source>calculating...</source> + <translation>s'està calculant...</translation> + </message> + <message> + <source>Estimated time left until synced</source> + <translation>Temps estimat restant fins sincronitzat</translation> + </message> + <message> + <source>Hide</source> + <translation>Amaga</translation> + </message> + <message> + <source>Unknown. Syncing Headers (%1)...</source> + <translation>Desconegut. Sincronització de les capçaleres (%1)...</translation> + </message> +</context> +<context> <name>OpenURIDialog</name> <message> <source>Open URI</source> @@ -578,6 +920,10 @@ <source>Select payment request file</source> <translation>Selecciona un fitxer de sol·licitud de pagament</translation> </message> + <message> + <source>Select payment request file to open</source> + <translation>Seleccioneu el fitxer de sol·licitud de pagament per obrir</translation> + </message> </context> <context> <name>OptionsDialog</name> @@ -590,6 +936,14 @@ <translation>&Principal</translation> </message> <message> + <source>Automatically start %1 after logging in to the system.</source> + <translation>Inicieu %1 automàticament després d'entrar en el sistema.</translation> + </message> + <message> + <source>&Start %1 on system login</source> + <translation>&Inicia %1 en l'entrada al sistema</translation> + </message> + <message> <source>Size of &database cache</source> <translation>Mida de la memòria cau de la base de &dades</translation> </message> @@ -726,6 +1080,14 @@ <translation>&Finestra</translation> </message> <message> + <source>&Hide the icon from the system tray.</source> + <translation>Ama&ga la icona de la safata del sistema.</translation> + </message> + <message> + <source>Hide tray icon</source> + <translation>Amaga la icona de la safata</translation> + </message> + <message> <source>Show only a tray icon after minimizing the window.</source> <translation>Mostra només la icona de la barra en minimitzar la finestra.</translation> </message> @@ -746,6 +1108,10 @@ <translation>&Llengua de la interfície d'usuari:</translation> </message> <message> + <source>The user interface language can be set here. This setting will take effect after restarting %1.</source> + <translation>Aquí es pot definir la llengua de la interfície d'usuari. Aquest paràmetre tindrà efecte en reiniciar el %1.</translation> + </message> + <message> <source>&Unit to show amounts in:</source> <translation>&Unitats per mostrar els imports en:</translation> </message> @@ -870,6 +1236,97 @@ </message> </context> <context> + <name>PaymentServer</name> + <message> + <source>Payment request error</source> + <translation>Error de la sol·licitud de pagament</translation> + </message> + <message> + <source>Cannot start bitcoin: click-to-pay handler</source> + <translation>No es pot iniciar bitcoin: controlador click-to-pay</translation> + </message> + <message> + <source>URI handling</source> + <translation>Gestió d'URI</translation> + </message> + <message> + <source>Payment request fetch URL is invalid: %1</source> + <translation>L'URL de recuperació de la sol·licitud de pagament no és vàlida: %1</translation> + </message> + <message> + <source>Invalid payment address %1</source> + <translation>Adreça de pagament no vàlida %1</translation> + </message> + <message> + <source>URI cannot be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters.</source> + <translation>L'URI no pot ser analitzat! Això pot ser a causa d'una adreça de Bitcoin no vàlida o per paràmetres URI amb mal format.</translation> + </message> + <message> + <source>Payment request file handling</source> + <translation>Gestió de fitxers de les sol·licituds de pagament</translation> + </message> + <message> + <source>Payment request file cannot be read! This can be caused by an invalid payment request file.</source> + <translation>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.</translation> + </message> + <message> + <source>Payment request rejected</source> + <translation>La sol·licitud de pagament s'ha rebutjat</translation> + </message> + <message> + <source>Payment request network doesn't match client network.</source> + <translation>La xarxa de la sol·licitud de pagament no coincideix amb la xarxa del client.</translation> + </message> + <message> + <source>Payment request expired.</source> + <translation>La sol·licitud de pagament ha vençut.</translation> + </message> + <message> + <source>Payment request is not initialized.</source> + <translation>La sol·licitud de pagament no està inicialitzada.</translation> + </message> + <message> + <source>Unverified payment requests to custom payment scripts are unsupported.</source> + <translation>No s'accepten sol·licituds de pagament no verificades a scripts de pagament personalitzats.</translation> + </message> + <message> + <source>Invalid payment request.</source> + <translation>Sol·licitud de pagament no vàlida.</translation> + </message> + <message> + <source>Requested payment amount of %1 is too small (considered dust).</source> + <translation>L'import de pagament sol·licitat %1 és massa petit (es considera polsim).</translation> + </message> + <message> + <source>Refund from %1</source> + <translation>Reemborsament de %1</translation> + </message> + <message> + <source>Payment request %1 is too large (%2 bytes, allowed %3 bytes).</source> + <translation>La sol·licitud de pagament %1 és massa gran (%2 bytes, permès %3 bytes).</translation> + </message> + <message> + <source>Error communicating with %1: %2</source> + <translation>Error en comunicar amb %1: %2</translation> + </message> + <message> + <source>Payment request cannot be parsed!</source> + <translation>No es pot analitzar la sol·licitud de pagament!</translation> + </message> + <message> + <source>Bad response from server %1</source> + <translation>Mala resposta del servidor %1</translation> + </message> + <message> + <source>Network request error</source> + <translation>Error en la sol·licitud de xarxa</translation> + </message> + <message> + <source>Payment acknowledged</source> + <translation>Pagament reconegut</translation> + </message> +</context> +<context> <name>PeerTableModel</name> <message> <source>User Agent</source> @@ -879,11 +1336,7 @@ <source>Node/Service</source> <translation>Node/Servei</translation> </message> - <message> - <source>Ping Time</source> - <translation>Temps de ping</translation> - </message> -</context> + </context> <context> <name>QObject</name> <message> @@ -922,6 +1375,32 @@ <source>%1 ms</source> <translation>%1 ms</translation> </message> + <message> + <source>%1 and %2</source> + <translation>%1 i %2</translation> + </message> + </context> +<context> + <name>QObject::QObject</name> + </context> +<context> + <name>QRImageWidget</name> + <message> + <source>&Save Image...</source> + <translation>De&sa la imatge...</translation> + </message> + <message> + <source>&Copy Image</source> + <translation>&Copia la imatge</translation> + </message> + <message> + <source>Save QR Code</source> + <translation>Desa el codi QR</translation> + </message> + <message> + <source>PNG Image (*.png)</source> + <translation>Imatge PNG (*.png)</translation> + </message> </context> <context> <name>RPCConsole</name> @@ -950,6 +1429,10 @@ <translation>Utilitzant BerkeleyDB versió</translation> </message> <message> + <source>Datadir</source> + <translation>Datadir</translation> + </message> + <message> <source>Startup time</source> <translation>&Temps d'inici</translation> </message> @@ -1110,14 +1593,6 @@ <translation>Neteja la consola</translation> </message> <message> - <source>&Disconnect Node</source> - <translation>&Desconnecta el node</translation> - </message> - <message> - <source>Ban Node for</source> - <translation>Bandeja el node durant</translation> - </message> - <message> <source>1 &hour</source> <translation>1 &hora</translation> </message> @@ -1134,10 +1609,6 @@ <translation>1 &any</translation> </message> <message> - <source>&Unban Node</source> - <translation>&Desbandeja el node</translation> - </message> - <message> <source>Use up and down arrows to navigate history, and <b>Ctrl-L</b> to clear screen.</source> <translation>Utilitza les fletxes d'amunt i avall per navegar per l'historial, i <b>Ctrl-L<\b> per netejar la pantalla.</translation> </message> @@ -1264,6 +1735,18 @@ <source>Remove</source> <translation>Esborra</translation> </message> + <message> + <source>Copy label</source> + <translation>Copia l'etiqueta</translation> + </message> + <message> + <source>Copy message</source> + <translation>Copia el missatge</translation> + </message> + <message> + <source>Copy amount</source> + <translation>Copia l'import</translation> + </message> </context> <context> <name>ReceiveRequestDialog</name> @@ -1283,6 +1766,73 @@ <source>&Save Image...</source> <translation>De&sa la imatge...</translation> </message> + <message> + <source>Request payment to %1</source> + <translation>Sol·licita un pagament a %1</translation> + </message> + <message> + <source>Payment information</source> + <translation>Informació de pagament</translation> + </message> + <message> + <source>URI</source> + <translation>URI</translation> + </message> + <message> + <source>Address</source> + <translation>Adreça</translation> + </message> + <message> + <source>Amount</source> + <translation>Import</translation> + </message> + <message> + <source>Label</source> + <translation>Etiqueta</translation> + </message> + <message> + <source>Message</source> + <translation>Missatge</translation> + </message> + <message> + <source>Resulting URI too long, try to reduce the text for label / message.</source> + <translation>URI resultant massa llarga, intenta reduir el text per a la etiqueta / missatge</translation> + </message> + <message> + <source>Error encoding URI into QR Code.</source> + <translation>Error en codificar l'URI en un codi QR.</translation> + </message> +</context> +<context> + <name>RecentRequestsTableModel</name> + <message> + <source>Date</source> + <translation>Data</translation> + </message> + <message> + <source>Label</source> + <translation>Etiqueta</translation> + </message> + <message> + <source>Message</source> + <translation>Missatge</translation> + </message> + <message> + <source>(no label)</source> + <translation>(sense etiqueta)</translation> + </message> + <message> + <source>(no message)</source> + <translation>(sense missatge)</translation> + </message> + <message> + <source>(no amount requested)</source> + <translation>(no s'ha sol·licitat import)</translation> + </message> + <message> + <source>Requested</source> + <translation>Sol·licitat</translation> + </message> </context> <context> <name>SendCoinsDialog</name> @@ -1319,10 +1869,6 @@ <translation>Import:</translation> </message> <message> - <source>Priority:</source> - <translation>Prioritat:</translation> - </message> - <message> <source>Fee:</source> <translation>Comissió:</translation> </message> @@ -1391,10 +1937,6 @@ <translation>(No s'ha inicialitzat encara la comissió intel·ligent. Normalment pren uns pocs blocs...)</translation> </message> <message> - <source>Confirmation time:</source> - <translation>Temps de confirmació:</translation> - </message> - <message> <source>normal</source> <translation>normal</translation> </message> @@ -1412,7 +1954,7 @@ </message> <message> <source>Clear all fields of the form.</source> - <translation>Netejar tots els camps del formulari.</translation> + <translation>Esborra tots els camps del formuari.</translation> </message> <message> <source>Dust:</source> @@ -1434,6 +1976,106 @@ <source>S&end</source> <translation>E&nvia</translation> </message> + <message> + <source>Copy quantity</source> + <translation>Copia la quantitat</translation> + </message> + <message> + <source>Copy amount</source> + <translation>Copia l'import</translation> + </message> + <message> + <source>Copy fee</source> + <translation>Copia la comissió</translation> + </message> + <message> + <source>Copy after fee</source> + <translation>Copia la comissió posterior</translation> + </message> + <message> + <source>Copy bytes</source> + <translation>Copia els bytes</translation> + </message> + <message> + <source>Copy dust</source> + <translation>Copia el polsim</translation> + </message> + <message> + <source>Copy change</source> + <translation>Copia el canvi</translation> + </message> + <message> + <source>%1 to %2</source> + <translation>%1 a %2</translation> + </message> + <message> + <source>Are you sure you want to send?</source> + <translation>Esteu segur que ho voleu enviar?</translation> + </message> + <message> + <source>added as transaction fee</source> + <translation>S'ha afegit una taxa de transacció</translation> + </message> + <message> + <source>Total Amount %1</source> + <translation>Import total %1</translation> + </message> + <message> + <source>or</source> + <translation>o</translation> + </message> + <message> + <source>Confirm send coins</source> + <translation>Confirma l'enviament de monedes</translation> + </message> + <message> + <source>The recipient address is not valid. Please recheck.</source> + <translation>L'adreça del destinatari no és vàlida. Torneu-la a comprovar.</translation> + </message> + <message> + <source>The amount to pay must be larger than 0.</source> + <translation>L'import a pagar ha de ser major que 0.</translation> + </message> + <message> + <source>The amount exceeds your balance.</source> + <translation>L'import supera el vostre balanç.</translation> + </message> + <message> + <source>The total exceeds your balance when the %1 transaction fee is included.</source> + <translation>El total excedeix el vostre balanç quan s'afegeix la comissió a la transacció %1.</translation> + </message> + <message> + <source>Duplicate address found: addresses should only be used once each.</source> + <translation>S'ha trobat una adreça duplicada: les adreces només s'haurien d'utilitzar una vegada cada una.</translation> + </message> + <message> + <source>Transaction creation failed!</source> + <translation>La creació de la transacció ha fallat!</translation> + </message> + <message> + <source>A fee higher than %1 is considered an absurdly high fee.</source> + <translation>Una comissió superior a %1 es considera una comissió absurdament alta.</translation> + </message> + <message> + <source>Payment request expired.</source> + <translation>La sol·licitud de pagament ha vençut.</translation> + </message> + <message> + <source>Pay only the required fee of %1</source> + <translation>Paga només la comissió necessària de %1</translation> + </message> + <message> + <source>Warning: Invalid Bitcoin address</source> + <translation>Avís: adreça Bitcoin no vàlida</translation> + </message> + <message> + <source>Warning: Unknown change address</source> + <translation>Avís: adreça de canvi desconeguda</translation> + </message> + <message> + <source>(no label)</source> + <translation>(sense etiqueta)</translation> + </message> </context> <context> <name>SendCoinsEntry</name> @@ -1451,7 +2093,7 @@ </message> <message> <source>Choose previously used address</source> - <translation>Escull una adreça feta servir anteriorment</translation> + <translation>Tria les adreces fetes servir amb anterioritat</translation> </message> <message> <source>This is a normal payment.</source> @@ -1513,6 +2155,17 @@ <source>Memo:</source> <translation>Memo:</translation> </message> + <message> + <source>Enter a label for this address to add it to your address book</source> + <translation>Introduïu una etiqueta per a aquesta adreça per afegir-la a la llibreta d'adreces</translation> + </message> +</context> +<context> + <name>SendConfirmationDialog</name> + <message> + <source>Yes</source> + <translation>Sí</translation> + </message> </context> <context> <name>ShutdownWindow</name> @@ -1545,11 +2198,11 @@ </message> <message> <source>Alt+A</source> - <translation>Alt+A</translation> + <translation>Alta+A</translation> </message> <message> <source>Paste address from clipboard</source> - <translation>Enganxa l'adreça del porta-retalls</translation> + <translation>Enganxar adreça del porta-retalls</translation> </message> <message> <source>Alt+P</source> @@ -1607,6 +2260,58 @@ <source>Reset all verify message fields</source> <translation>Neteja tots els camps de verificació de missatge</translation> </message> + <message> + <source>Click "Sign Message" to generate signature</source> + <translation>Feu clic a «Signa el missatge» per a generar una signatura</translation> + </message> + <message> + <source>The entered address is invalid.</source> + <translation>L'adreça introduïda no és vàlida.</translation> + </message> + <message> + <source>Please check the address and try again.</source> + <translation>Comproveu l'adreça i torneu-ho a provar.</translation> + </message> + <message> + <source>The entered address does not refer to a key.</source> + <translation>L'adreça introduïda no referencia a cap clau.</translation> + </message> + <message> + <source>Wallet unlock was cancelled.</source> + <translation>El desbloqueig del moneder ha estat cancelat.</translation> + </message> + <message> + <source>Private key for the entered address is not available.</source> + <translation>La clau privada per a la adreça introduïda no està disponible.</translation> + </message> + <message> + <source>Message signing failed.</source> + <translation>La signatura del missatge ha fallat.</translation> + </message> + <message> + <source>Message signed.</source> + <translation>Missatge signat.</translation> + </message> + <message> + <source>The signature could not be decoded.</source> + <translation>La signatura no s'ha pogut descodificar.</translation> + </message> + <message> + <source>Please check the signature and try again.</source> + <translation>Comproveu la signatura i torneu-ho a provar.</translation> + </message> + <message> + <source>The signature did not match the message digest.</source> + <translation>La signatura no coincideix amb el resum del missatge.</translation> + </message> + <message> + <source>Message verification failed.</source> + <translation>Ha fallat la verificació del missatge.</translation> + </message> + <message> + <source>Message verified.</source> + <translation>Missatge verificat.</translation> + </message> </context> <context> <name>SplashScreen</name> @@ -1623,11 +2328,404 @@ </message> </context> <context> + <name>TransactionDesc</name> + <message> + <source>Open until %1</source> + <translation>Obert fins %1</translation> + </message> + <message> + <source>%1/offline</source> + <translation>%1/fora de línia</translation> + </message> + <message> + <source>%1/unconfirmed</source> + <translation>%1/sense confirmar</translation> + </message> + <message> + <source>%1 confirmations</source> + <translation>%1 confirmacions</translation> + </message> + <message> + <source>Status</source> + <translation>Estat</translation> + </message> + <message> + <source>, has not been successfully broadcast yet</source> + <translation>, encara no ha estat emès correctement</translation> + </message> + <message> + <source>Date</source> + <translation>Data</translation> + </message> + <message> + <source>Source</source> + <translation>Font</translation> + </message> + <message> + <source>Generated</source> + <translation>Generada</translation> + </message> + <message> + <source>From</source> + <translation>De</translation> + </message> + <message> + <source>unknown</source> + <translation>desconegut</translation> + </message> + <message> + <source>To</source> + <translation>A</translation> + </message> + <message> + <source>own address</source> + <translation>adreça pròpia</translation> + </message> + <message> + <source>watch-only</source> + <translation>només lectura</translation> + </message> + <message> + <source>label</source> + <translation>etiqueta</translation> + </message> + <message> + <source>Credit</source> + <translation>Crèdit</translation> + </message> + <message> + <source>not accepted</source> + <translation>no acceptat</translation> + </message> + <message> + <source>Debit</source> + <translation>Dèbit</translation> + </message> + <message> + <source>Total debit</source> + <translation>Dèbit total</translation> + </message> + <message> + <source>Total credit</source> + <translation>Crèdit total</translation> + </message> + <message> + <source>Transaction fee</source> + <translation>Comissió de transacció</translation> + </message> + <message> + <source>Net amount</source> + <translation>Import net</translation> + </message> + <message> + <source>Message</source> + <translation>Missatge</translation> + </message> + <message> + <source>Comment</source> + <translation>Comentari</translation> + </message> + <message> + <source>Transaction ID</source> + <translation>ID de la transacció</translation> + </message> + <message> + <source>Merchant</source> + <translation>Mercader</translation> + </message> + <message> + <source>Generated coins must mature %1 blocks before they can be spent. When you generated this block, it was broadcast to the network to be added to the block chain. If it fails to get into the chain, its state will change to "not accepted" and it won't be spendable. This may occasionally happen if another node generates a block within a few seconds of yours.</source> + <translation>Les monedes generades han de madurar %1 blocs abans de poder ser gastades. Quan genereu aquest bloc, es farà saber a la xarxa per tal d'afegir-lo a la cadena de blocs. Si no pot fer-se lloc a la cadena, el seu estat canviarà a «no acceptat» i no es podrà gastar. Això pot passar ocasionalment si un altre node genera un bloc en un marge de segons respecte al vostre.</translation> + </message> + <message> + <source>Debug information</source> + <translation>Informació de depuració</translation> + </message> + <message> + <source>Transaction</source> + <translation>Transacció</translation> + </message> + <message> + <source>Inputs</source> + <translation>Entrades</translation> + </message> + <message> + <source>Amount</source> + <translation>Import</translation> + </message> + <message> + <source>true</source> + <translation>cert</translation> + </message> + <message> + <source>false</source> + <translation>fals</translation> + </message> +</context> +<context> <name>TransactionDescDialog</name> <message> <source>This pane shows a detailed description of the transaction</source> <translation>Aquest panell mostra una descripció detallada de la transacció</translation> </message> + </context> +<context> + <name>TransactionTableModel</name> + <message> + <source>Date</source> + <translation>Data</translation> + </message> + <message> + <source>Type</source> + <translation>Tipus</translation> + </message> + <message> + <source>Label</source> + <translation>Etiqueta</translation> + </message> + <message> + <source>Open until %1</source> + <translation>Obert fins %1</translation> + </message> + <message> + <source>Offline</source> + <translation>Fora de línia</translation> + </message> + <message> + <source>Unconfirmed</source> + <translation>Sense confirmar</translation> + </message> + <message> + <source>Abandoned</source> + <translation>Abandonada</translation> + </message> + <message> + <source>Confirming (%1 of %2 recommended confirmations)</source> + <translation>Confirmant (%1 de %2 confirmacions recomanades)</translation> + </message> + <message> + <source>Confirmed (%1 confirmations)</source> + <translation>Confirmat (%1 confirmacions)</translation> + </message> + <message> + <source>Conflicted</source> + <translation>En conflicte</translation> + </message> + <message> + <source>Immature (%1 confirmations, will be available after %2)</source> + <translation>Immadur (%1 confirmacions, serà disponible després de %2)</translation> + </message> + <message> + <source>This block was not received by any other nodes and will probably not be accepted!</source> + <translation>Aquest bloc no ha estat rebut per cap altre node i probablement no serà acceptat!</translation> + </message> + <message> + <source>Generated but not accepted</source> + <translation>Generat però no acceptat</translation> + </message> + <message> + <source>Received with</source> + <translation>Rebuda amb</translation> + </message> + <message> + <source>Received from</source> + <translation>Rebuda de</translation> + </message> + <message> + <source>Sent to</source> + <translation>Enviada a</translation> + </message> + <message> + <source>Payment to yourself</source> + <translation>Pagament a un mateix</translation> + </message> + <message> + <source>Mined</source> + <translation>Minada</translation> + </message> + <message> + <source>watch-only</source> + <translation>només lectura</translation> + </message> + <message> + <source>(n/a)</source> + <translation>(n/a)</translation> + </message> + <message> + <source>(no label)</source> + <translation>(sense etiqueta)</translation> + </message> + <message> + <source>Transaction status. Hover over this field to show number of confirmations.</source> + <translation>Estat de la transacció. Desplaceu-vos sobre aquest camp per mostrar el nombre de confirmacions.</translation> + </message> + <message> + <source>Date and time that the transaction was received.</source> + <translation>Data i hora en que la transacció va ser rebuda.</translation> + </message> + <message> + <source>Type of transaction.</source> + <translation>Tipus de transacció.</translation> + </message> + <message> + <source>Whether or not a watch-only address is involved in this transaction.</source> + <translation>Si està implicada o no una adreça només de lectura en la transacció.</translation> + </message> + <message> + <source>User-defined intent/purpose of the transaction.</source> + <translation>Intenció/propòsit de la transacció definida per l'usuari.</translation> + </message> + <message> + <source>Amount removed from or added to balance.</source> + <translation>Import extret o afegit del balanç.</translation> + </message> +</context> +<context> + <name>TransactionView</name> + <message> + <source>All</source> + <translation>Tot</translation> + </message> + <message> + <source>Today</source> + <translation>Avui</translation> + </message> + <message> + <source>This week</source> + <translation>Aquesta setmana</translation> + </message> + <message> + <source>This month</source> + <translation>Aquest mes</translation> + </message> + <message> + <source>Last month</source> + <translation>El mes passat</translation> + </message> + <message> + <source>This year</source> + <translation>Enguany</translation> + </message> + <message> + <source>Range...</source> + <translation>Rang...</translation> + </message> + <message> + <source>Received with</source> + <translation>Rebuda amb</translation> + </message> + <message> + <source>Sent to</source> + <translation>Enviada a</translation> + </message> + <message> + <source>To yourself</source> + <translation>A un mateix</translation> + </message> + <message> + <source>Mined</source> + <translation>Minada</translation> + </message> + <message> + <source>Other</source> + <translation>Altres</translation> + </message> + <message> + <source>Enter address or label to search</source> + <translation>Introduïu una adreça o una etiqueta per cercar</translation> + </message> + <message> + <source>Min amount</source> + <translation>Import mínim</translation> + </message> + <message> + <source>Copy address</source> + <translation>Copia l'adreça</translation> + </message> + <message> + <source>Copy label</source> + <translation>Copia l'etiqueta</translation> + </message> + <message> + <source>Copy amount</source> + <translation>Copia l'import</translation> + </message> + <message> + <source>Copy transaction ID</source> + <translation>Copia l'ID de transacció</translation> + </message> + <message> + <source>Copy raw transaction</source> + <translation>Copia la transacció crua</translation> + </message> + <message> + <source>Edit label</source> + <translation>Editar etiqueta</translation> + </message> + <message> + <source>Show transaction details</source> + <translation>Mostra detalls de la transacció</translation> + </message> + <message> + <source>Export Transaction History</source> + <translation>Exporta l'historial de transacció</translation> + </message> + <message> + <source>Comma separated file (*.csv)</source> + <translation>Fitxer separat per comes (*.csv)</translation> + </message> + <message> + <source>Confirmed</source> + <translation>Confirmat</translation> + </message> + <message> + <source>Watch-only</source> + <translation>Només de lectura</translation> + </message> + <message> + <source>Date</source> + <translation>Data</translation> + </message> + <message> + <source>Type</source> + <translation>Tipus</translation> + </message> + <message> + <source>Label</source> + <translation>Etiqueta</translation> + </message> + <message> + <source>Address</source> + <translation>Adreça</translation> + </message> + <message> + <source>ID</source> + <translation>ID</translation> + </message> + <message> + <source>Exporting Failed</source> + <translation>L'exportació ha fallat</translation> + </message> + <message> + <source>There was an error trying to save the transaction history to %1.</source> + <translation>S'ha produït un error en provar de desar l'historial de transacció a %1.</translation> + </message> + <message> + <source>Exporting Successful</source> + <translation>Exportació amb èxit</translation> + </message> + <message> + <source>The transaction history was successfully saved to %1.</source> + <translation>L'historial de transaccions s'ha desat correctament a %1.</translation> + </message> + <message> + <source>Range:</source> + <translation>Rang:</translation> + </message> + <message> + <source>to</source> + <translation>a</translation> + </message> </context> <context> <name>UnitDisplayStatusBarControl</name> @@ -1637,6 +2735,55 @@ </message> </context> <context> + <name>WalletFrame</name> + <message> + <source>No wallet has been loaded.</source> + <translation>No s'ha carregat cap moneder.</translation> + </message> +</context> +<context> + <name>WalletModel</name> + <message> + <source>Send Coins</source> + <translation>Envia monedes</translation> + </message> +</context> +<context> + <name>WalletView</name> + <message> + <source>&Export</source> + <translation>&Exporta</translation> + </message> + <message> + <source>Export the data in the current tab to a file</source> + <translation>Exporta les dades de la pestanya actual a un fitxer</translation> + </message> + <message> + <source>Backup Wallet</source> + <translation>Còpia de seguretat del moneder</translation> + </message> + <message> + <source>Wallet Data (*.dat)</source> + <translation>Dades del moneder (*.dat)</translation> + </message> + <message> + <source>Backup Failed</source> + <translation>Ha fallat la còpia de seguretat</translation> + </message> + <message> + <source>There was an error trying to save the wallet data to %1.</source> + <translation>S'ha produït un error en provar de desar les dades del moneder a %1.</translation> + </message> + <message> + <source>Backup Successful</source> + <translation>La còpia de seguretat s'ha realitzat correctament</translation> + </message> + <message> + <source>The wallet data was successfully saved to %1.</source> + <translation>S'han desat les dades del moneder correctament a %1.</translation> + </message> +</context> +<context> <name>bitcoin-core</name> <message> <source>Options:</source> @@ -1671,10 +2818,6 @@ <translation>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)</translation> </message> <message> - <source>Reduce storage requirements by pruning (deleting) old blocks. This mode is incompatible with -txindex and -rescan. Warning: Reverting this setting requires re-downloading the entire blockchain. (default: 0 = disable pruning blocks, >%u = target size in MiB to use for block files)</source> - <translation>Reduïu els requisits d'emmagatzematge podant (suprimint) els blocs antics. Aquest mode és incompatible amb -txindex i -rescan. Avís: la reversió d'aquest paràmetre implica haver de tornar a baixar la cadena de blocs sencera. (per defecte: 0 = inhabilita la poda de blocs, >%u = mida objectiu en MiB per utilitzar en els fitxers de blocs)</translation> - </message> - <message> <source>Rescans are not possible in pruned mode. You will need to use -reindex which will download the whole blockchain again.</source> <translation>Els rescanejos no són possible en el mode de poda. Caldrà que utilitzeu -reindex, que tornarà a baixar la cadena de blocs sencera.</translation> </message> @@ -1699,18 +2842,10 @@ <translation>No s'ha pogut iniciar el servidor HTTP. Vegeu debug.log per a més detalls.</translation> </message> <message> - <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> - <translation>Accepta connexions de fora (per defecte: 1 si no -proxy o -connect)</translation> - </message> - <message> <source>Bitcoin Core</source> <translation>Bitcoin Core</translation> </message> <message> - <source>-fallbackfee is set very high! This is the transaction fee you may pay when fee estimates are not available.</source> - <translation>-fallbackfee és molt elevat. Aquesta és la comissió de transacció que podeu pagar quan les estimacions de comissions no estan disponibles.</translation> - </message> - <message> <source>Bind to given address and always listen on it. Use [host]:port notation for IPv6</source> <translation>Vincula a una adreça específica i sempre escolta-hi. Utilitza la notació [host]:port per IPv6</translation> </message> @@ -1719,10 +2854,6 @@ <translation>Elimina totes les transaccions del moneder i només recupera aquelles de la cadena de blocs a través de -rescan a l'inici</translation> </message> <message> - <source>Distributed under the MIT software license, see the accompanying file COPYING or <http://www.opensource.org/licenses/mit-license.php>.</source> - <translation>Distribuït sota llicència de programari MIT. Vegeu el fitxer acompanyant COPYING o <http://www.opensource.org/licenses/mit-license.php>.</translation> - </message> - <message> <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source> <translation>Executa una ordre quan una transacció del moneder canviï (%s en cmd es canvia per TxID)</translation> </message> @@ -1731,22 +2862,6 @@ <translation>Defineix el nombre de fils de verificació d'scripts (%u a %d, 0 = auto, <0 = deixa tants nuclis lliures, per defecte: %d)</translation> </message> <message> - <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source> - <translation>Aquesta és una versió de pre-llançament - utilitza-la sota la teva responsabilitat - No usar per a minería o aplicacions de compra-venda</translation> - </message> - <message> - <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source> - <translation>Avís: la xarxa no sembla que hi estigui plenament d'acord. Alguns miners sembla que estan experimentant problemes.</translation> - </message> - <message> - <source>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</source> - <translation>Avís: sembla que no estem plenament d'acord amb els nostres iguals! Podria caler que actualitzar l'aplicació, o potser que ho facin altres nodes.</translation> - </message> - <message> - <source>Whitelist peers connecting from the given netmask or IP address. Can be specified multiple times.</source> - <translation>Afegeix a la llista blanca els iguals que es connecten de la màscara de xarxa o adreça IP donada. Es pot especificar moltes vegades.</translation> - </message> - <message> <source><category> can be:</source> <translation><category> pot ser:</translation> </message> @@ -1755,10 +2870,6 @@ <translation>Opcions de la creació de blocs:</translation> </message> <message> - <source>Connect only to the specified node(s)</source> - <translation>Connecta només al(s) node(s) especificats</translation> - </message> - <message> <source>Connection options:</source> <translation>Opcions de connexió:</translation> </message> @@ -1847,6 +2958,10 @@ <translation>Utilitza UPnP per a mapejar el port d'escolta (per defecte: %u)</translation> </message> <message> + <source>Use the test chain</source> + <translation>Utilitza la cadena de proves</translation> + </message> + <message> <source>Verifying blocks...</source> <translation>S'estan verificant els blocs...</translation> </message> @@ -1859,6 +2974,14 @@ <translation>El moneder %s resideix fora del directori de dades %s</translation> </message> <message> + <source>Wallet debugging/testing options:</source> + <translation>Opcions de depuració/proves del moneder:</translation> + </message> + <message> + <source>Wallet needed to be rewritten: restart %s to complete</source> + <translation>Cal reescriure el moneder: reinicieu %s per a completar-ho</translation> + </message> + <message> <source>Wallet options:</source> <translation>Opcions de moneder:</translation> </message> @@ -1903,10 +3026,6 @@ <translation>Mida màxima de les dades en les transaccions de l'operador en què confiem i en les meves (per defecte: %u)</translation> </message> <message> - <source>Query for peer addresses via DNS lookup, if low on addresses (default: 1 unless -connect)</source> - <translation>Consulta a adreces d'iguals a través de DNS, si es troba baix en adreces (per defecte: 1 a menys que -connect)</translation> - </message> - <message> <source>Randomize credentials for every proxy connection. This enables Tor stream isolation (default: %u)</source> <translation>Genera a l'atzar credencials per a cada connexió proxy. Això habilita l'aïllament del flux de Tor (per defecte: %u)</translation> </message> @@ -1919,10 +3038,6 @@ <translation>L'import de la transacció és massa petit per enviar-la després que se'n dedueixi la comissió</translation> </message> <message> - <source>This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit <https://www.openssl.org/> and cryptographic software written by Eric Young and UPnP software written by Thomas Bernard.</source> - <translation>Aquest producte inclou programari desenvolupat pel projecte OpenSSL per a ús a l'OpenSSL Toolkit <https://www.openssl.org/> i programari criptogràfic escrit per Eric Young i programari UPnP escrit per Thomas Bernard.</translation> - </message> - <message> <source>Whitelisted peers cannot be DoS banned and their transactions are always relayed, even if they are already in the mempool, useful e.g. for a gateway</source> <translation>Els iguals en la llista blanca no poden ser bandejats per DoS i es transmetran sempre llurs transaccions, fins i tot si ja són a la mempool. Això és útil, p. ex., per a una passarel·la</translation> </message> @@ -1948,7 +3063,7 @@ </message> <message> <source>Information</source> - <translation>&Informació</translation> + <translation>Informació</translation> </message> <message> <source>Invalid amount for -paytxfee=<amount>: '%s' (must be at least %s)</source> @@ -2007,10 +3122,6 @@ <translation>Import de la transacció massa petit</translation> </message> <message> - <source>Transaction amounts must be positive</source> - <translation>Els imports de les transaccions han de ser positius</translation> - </message> - <message> <source>Transaction too large for fee policy</source> <translation>Transacció massa gran per a la política de comissions</translation> </message> @@ -2135,10 +3246,6 @@ <translation>Defineix la mida clau disponible a <n> (per defecte: %u)</translation> </message> <message> - <source>Set minimum block size in bytes (default: %u)</source> - <translation>Defineix la mida de bloc mínima en bytes (per defecte: %u)</translation> - </message> - <message> <source>Set the number of threads to service RPC calls (default: %d)</source> <translation>Defineix el nombre de fils a crides de servei RPC (per defecte: %d)</translation> </message> @@ -2159,10 +3266,22 @@ <translation>Gasta el canvi no confirmat en enviar les transaccions (per defecte: %u)</translation> </message> <message> + <source>Starting network threads...</source> + <translation>S'estan iniciant els fils de la xarxa...</translation> + </message> + <message> <source>Threshold for disconnecting misbehaving peers (default: %u)</source> <translation>Llindar per a desconnectar els iguals de comportament qüestionable (per defecte: %u)</translation> </message> <message> + <source>Transaction amounts must not be negative</source> + <translation>Els imports de la transacció no han de ser negatius</translation> + </message> + <message> + <source>Transaction must have at least one recipient</source> + <translation>La transacció ha de tenir com a mínim un destinatari</translation> + </message> + <message> <source>Unknown network specified in -onlynet: '%s'</source> <translation>Xarxa desconeguda especificada a -onlynet: '%s'</translation> </message> diff --git a/src/qt/locale/bitcoin_ca@valencia.ts b/src/qt/locale/bitcoin_ca@valencia.ts index df0f750a61..0123f8faab 100644 --- a/src/qt/locale/bitcoin_ca@valencia.ts +++ b/src/qt/locale/bitcoin_ca@valencia.ts @@ -41,6 +41,77 @@ <source>&Delete</source> <translation>&Elimina</translation> </message> + <message> + <source>Choose the address to send coins to</source> + <translation>Trieu una adreça on voleu enviar monedes</translation> + </message> + <message> + <source>Choose the address to receive coins with</source> + <translation>Trieu l'adreça on voleu rebre monedes</translation> + </message> + <message> + <source>C&hoose</source> + <translation>T&ria</translation> + </message> + <message> + <source>Sending addresses</source> + <translation>S'estan enviant les adreces</translation> + </message> + <message> + <source>Receiving addresses</source> + <translation>S'estan rebent les adreces</translation> + </message> + <message> + <source>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source> + <translation>Estes són les vostres adreces de Bitcoin per enviar els pagaments. Sempre reviseu l'import i l'adreça del destinatari abans de transferir monedes.</translation> + </message> + <message> + <source>These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction.</source> + <translation>Estes són les vostres adreces Bitcoin per rebre pagaments. Es recomana utilitzar una adreça nova de recepció per a cada transacció.</translation> + </message> + <message> + <source>&Copy Address</source> + <translation>&Copia l'adreça</translation> + </message> + <message> + <source>Copy &Label</source> + <translation>Copia l'&etiqueta</translation> + </message> + <message> + <source>&Edit</source> + <translation>&Edita</translation> + </message> + <message> + <source>Export Address List</source> + <translation>Exporta la llista d'adreces</translation> + </message> + <message> + <source>Comma separated file (*.csv)</source> + <translation>Fitxer de separació amb comes (*.csv)</translation> + </message> + <message> + <source>Exporting Failed</source> + <translation>L'exportació ha fallat</translation> + </message> + <message> + <source>There was an error trying to save the address list to %1. Please try again.</source> + <translation>S'ha produït un error en guardar la llista d'adreces a %1. Torneu-ho a provar.</translation> + </message> +</context> +<context> + <name>AddressTableModel</name> + <message> + <source>Label</source> + <translation>Etiqueta</translation> + </message> + <message> + <source>Address</source> + <translation>Adreça</translation> + </message> + <message> + <source>(no label)</source> + <translation>(sense etiqueta)</translation> + </message> </context> <context> <name>AskPassphraseDialog</name> @@ -60,6 +131,90 @@ <source>Repeat new passphrase</source> <translation>Repetiu la nova contrasenya</translation> </message> + <message> + <source>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>.</source> + <translation>Introduïu la contrasenya nova al moneder.<br/>Utilitzeu una contrasenya de <b>deu o més caràcters aleatoris</b>, o <b>vuit o més paraules</b>.</translation> + </message> + <message> + <source>Encrypt wallet</source> + <translation>Encripta el moneder</translation> + </message> + <message> + <source>This operation needs your wallet passphrase to unlock the wallet.</source> + <translation>Esta operació requereix la contrasenya del moneder per a desbloquejar-lo.</translation> + </message> + <message> + <source>Unlock wallet</source> + <translation>Desbloqueja el moneder</translation> + </message> + <message> + <source>This operation needs your wallet passphrase to decrypt the wallet.</source> + <translation>Esta operació requereix la contrasenya del moneder per desencriptar-lo.</translation> + </message> + <message> + <source>Decrypt wallet</source> + <translation>Desencripta el moneder</translation> + </message> + <message> + <source>Change passphrase</source> + <translation>Canvia la contrasenya</translation> + </message> + <message> + <source>Enter the old passphrase and new passphrase to the wallet.</source> + <translation>Introduïu la contrasenya antiga i la contrasenya nova al moneder.</translation> + </message> + <message> + <source>Confirm wallet encryption</source> + <translation>Confirma l'encriptació del moneder</translation> + </message> + <message> + <source>Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR BITCOINS</b>!</source> + <translation>Avís: si encripteu el vostre moneder i perdeu la contrasenya, <b>PERDREU TOTS ELS VOSTRES BITCOINS</b>!</translation> + </message> + <message> + <source>Are you sure you wish to encrypt your wallet?</source> + <translation>Esteu segur que voleu encriptar el vostre moneder?</translation> + </message> + <message> + <source>Wallet encrypted</source> + <translation>Moneder encriptat</translation> + </message> + <message> + <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source> + <translation>IMPORTANT: Tota copia de seguretat que hàgeu realitzat hauria de ser reemplaçada pel, recentment generat, fitxer encriptat del moneder.</translation> + </message> + <message> + <source>Wallet encryption failed</source> + <translation>L'encriptació del moneder ha fallat</translation> + </message> + <message> + <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source> + <translation>L'encriptació del moneder ha fallat per un error intern. El moneder no ha estat encriptat.</translation> + </message> + <message> + <source>The supplied passphrases do not match.</source> + <translation>La contrasenya introduïda no coincideix.</translation> + </message> + <message> + <source>Wallet unlock failed</source> + <translation>El desbloqueig del moneder ha fallat</translation> + </message> + <message> + <source>The passphrase entered for the wallet decryption was incorrect.</source> + <translation>La contrasenya introduïda per a desencriptar el moneder és incorrecta.</translation> + </message> + <message> + <source>Wallet decryption failed</source> + <translation>La desencriptació del moneder ha fallat</translation> + </message> + <message> + <source>Wallet passphrase was successfully changed.</source> + <translation>La contrasenya del moneder ha estat modificada correctament.</translation> + </message> + <message> + <source>Warning: The Caps Lock key is on!</source> + <translation>Avís: Les lletres majúscules estan activades!</translation> + </message> </context> <context> <name>BanTableModel</name> @@ -238,38 +393,6 @@ <source>&Command-line options</source> <translation>Opcions de la &línia d'ordes</translation> </message> - <message numerus="yes"> - <source>%n active connection(s) to Bitcoin network</source> - <translation><numerusform>%n connexió activa a la xarxa Bitcoin</numerusform><numerusform>%n connexions actives a la xarxa Bitcoin</numerusform></translation> - </message> - <message> - <source>No block source available...</source> - <translation>No hi ha cap font de bloc disponible...</translation> - </message> - <message numerus="yes"> - <source>Processed %n block(s) of transaction history.</source> - <translation><numerusform>Proccessats %n bloc de l'historial de transaccions.</numerusform><numerusform>Proccessats %n blocs de l'historial de transaccions.</numerusform></translation> - </message> - <message numerus="yes"> - <source>%n hour(s)</source> - <translation><numerusform>%n hora</numerusform><numerusform>%n hores</numerusform></translation> - </message> - <message numerus="yes"> - <source>%n day(s)</source> - <translation><numerusform>%n dia</numerusform><numerusform>%n dies</numerusform></translation> - </message> - <message numerus="yes"> - <source>%n week(s)</source> - <translation><numerusform>%n setmana</numerusform><numerusform>%n setmanes</numerusform></translation> - </message> - <message> - <source>%1 and %2</source> - <translation>%1 i %2</translation> - </message> - <message numerus="yes"> - <source>%n year(s)</source> - <translation><numerusform>%n any</numerusform><numerusform>%n anys</numerusform></translation> - </message> <message> <source>%1 behind</source> <translation>%1 darrere</translation> @@ -348,7 +471,7 @@ <source>Wallet is <b>encrypted</b> and currently <b>locked</b></source> <translation>El moneder està <b>encriptat</b> i actualment <b>bloquejat</b></translation> </message> -</context> + </context> <context> <name>CoinControlDialog</name> <message> @@ -368,10 +491,6 @@ <translation>Import:</translation> </message> <message> - <source>Priority:</source> - <translation>Prioritat:</translation> - </message> - <message> <source>Fee:</source> <translation>Comissió</translation> </message> @@ -424,8 +543,80 @@ <translation>Confirmat</translation> </message> <message> - <source>Priority</source> - <translation>Prioritat</translation> + <source>Copy address</source> + <translation>Copiar adreça </translation> + </message> + <message> + <source>Copy label</source> + <translation>Copiar etiqueta</translation> + </message> + <message> + <source>Copy amount</source> + <translation>Copia l'import</translation> + </message> + <message> + <source>Copy transaction ID</source> + <translation>Copiar ID de transacció</translation> + </message> + <message> + <source>Lock unspent</source> + <translation>Bloqueja sense gastar</translation> + </message> + <message> + <source>Unlock unspent</source> + <translation>Desbloqueja sense gastar</translation> + </message> + <message> + <source>Copy quantity</source> + <translation>Copia la quantitat</translation> + </message> + <message> + <source>Copy fee</source> + <translation>Copia la comissió</translation> + </message> + <message> + <source>Copy after fee</source> + <translation>Copia la comissió posterior</translation> + </message> + <message> + <source>Copy bytes</source> + <translation>Copia els bytes</translation> + </message> + <message> + <source>Copy dust</source> + <translation>Copia el polsim</translation> + </message> + <message> + <source>Copy change</source> + <translation>Copia el canvi</translation> + </message> + <message> + <source>(%1 locked)</source> + <translation>(%1 bloquejada)</translation> + </message> + <message> + <source>yes</source> + <translation>sí</translation> + </message> + <message> + <source>no</source> + <translation>no</translation> + </message> + <message> + <source>Can vary +/- %1 satoshi(s) per input.</source> + <translation>Pot variar +/- %1 satoshi(s) per entrada.</translation> + </message> + <message> + <source>(no label)</source> + <translation>(sense etiqueta)</translation> + </message> + <message> + <source>change from %1 (%2)</source> + <translation>canvia de %1 (%2)</translation> + </message> + <message> + <source>(change)</source> + <translation>(canvia)</translation> </message> </context> <context> @@ -450,6 +641,38 @@ <source>&Address</source> <translation>&Adreça</translation> </message> + <message> + <source>New receiving address</source> + <translation>Nova adreça de recepció.</translation> + </message> + <message> + <source>New sending address</source> + <translation>Nova adreça d'enviament</translation> + </message> + <message> + <source>Edit receiving address</source> + <translation>Edita les adreces de recepció</translation> + </message> + <message> + <source>Edit sending address</source> + <translation>Edita les adreces d'enviament</translation> + </message> + <message> + <source>The entered address "%1" is not a valid Bitcoin address.</source> + <translation>L'adreça introduïda «%1» no és una adreça de Bitcoin vàlida.</translation> + </message> + <message> + <source>The entered address "%1" is already in the address book.</source> + <translation>L'adreça introduïda «%1» ja és present a la llibreta d'adreces.</translation> + </message> + <message> + <source>Could not unlock wallet.</source> + <translation>No s'ha pogut desbloquejar el moneder.</translation> + </message> + <message> + <source>New key generation failed.</source> + <translation>Ha fallat la generació d'una nova clau.</translation> + </message> </context> <context> <name>FreespaceChecker</name> @@ -496,6 +719,22 @@ <source>command-line options</source> <translation>Opcions de la línia d'ordes</translation> </message> + <message> + <source>UI Options:</source> + <translation>Opcions d'interfície:</translation> + </message> + <message> + <source>Set language, for example "de_DE" (default: system locale)</source> + <translation>Defineix un idioma, per exemple «de_DE» (per defecte: preferències locals de sistema)</translation> + </message> + <message> + <source>Start minimized</source> + <translation>Inicia minimitzat</translation> + </message> + <message> + <source>Set SSL root certificates for payment request (default: -system-)</source> + <translation>Defineix certificats arrel SSL per a la sol·licitud de pagament (per defecte: -sistema-)</translation> + </message> </context> <context> <name>Intro</name> @@ -519,15 +758,22 @@ <source>Error</source> <translation>Error</translation> </message> - <message numerus="yes"> - <source>%n GB of free space available</source> - <translation><numerusform>%n GB d'espai lliure disponible</numerusform><numerusform>%n GB d'espai lliure disponible</numerusform></translation> + </context> +<context> + <name>ModalOverlay</name> + <message> + <source>Form</source> + <translation>Formulari</translation> </message> - <message numerus="yes"> - <source>(of %n GB needed)</source> - <translation><numerusform>(de %n GB necessari)</numerusform><numerusform>(de %n GB necessaris)</numerusform></translation> + <message> + <source>Last block time</source> + <translation>Últim temps de bloc</translation> </message> -</context> + <message> + <source>Hide</source> + <translation>Amaga</translation> + </message> + </context> <context> <name>OpenURIDialog</name> <message> @@ -546,6 +792,10 @@ <source>Select payment request file</source> <translation>Selecciona un fitxer de sol·licitud de pagament</translation> </message> + <message> + <source>Select payment request file to open</source> + <translation>Selecciona el fitxer de sol·licitud de pagament per obrir</translation> + </message> </context> <context> <name>OptionsDialog</name> @@ -814,6 +1064,97 @@ </message> </context> <context> + <name>PaymentServer</name> + <message> + <source>Payment request error</source> + <translation>Error en la sol·licitud de pagament</translation> + </message> + <message> + <source>Cannot start bitcoin: click-to-pay handler</source> + <translation>No es pot iniciar bitcoin: gestor clica-per-pagar</translation> + </message> + <message> + <source>URI handling</source> + <translation>Gestió d'URI</translation> + </message> + <message> + <source>Payment request fetch URL is invalid: %1</source> + <translation>L'URL de recuperació de la sol·licitud de pagament no és vàlida: %1</translation> + </message> + <message> + <source>Invalid payment address %1</source> + <translation>Adreça de pagament no vàlida %1</translation> + </message> + <message> + <source>URI cannot be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters.</source> + <translation>L'URI no pot ser analitzat! Això pot ser a causa d'una adreça de Bitcoin no vàlida o per paràmetres URI amb mal format.</translation> + </message> + <message> + <source>Payment request file handling</source> + <translation>Gestió de fitxers de les sol·licituds de pagament</translation> + </message> + <message> + <source>Payment request file cannot be read! This can be caused by an invalid payment request file.</source> + <translation>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.</translation> + </message> + <message> + <source>Payment request rejected</source> + <translation>La sol·licitud de pagament s'ha rebutjat</translation> + </message> + <message> + <source>Payment request network doesn't match client network.</source> + <translation>La xarxa de la sol·licitud de pagament no coincideix amb la xarxa del client.</translation> + </message> + <message> + <source>Payment request expired.</source> + <translation>La sol·licitud de pagament ha vençut.</translation> + </message> + <message> + <source>Payment request is not initialized.</source> + <translation>La sol·licitud de pagament no està inicialitzada.</translation> + </message> + <message> + <source>Unverified payment requests to custom payment scripts are unsupported.</source> + <translation>No s'accepten sol·licituds de pagament no verificades a scripts de pagament personalitzats.</translation> + </message> + <message> + <source>Invalid payment request.</source> + <translation>Sol·licitud de pagament no vàlida.</translation> + </message> + <message> + <source>Requested payment amount of %1 is too small (considered dust).</source> + <translation>L'import de pagament sol·licitat %1 és massa petit (es considera polsim).</translation> + </message> + <message> + <source>Refund from %1</source> + <translation>Reemborsament de %1</translation> + </message> + <message> + <source>Payment request %1 is too large (%2 bytes, allowed %3 bytes).</source> + <translation>La sol·licitud de pagament %1 és massa gran (%2 bytes, permés %3 bytes).</translation> + </message> + <message> + <source>Error communicating with %1: %2</source> + <translation>Error en comunicar amb %1: %2</translation> + </message> + <message> + <source>Payment request cannot be parsed!</source> + <translation>No es pot analitzar la sol·licitud de pagament!</translation> + </message> + <message> + <source>Bad response from server %1</source> + <translation>Mala resposta del servidor %1</translation> + </message> + <message> + <source>Network request error</source> + <translation>Error en la sol·licitud de xarxa</translation> + </message> + <message> + <source>Payment acknowledged</source> + <translation>Pagament reconegut</translation> + </message> +</context> +<context> <name>PeerTableModel</name> <message> <source>User Agent</source> @@ -823,11 +1164,7 @@ <source>Node/Service</source> <translation>Node/Servei</translation> </message> - <message> - <source>Ping Time</source> - <translation>Temps de ping</translation> - </message> -</context> + </context> <context> <name>QObject</name> <message> @@ -866,6 +1203,32 @@ <source>%1 ms</source> <translation>%1 ms</translation> </message> + <message> + <source>%1 and %2</source> + <translation>%1 i %2</translation> + </message> + </context> +<context> + <name>QObject::QObject</name> + </context> +<context> + <name>QRImageWidget</name> + <message> + <source>&Save Image...</source> + <translation>&Guarda la imatge...</translation> + </message> + <message> + <source>&Copy Image</source> + <translation>&Copia la imatge</translation> + </message> + <message> + <source>Save QR Code</source> + <translation>Guarda el codi QR</translation> + </message> + <message> + <source>PNG Image (*.png)</source> + <translation>Imatge PNG (*.png)</translation> + </message> </context> <context> <name>RPCConsole</name> @@ -1106,7 +1469,7 @@ </message> <message> <source>Clear all fields of the form.</source> - <translation>Esborra tots els camps del formuari.</translation> + <translation>Netejar tots els camps del formulari.</translation> </message> <message> <source>Clear</source> @@ -1136,6 +1499,18 @@ <source>Remove</source> <translation>Esborra</translation> </message> + <message> + <source>Copy label</source> + <translation>Copiar etiqueta</translation> + </message> + <message> + <source>Copy message</source> + <translation>Copia el missatge</translation> + </message> + <message> + <source>Copy amount</source> + <translation>Copia l'import</translation> + </message> </context> <context> <name>ReceiveRequestDialog</name> @@ -1155,8 +1530,67 @@ <source>&Save Image...</source> <translation>&Guarda la imatge...</translation> </message> + <message> + <source>Request payment to %1</source> + <translation>Sol·licita un pagament a %1</translation> + </message> + <message> + <source>Payment information</source> + <translation>Informació de pagament</translation> + </message> + <message> + <source>URI</source> + <translation>URI</translation> + </message> + <message> + <source>Address</source> + <translation>Adreça</translation> + </message> + <message> + <source>Amount</source> + <translation>Import</translation> + </message> + <message> + <source>Label</source> + <translation>Etiqueta</translation> + </message> + <message> + <source>Message</source> + <translation>Missatge</translation> + </message> + <message> + <source>Resulting URI too long, try to reduce the text for label / message.</source> + <translation>URI resultant massa llarga, intenta reduir el text per a la etiqueta / missatge</translation> + </message> + <message> + <source>Error encoding URI into QR Code.</source> + <translation>Error en codificar l'URI en un codi QR.</translation> + </message> </context> <context> + <name>RecentRequestsTableModel</name> + <message> + <source>Date</source> + <translation>Data</translation> + </message> + <message> + <source>Label</source> + <translation>Etiqueta</translation> + </message> + <message> + <source>Message</source> + <translation>Missatge</translation> + </message> + <message> + <source>(no label)</source> + <translation>(sense etiqueta)</translation> + </message> + <message> + <source>(no message)</source> + <translation>(sense missatge)</translation> + </message> + </context> +<context> <name>SendCoinsDialog</name> <message> <source>Send Coins</source> @@ -1191,12 +1625,8 @@ <translation>Import:</translation> </message> <message> - <source>Priority:</source> - <translation>Prioritat:</translation> - </message> - <message> <source>Fee:</source> - <translation>Comissió:</translation> + <translation>Comissió</translation> </message> <message> <source>After Fee:</source> @@ -1263,10 +1693,6 @@ <translation>(No s'ha inicialitzat encara la comissió intel·ligent. Normalment pren uns pocs blocs...)</translation> </message> <message> - <source>Confirmation time:</source> - <translation>Temps de confirmació:</translation> - </message> - <message> <source>normal</source> <translation>normal</translation> </message> @@ -1306,6 +1732,98 @@ <source>S&end</source> <translation>E&nvia</translation> </message> + <message> + <source>Copy quantity</source> + <translation>Copia la quantitat</translation> + </message> + <message> + <source>Copy amount</source> + <translation>Copia l'import</translation> + </message> + <message> + <source>Copy fee</source> + <translation>Copia la comissió</translation> + </message> + <message> + <source>Copy after fee</source> + <translation>Copia la comissió posterior</translation> + </message> + <message> + <source>Copy bytes</source> + <translation>Copia els bytes</translation> + </message> + <message> + <source>Copy dust</source> + <translation>Copia el polsim</translation> + </message> + <message> + <source>Copy change</source> + <translation>Copia el canvi</translation> + </message> + <message> + <source>%1 to %2</source> + <translation>%1 a %2</translation> + </message> + <message> + <source>Are you sure you want to send?</source> + <translation>Esteu segur que ho voleu enviar?</translation> + </message> + <message> + <source>added as transaction fee</source> + <translation>S'ha afegit una taxa de transacció</translation> + </message> + <message> + <source>or</source> + <translation>o</translation> + </message> + <message> + <source>Confirm send coins</source> + <translation>Confirma l'enviament de monedes</translation> + </message> + <message> + <source>The recipient address is not valid. Please recheck.</source> + <translation>L'adreça de destinatari no és vàlida. Torneu-la a comprovar.</translation> + </message> + <message> + <source>The amount to pay must be larger than 0.</source> + <translation>L'import a pagar ha de ser major que 0.</translation> + </message> + <message> + <source>The amount exceeds your balance.</source> + <translation>L'import supera el vostre balanç.</translation> + </message> + <message> + <source>The total exceeds your balance when the %1 transaction fee is included.</source> + <translation>El total excedeix el teu balanç quan s'afig la comissió a la transacció %1.</translation> + </message> + <message> + <source>Duplicate address found: addresses should only be used once each.</source> + <translation>S'ha trobat una adreça duplicada: cal utilitzar les adreces només un cop cada vegada.</translation> + </message> + <message> + <source>Transaction creation failed!</source> + <translation>Ha fallat la creació de la transacció!</translation> + </message> + <message> + <source>A fee higher than %1 is considered an absurdly high fee.</source> + <translation>Una comissió superior a %1 es considera una comissió absurdament alta.</translation> + </message> + <message> + <source>Payment request expired.</source> + <translation>La sol·licitud de pagament ha vençut.</translation> + </message> + <message> + <source>Warning: Invalid Bitcoin address</source> + <translation>Avís: adreça Bitcoin no vàlida</translation> + </message> + <message> + <source>Warning: Unknown change address</source> + <translation>Avís: adreça de canvi desconeguda</translation> + </message> + <message> + <source>(no label)</source> + <translation>(sense etiqueta)</translation> + </message> </context> <context> <name>SendCoinsEntry</name> @@ -1323,7 +1841,7 @@ </message> <message> <source>Choose previously used address</source> - <translation>Trieu una adreça feta servir anteriorment</translation> + <translation>Tria les adreces fetes servir amb anterioritat</translation> </message> <message> <source>This is a normal payment.</source> @@ -1335,11 +1853,11 @@ </message> <message> <source>Alt+A</source> - <translation>Alta+A</translation> + <translation>Alt+A</translation> </message> <message> <source>Paste address from clipboard</source> - <translation>Apegar adreça del porta-retalls</translation> + <translation>Apega l'adreça del porta-retalls</translation> </message> <message> <source>Alt+P</source> @@ -1385,6 +1903,17 @@ <source>Memo:</source> <translation>Memo:</translation> </message> + <message> + <source>Enter a label for this address to add it to your address book</source> + <translation>Introduïu una etiqueta per a esta adreça per afegir-la a la llibreta d'adreces</translation> + </message> +</context> +<context> + <name>SendConfirmationDialog</name> + <message> + <source>Yes</source> + <translation>Sí</translation> + </message> </context> <context> <name>ShutdownWindow</name> @@ -1479,6 +2008,58 @@ <source>Reset all verify message fields</source> <translation>Neteja tots els camps de verificació de missatge</translation> </message> + <message> + <source>Click "Sign Message" to generate signature</source> + <translation>Feu clic a «Signa el missatge» per a generar una signatura</translation> + </message> + <message> + <source>The entered address is invalid.</source> + <translation>L'adreça introduïda no és vàlida.</translation> + </message> + <message> + <source>Please check the address and try again.</source> + <translation>Comproveu l'adreça i torneu-ho a provar.</translation> + </message> + <message> + <source>The entered address does not refer to a key.</source> + <translation>L'adreça introduïda no referencia a cap clau.</translation> + </message> + <message> + <source>Wallet unlock was cancelled.</source> + <translation>El desbloqueig del moneder ha estat cancelat.</translation> + </message> + <message> + <source>Private key for the entered address is not available.</source> + <translation>La clau privada per a la adreça introduïda no està disponible.</translation> + </message> + <message> + <source>Message signing failed.</source> + <translation>La signatura del missatge ha fallat.</translation> + </message> + <message> + <source>Message signed.</source> + <translation>Missatge signat.</translation> + </message> + <message> + <source>The signature could not be decoded.</source> + <translation>La signatura no s'ha pogut descodificar.</translation> + </message> + <message> + <source>Please check the signature and try again.</source> + <translation>Comproveu la signatura i torneu-ho a provar.</translation> + </message> + <message> + <source>The signature did not match the message digest.</source> + <translation>La signatura no coincideix amb el resum del missatge.</translation> + </message> + <message> + <source>Message verification failed.</source> + <translation>Ha fallat la verificació del missatge.</translation> + </message> + <message> + <source>Message verified.</source> + <translation>Missatge verificat.</translation> + </message> </context> <context> <name>SplashScreen</name> @@ -1495,11 +2076,396 @@ </message> </context> <context> + <name>TransactionDesc</name> + <message> + <source>Open until %1</source> + <translation>Obert fins %1</translation> + </message> + <message> + <source>%1/offline</source> + <translation>%1/fora de línia</translation> + </message> + <message> + <source>%1/unconfirmed</source> + <translation>%1/sense confirmar</translation> + </message> + <message> + <source>%1 confirmations</source> + <translation>%1 confirmacions</translation> + </message> + <message> + <source>Status</source> + <translation>Estat</translation> + </message> + <message> + <source>, has not been successfully broadcast yet</source> + <translation>, encara no ha estat emés correctement</translation> + </message> + <message> + <source>Date</source> + <translation>Data</translation> + </message> + <message> + <source>Source</source> + <translation>Font</translation> + </message> + <message> + <source>Generated</source> + <translation>Generat</translation> + </message> + <message> + <source>From</source> + <translation>Des de</translation> + </message> + <message> + <source>unknown</source> + <translation>desconegut</translation> + </message> + <message> + <source>To</source> + <translation>A</translation> + </message> + <message> + <source>own address</source> + <translation>Adreça pròpia</translation> + </message> + <message> + <source>watch-only</source> + <translation>només lectura</translation> + </message> + <message> + <source>label</source> + <translation>etiqueta</translation> + </message> + <message> + <source>Credit</source> + <translation>Crèdit</translation> + </message> + <message> + <source>not accepted</source> + <translation>no acceptat</translation> + </message> + <message> + <source>Debit</source> + <translation>Dèbit</translation> + </message> + <message> + <source>Total debit</source> + <translation>Dèbit total</translation> + </message> + <message> + <source>Total credit</source> + <translation>Crèdit total</translation> + </message> + <message> + <source>Transaction fee</source> + <translation>Comissió de transacció</translation> + </message> + <message> + <source>Net amount</source> + <translation>Import net</translation> + </message> + <message> + <source>Message</source> + <translation>Missatge</translation> + </message> + <message> + <source>Comment</source> + <translation>Comentar</translation> + </message> + <message> + <source>Transaction ID</source> + <translation>ID de transacció</translation> + </message> + <message> + <source>Merchant</source> + <translation>Mercader</translation> + </message> + <message> + <source>Generated coins must mature %1 blocks before they can be spent. When you generated this block, it was broadcast to the network to be added to the block chain. If it fails to get into the chain, its state will change to "not accepted" and it won't be spendable. This may occasionally happen if another node generates a block within a few seconds of yours.</source> + <translation>Les monedes generades han de madurar %1 blocs abans de poder ser gastades. Quan genereu este bloc, es farà saber a la xarxa per tal d'afegir-lo a la cadena de blocs. Si no pot fer-se lloc a la cadena, el seu estat canviarà a «no acceptat» i no es podrà gastar. Això pot passar ocasionalment si un altre node genera un bloc en un marge de segons respecte al vostre.</translation> + </message> + <message> + <source>Debug information</source> + <translation>Informació de depuració</translation> + </message> + <message> + <source>Transaction</source> + <translation>Transacció</translation> + </message> + <message> + <source>Inputs</source> + <translation>Entrades</translation> + </message> + <message> + <source>Amount</source> + <translation>Import</translation> + </message> + <message> + <source>true</source> + <translation>cert</translation> + </message> + <message> + <source>false</source> + <translation>fals</translation> + </message> +</context> +<context> <name>TransactionDescDialog</name> <message> <source>This pane shows a detailed description of the transaction</source> <translation>Este panell mostra una descripció detallada de la transacció</translation> </message> + </context> +<context> + <name>TransactionTableModel</name> + <message> + <source>Date</source> + <translation>Data</translation> + </message> + <message> + <source>Type</source> + <translation>Tipus</translation> + </message> + <message> + <source>Label</source> + <translation>Etiqueta</translation> + </message> + <message> + <source>Open until %1</source> + <translation>Obert fins %1</translation> + </message> + <message> + <source>Offline</source> + <translation>Fora de línia</translation> + </message> + <message> + <source>Unconfirmed</source> + <translation>Sense confirmar</translation> + </message> + <message> + <source>Confirming (%1 of %2 recommended confirmations)</source> + <translation>Confirmant (%1 de %2 confirmacions recomanades)</translation> + </message> + <message> + <source>Confirmed (%1 confirmations)</source> + <translation>Confirmat (%1 confirmacions)</translation> + </message> + <message> + <source>Conflicted</source> + <translation>En conflicte</translation> + </message> + <message> + <source>Immature (%1 confirmations, will be available after %2)</source> + <translation>Immadur (%1 confirmacions, serà disponible després de %2)</translation> + </message> + <message> + <source>This block was not received by any other nodes and will probably not be accepted!</source> + <translation>Este bloc no ha estat rebut per cap altre node i probablement no serà acceptat!</translation> + </message> + <message> + <source>Generated but not accepted</source> + <translation>Generat però no acceptat</translation> + </message> + <message> + <source>Received with</source> + <translation>Rebut amb</translation> + </message> + <message> + <source>Received from</source> + <translation>Rebut de</translation> + </message> + <message> + <source>Sent to</source> + <translation>Enviat a</translation> + </message> + <message> + <source>Payment to yourself</source> + <translation>Pagament a un mateix</translation> + </message> + <message> + <source>Mined</source> + <translation>Minat</translation> + </message> + <message> + <source>watch-only</source> + <translation>només lectura</translation> + </message> + <message> + <source>(n/a)</source> + <translation>(n/a)</translation> + </message> + <message> + <source>(no label)</source> + <translation>(sense etiqueta)</translation> + </message> + <message> + <source>Transaction status. Hover over this field to show number of confirmations.</source> + <translation>Estat de la transacció. Desplaceu-vos sobre este camp per mostrar el nombre de confirmacions.</translation> + </message> + <message> + <source>Date and time that the transaction was received.</source> + <translation>Data i hora en que la transacció va ser rebuda.</translation> + </message> + <message> + <source>Type of transaction.</source> + <translation>Tipus de transacció.</translation> + </message> + <message> + <source>Whether or not a watch-only address is involved in this transaction.</source> + <translation>Si està implicada o no una adreça només de lectura en la transacció.</translation> + </message> + <message> + <source>User-defined intent/purpose of the transaction.</source> + <translation>Intenció/propòsit de la transacció definida per l'usuari.</translation> + </message> + <message> + <source>Amount removed from or added to balance.</source> + <translation>Import extret o afegit del balanç.</translation> + </message> +</context> +<context> + <name>TransactionView</name> + <message> + <source>All</source> + <translation>Tot</translation> + </message> + <message> + <source>Today</source> + <translation>Hui</translation> + </message> + <message> + <source>This week</source> + <translation>Esta setmana</translation> + </message> + <message> + <source>This month</source> + <translation>Este mes</translation> + </message> + <message> + <source>Last month</source> + <translation>El mes passat</translation> + </message> + <message> + <source>This year</source> + <translation>Enguany</translation> + </message> + <message> + <source>Range...</source> + <translation>Rang...</translation> + </message> + <message> + <source>Received with</source> + <translation>Rebut amb</translation> + </message> + <message> + <source>Sent to</source> + <translation>Enviat a</translation> + </message> + <message> + <source>To yourself</source> + <translation>A un mateix</translation> + </message> + <message> + <source>Mined</source> + <translation>Minat</translation> + </message> + <message> + <source>Other</source> + <translation>Altres</translation> + </message> + <message> + <source>Enter address or label to search</source> + <translation>Introduïu una adreça o una etiqueta per cercar</translation> + </message> + <message> + <source>Min amount</source> + <translation>Import mínim</translation> + </message> + <message> + <source>Copy address</source> + <translation>Copiar adreça </translation> + </message> + <message> + <source>Copy label</source> + <translation>Copiar etiqueta</translation> + </message> + <message> + <source>Copy amount</source> + <translation>Copia l'import</translation> + </message> + <message> + <source>Copy transaction ID</source> + <translation>Copiar ID de transacció</translation> + </message> + <message> + <source>Edit label</source> + <translation>Editar etiqueta</translation> + </message> + <message> + <source>Show transaction details</source> + <translation>Mostra detalls de la transacció</translation> + </message> + <message> + <source>Export Transaction History</source> + <translation>Exporta l'historial de transacció</translation> + </message> + <message> + <source>Comma separated file (*.csv)</source> + <translation>Fitxer de separació amb comes (*.csv)</translation> + </message> + <message> + <source>Confirmed</source> + <translation>Confirmat</translation> + </message> + <message> + <source>Watch-only</source> + <translation>Només de lectura</translation> + </message> + <message> + <source>Date</source> + <translation>Data</translation> + </message> + <message> + <source>Type</source> + <translation>Tipus</translation> + </message> + <message> + <source>Label</source> + <translation>Etiqueta</translation> + </message> + <message> + <source>Address</source> + <translation>Adreça</translation> + </message> + <message> + <source>ID</source> + <translation>ID</translation> + </message> + <message> + <source>Exporting Failed</source> + <translation>L'exportació ha fallat</translation> + </message> + <message> + <source>There was an error trying to save the transaction history to %1.</source> + <translation>S'ha produït un error en provar de guardar l'historial de transacció a %1.</translation> + </message> + <message> + <source>Exporting Successful</source> + <translation>Exportació amb èxit</translation> + </message> + <message> + <source>The transaction history was successfully saved to %1.</source> + <translation>L'historial de transaccions s'ha guardat correctament a %1.</translation> + </message> + <message> + <source>Range:</source> + <translation>Rang:</translation> + </message> + <message> + <source>to</source> + <translation>a</translation> + </message> </context> <context> <name>UnitDisplayStatusBarControl</name> @@ -1509,6 +2475,55 @@ </message> </context> <context> + <name>WalletFrame</name> + <message> + <source>No wallet has been loaded.</source> + <translation>No s'ha carregat cap moneder.</translation> + </message> +</context> +<context> + <name>WalletModel</name> + <message> + <source>Send Coins</source> + <translation>Envia monedes</translation> + </message> +</context> +<context> + <name>WalletView</name> + <message> + <source>&Export</source> + <translation>&Exporta</translation> + </message> + <message> + <source>Export the data in the current tab to a file</source> + <translation>Exporta les dades de la pestanya actual a un fitxer</translation> + </message> + <message> + <source>Backup Wallet</source> + <translation>Còpia de seguretat del moneder</translation> + </message> + <message> + <source>Wallet Data (*.dat)</source> + <translation>Dades del moneder (*.dat)</translation> + </message> + <message> + <source>Backup Failed</source> + <translation>Ha fallat la còpia de seguretat</translation> + </message> + <message> + <source>There was an error trying to save the wallet data to %1.</source> + <translation>S'ha produït un error en provar de guardar les dades del moneder a %1.</translation> + </message> + <message> + <source>Backup Successful</source> + <translation>La còpia de seguretat s'ha realitzat correctament</translation> + </message> + <message> + <source>The wallet data was successfully saved to %1.</source> + <translation>S'han guardat les dades del moneder correctament a %1.</translation> + </message> +</context> +<context> <name>bitcoin-core</name> <message> <source>Options:</source> @@ -1531,12 +2546,16 @@ <translation>Accepta la línia d'ordes i ordes JSON-RPC </translation> </message> <message> - <source>Run in the background as a daemon and accept commands</source> - <translation>Executa en segon pla com a programa dimoni i accepta ordes</translation> + <source>Error: A fatal internal error occurred, see debug.log for details</source> + <translation>Error: s'ha produït un error intern fatal. Vegeu debug.log per a més detalls</translation> + </message> + <message> + <source>Pruning blockstore...</source> + <translation>S'està podant l'emmagatzemament de blocs...</translation> </message> <message> - <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> - <translation>Accepta connexions de fora (per defecte: 1 si no -proxy o -connect)</translation> + <source>Run in the background as a daemon and accept commands</source> + <translation>Executa en segon pla com a programa dimoni i accepta ordes</translation> </message> <message> <source>Bitcoin Core</source> @@ -1551,10 +2570,6 @@ <translation>Elimina totes les transaccions del moneder i només recupera aquelles de la cadena de blocs a través de -rescan a l'inici</translation> </message> <message> - <source>Distributed under the MIT software license, see the accompanying file COPYING or <http://www.opensource.org/licenses/mit-license.php>.</source> - <translation>Distribuït sota llicència de programari MIT. Vegeu el fitxer acompanyant COPYING o <http://www.opensource.org/licenses/mit-license.php>.</translation> - </message> - <message> <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source> <translation>Executa una orde quan una transacció del moneder canvie (%s en cmd es canvia per TxID)</translation> </message> @@ -1563,22 +2578,6 @@ <translation>Defineix el nombre de fils de verificació d'scripts (%u a %d, 0 = auto, <0 = deixa tants nuclis lliures, per defecte: %d)</translation> </message> <message> - <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source> - <translation>Esta és una versió de pre-llançament - utilitza-la sota la teva responsabilitat - No usar per a minería o aplicacions de compra-venda</translation> - </message> - <message> - <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source> - <translation>Avís: la xarxa no pareix que hi estiga plenament d'acord. Alguns miners pareix que estan experimentant problemes.</translation> - </message> - <message> - <source>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</source> - <translation>Avís: pareix que no estem plenament d'acord amb els nostres iguals! Podria caldre que actualitzar l'aplicació, o potser que ho facen altres nodes.</translation> - </message> - <message> - <source>Whitelist peers connecting from the given netmask or IP address. Can be specified multiple times.</source> - <translation>Afig a la llista blanca els iguals que es connecten de la màscara de xarxa o adreça IP donada. Es pot especificar moltes vegades.</translation> - </message> - <message> <source><category> can be:</source> <translation><category> pot ser:</translation> </message> @@ -1587,10 +2586,6 @@ <translation>Opcions de la creació de blocs:</translation> </message> <message> - <source>Connect only to the specified node(s)</source> - <translation>Connecta només al(s) node(s) especificats</translation> - </message> - <message> <source>Connection options:</source> <translation>Opcions de connexió:</translation> </message> @@ -1735,10 +2730,6 @@ <translation>Mida màxima de les dades en les transaccions de l'operador en què confiem i en les meues (per defecte: %u)</translation> </message> <message> - <source>Query for peer addresses via DNS lookup, if low on addresses (default: 1 unless -connect)</source> - <translation>Consulta a adreces d'iguals a través de DNS, si es troba baix en adreces (per defecte: 1 a menys que -connect)</translation> - </message> - <message> <source>Randomize credentials for every proxy connection. This enables Tor stream isolation (default: %u)</source> <translation>Genera a l'atzar credencials per a cada connexió proxy. Això habilita l'aïllament del flux de Tor (per defecte: %u)</translation> </message> @@ -1751,10 +2742,6 @@ <translation>L'import de la transacció és massa petit per enviar-la després que se'n deduïsca la comissió</translation> </message> <message> - <source>This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit <https://www.openssl.org/> and cryptographic software written by Eric Young and UPnP software written by Thomas Bernard.</source> - <translation>Este producte inclou programari desenvolupat pel projecte OpenSSL per a ús a l'OpenSSL Toolkit <https://www.openssl.org/> i programari criptogràfic escrit per Eric Young i programari UPnP escrit per Thomas Bernard.</translation> - </message> - <message> <source>Whitelisted peers cannot be DoS banned and their transactions are always relayed, even if they are already in the mempool, useful e.g. for a gateway</source> <translation>Els iguals en la llista blanca no poden ser bandejats per DoS i es transmetran sempre llurs transaccions, fins i tot si ja són a la mempool. Això és útil, p. ex., per a una passarel·la</translation> </message> @@ -1780,7 +2767,7 @@ </message> <message> <source>Information</source> - <translation>&Informació</translation> + <translation>Informació</translation> </message> <message> <source>Invalid amount for -paytxfee=<amount>: '%s' (must be at least %s)</source> @@ -1839,10 +2826,6 @@ <translation>Import de la transacció massa petit</translation> </message> <message> - <source>Transaction amounts must be positive</source> - <translation>Els imports de les transaccions han de ser positius</translation> - </message> - <message> <source>Transaction too large for fee policy</source> <translation>Transacció massa gran per a la política de comissions</translation> </message> @@ -1967,10 +2950,6 @@ <translation>Defineix la mida clau disponible a <n> (per defecte: %u)</translation> </message> <message> - <source>Set minimum block size in bytes (default: %u)</source> - <translation>Defineix la mida de bloc mínima en bytes (per defecte: %u)</translation> - </message> - <message> <source>Set the number of threads to service RPC calls (default: %d)</source> <translation>Defineix el nombre de fils a crides de servei RPC (per defecte: %d)</translation> </message> diff --git a/src/qt/locale/bitcoin_ca_ES.ts b/src/qt/locale/bitcoin_ca_ES.ts index f985a6928d..8cbb57bd35 100644 --- a/src/qt/locale/bitcoin_ca_ES.ts +++ b/src/qt/locale/bitcoin_ca_ES.ts @@ -41,6 +41,77 @@ <source>&Delete</source> <translation>&Elimina</translation> </message> + <message> + <source>Choose the address to send coins to</source> + <translation>Trieu l'adreça on enviar les monedes</translation> + </message> + <message> + <source>Choose the address to receive coins with</source> + <translation>Trieu l'adreça on rebre les monedes</translation> + </message> + <message> + <source>C&hoose</source> + <translation>&Tria</translation> + </message> + <message> + <source>Sending addresses</source> + <translation>Adreces d'enviament</translation> + </message> + <message> + <source>Receiving addresses</source> + <translation>Adreces de recepció</translation> + </message> + <message> + <source>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source> + <translation>Aquestes són les vostres adreces de Bitcoin per enviar els pagaments. Sempre reviseu l'import i l'adreça del destinatari abans de transferir monedes.</translation> + </message> + <message> + <source>These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction.</source> + <translation>Aquestes són les vostres adreces Bitcoin per rebre pagaments. Es recomana utilitzar una adreça nova de recepció per a cada transacció.</translation> + </message> + <message> + <source>&Copy Address</source> + <translation>&Copia l'adreça</translation> + </message> + <message> + <source>Copy &Label</source> + <translation>Copia l'eti&queta</translation> + </message> + <message> + <source>&Edit</source> + <translation>&Edita</translation> + </message> + <message> + <source>Export Address List</source> + <translation>Exporta la llista d'adreces</translation> + </message> + <message> + <source>Comma separated file (*.csv)</source> + <translation>Fitxer separat per comes (*.csv)</translation> + </message> + <message> + <source>Exporting Failed</source> + <translation>L'exportació ha fallat</translation> + </message> + <message> + <source>There was an error trying to save the address list to %1. Please try again.</source> + <translation>S'ha produït un error en desar la llista d'adreces a %1. Torneu-ho a provar.</translation> + </message> +</context> +<context> + <name>AddressTableModel</name> + <message> + <source>Label</source> + <translation>Etiqueta</translation> + </message> + <message> + <source>Address</source> + <translation>Adreça</translation> + </message> + <message> + <source>(no label)</source> + <translation>(sense etiqueta)</translation> + </message> </context> <context> <name>AskPassphraseDialog</name> @@ -60,6 +131,94 @@ <source>Repeat new passphrase</source> <translation>Repetiu la nova contrasenya</translation> </message> + <message> + <source>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>.</source> + <translation>Introduïu la contrasenya nova al moneder.<br/>Utilitzeu una contrasenya de <b>deu o més caràcters aleatoris</b>, o <b>vuit o més paraules</b>.</translation> + </message> + <message> + <source>Encrypt wallet</source> + <translation>Encripta el moneder</translation> + </message> + <message> + <source>This operation needs your wallet passphrase to unlock the wallet.</source> + <translation>Aquesta operació requereix la contrasenya del moneder per a desbloquejar-lo.</translation> + </message> + <message> + <source>Unlock wallet</source> + <translation>Desbloqueja el moneder</translation> + </message> + <message> + <source>This operation needs your wallet passphrase to decrypt the wallet.</source> + <translation>Aquesta operació requereix la contrasenya del moneder per desencriptar-lo.</translation> + </message> + <message> + <source>Decrypt wallet</source> + <translation>Desencripta el moneder</translation> + </message> + <message> + <source>Change passphrase</source> + <translation>Canvia la contrasenya</translation> + </message> + <message> + <source>Enter the old passphrase and new passphrase to the wallet.</source> + <translation>Introduïu la contrasenya antiga i la contrasenya nova al moneder.</translation> + </message> + <message> + <source>Confirm wallet encryption</source> + <translation>Confirma l'encriptació del moneder</translation> + </message> + <message> + <source>Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR BITCOINS</b>!</source> + <translation>Avís: si encripteu el vostre moneder i perdeu la contrasenya, <b>PERDREU TOTS ELS VOSTRES BITCOINS</b>!</translation> + </message> + <message> + <source>Are you sure you wish to encrypt your wallet?</source> + <translation>Esteu segur que voleu encriptar el vostre moneder?</translation> + </message> + <message> + <source>Wallet encrypted</source> + <translation>Moneder encriptat</translation> + </message> + <message> + <source>%1 will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your bitcoins from being stolen by malware infecting your computer.</source> + <translation>Ara es tancarà el %1 per finalitzar el procés d'encriptació. Recordeu que encriptar el vostre moneder no garanteix que les vostres bitcoins no puguin ser robades per programari maliciós que infecti l'ordinador.</translation> + </message> + <message> + <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source> + <translation>IMPORTANT: Tota copia de seguretat que hàgiu realitzat hauria de ser reemplaçada pel, recentment generat, fitxer encriptat del moneder. Per motius de seguretat, les còpies de seguretat anteriors del fitxer de moneder no encriptat esdevindran inusables tan aviat com començar a utilitzar el nou moneder encriptat.</translation> + </message> + <message> + <source>Wallet encryption failed</source> + <translation>L'encriptació del moneder ha fallat</translation> + </message> + <message> + <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source> + <translation>L'encriptació del moneder ha fallat per un error intern. El moneder no ha estat encriptat.</translation> + </message> + <message> + <source>The supplied passphrases do not match.</source> + <translation>Les contrasenyes introduïdes no coincideixen.</translation> + </message> + <message> + <source>Wallet unlock failed</source> + <translation>El desbloqueig del moneder ha fallat</translation> + </message> + <message> + <source>The passphrase entered for the wallet decryption was incorrect.</source> + <translation>La contrasenya introduïda per a desencriptar el moneder és incorrecta.</translation> + </message> + <message> + <source>Wallet decryption failed</source> + <translation>La desencriptació del moneder ha fallat</translation> + </message> + <message> + <source>Wallet passphrase was successfully changed.</source> + <translation>La contrasenya del moneder ha estat modificada correctament.</translation> + </message> + <message> + <source>Warning: The Caps Lock key is on!</source> + <translation>Avís: Les lletres majúscules estan activades!</translation> + </message> </context> <context> <name>BanTableModel</name> @@ -111,6 +270,14 @@ <translation>Surt de l'aplicació</translation> </message> <message> + <source>&About %1</source> + <translation>Qu&ant al %1</translation> + </message> + <message> + <source>Show information about %1</source> + <translation>Mosta informació sobre el %1</translation> + </message> + <message> <source>About &Qt</source> <translation>Quant a &Qt</translation> </message> @@ -123,6 +290,10 @@ <translation>&Opcions...</translation> </message> <message> + <source>Modify configuration options for %1</source> + <translation>Modifica les opcions de configuració de %1</translation> + </message> + <message> <source>&Encrypt Wallet...</source> <translation>&Encripta el moneder...</translation> </message> @@ -140,13 +311,25 @@ </message> <message> <source>&Receiving addresses...</source> - <translation>Adreces de &recepció</translation> + <translation>Adreces de &recepció...</translation> </message> <message> <source>Open &URI...</source> <translation>Obre un &URI...</translation> </message> <message> + <source>Click to disable network activity.</source> + <translation>Feu clic per inhabilitar l'activitat de la xarxa.</translation> + </message> + <message> + <source>Network activity disabled.</source> + <translation>S'ha inhabilitat l'activitat de la xarxa.</translation> + </message> + <message> + <source>Click to enable network activity again.</source> + <translation>Feu clic per tornar a habilitar l'activitat de la xarxa.</translation> + </message> + <message> <source>Reindexing blocks on disk...</source> <translation>S'estan reindexant els blocs al disc...</translation> </message> @@ -251,32 +434,16 @@ <translation><numerusform>%n connexió activa a la xarxa Bitcoin</numerusform><numerusform>%n connexions actives a la xarxa Bitcoin</numerusform></translation> </message> <message> - <source>No block source available...</source> - <translation>No hi ha cap font de bloc disponible...</translation> - </message> - <message numerus="yes"> - <source>Processed %n block(s) of transaction history.</source> - <translation><numerusform>S'han processat %n bloc de l'historial de transacció.</numerusform><numerusform>S'han processat %n blocs de l'historial de transacció.</numerusform></translation> - </message> - <message numerus="yes"> - <source>%n hour(s)</source> - <translation><numerusform>%n hora</numerusform><numerusform>%n hores</numerusform></translation> - </message> - <message numerus="yes"> - <source>%n day(s)</source> - <translation><numerusform>%n dia</numerusform><numerusform>%n dies</numerusform></translation> - </message> - <message numerus="yes"> - <source>%n week(s)</source> - <translation><numerusform>%n setmana</numerusform><numerusform>%n setmanes</numerusform></translation> + <source>Indexing blocks on disk...</source> + <translation>S'estan indexant els blocs al disc...</translation> </message> <message> - <source>%1 and %2</source> - <translation>%1 i %2</translation> + <source>Processing blocks on disk...</source> + <translation>S'estan processant els blocs al disc...</translation> </message> <message numerus="yes"> - <source>%n year(s)</source> - <translation><numerusform>%n any</numerusform><numerusform>%n anys</numerusform></translation> + <source>Processed %n block(s) of transaction history.</source> + <translation><numerusform>S'ha processat %n bloc de l'historial de transacció.</numerusform><numerusform>S'han processat %n blocs de l'historial de transacció.</numerusform></translation> </message> <message> <source>%1 behind</source> @@ -300,13 +467,21 @@ </message> <message> <source>Information</source> - <translation>Informació</translation> + <translation>&Informació</translation> </message> <message> <source>Up to date</source> <translation>Al dia</translation> </message> <message> + <source>Show the %1 help message to get a list with possible Bitcoin command-line options</source> + <translation>Mostra el missatge d'ajuda del %1 per obtenir una llista amb les possibles opcions de línia d'ordres de Bitcoin</translation> + </message> + <message> + <source>%1 client</source> + <translation>Client de %1</translation> + </message> + <message> <source>Catching up...</source> <translation>S'està posant al dia ...</translation> </message> @@ -349,6 +524,14 @@ <translation>Transacció entrant</translation> </message> <message> + <source>HD key generation is <b>enabled</b></source> + <translation>La generació de la clau HD és <b>habilitada</b></translation> + </message> + <message> + <source>HD key generation is <b>disabled</b></source> + <translation>La generació de la clau HD és <b>inhabilitada</b></translation> + </message> + <message> <source>Wallet is <b>encrypted</b> and currently <b>unlocked</b></source> <translation>El moneder està <b>encriptat</b> i actualment <b>desbloquejat</b></translation> </message> @@ -356,6 +539,10 @@ <source>Wallet is <b>encrypted</b> and currently <b>locked</b></source> <translation>El moneder està <b>encriptat</b> i actualment <b>bloquejat</b></translation> </message> + <message> + <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> + <translation>S'ha produït un error fatal. Bitcoin no pot continuar amb seguretat i finalitzarà.</translation> + </message> </context> <context> <name>CoinControlDialog</name> @@ -376,12 +563,8 @@ <translation>Import:</translation> </message> <message> - <source>Priority:</source> - <translation>Prioritat:</translation> - </message> - <message> <source>Fee:</source> - <translation>Comissió</translation> + <translation>Comissió:</translation> </message> <message> <source>Dust:</source> @@ -432,8 +615,84 @@ <translation>Confirmat</translation> </message> <message> - <source>Priority</source> - <translation>Prioritat</translation> + <source>Copy address</source> + <translation>Copia l'adreça</translation> + </message> + <message> + <source>Copy label</source> + <translation>Copia l'etiqueta</translation> + </message> + <message> + <source>Copy amount</source> + <translation>Copia l'import</translation> + </message> + <message> + <source>Copy transaction ID</source> + <translation>Copia l'ID de transacció</translation> + </message> + <message> + <source>Lock unspent</source> + <translation>Bloqueja sense gastar</translation> + </message> + <message> + <source>Unlock unspent</source> + <translation>Desbloqueja sense gastar</translation> + </message> + <message> + <source>Copy quantity</source> + <translation>Copia la quantitat</translation> + </message> + <message> + <source>Copy fee</source> + <translation>Copia la comissió</translation> + </message> + <message> + <source>Copy after fee</source> + <translation>Copia la comissió posterior</translation> + </message> + <message> + <source>Copy bytes</source> + <translation>Copia els bytes</translation> + </message> + <message> + <source>Copy dust</source> + <translation>Copia el polsim</translation> + </message> + <message> + <source>Copy change</source> + <translation>Copia el canvi</translation> + </message> + <message> + <source>(%1 locked)</source> + <translation>(%1 bloquejada)</translation> + </message> + <message> + <source>yes</source> + <translation>sí</translation> + </message> + <message> + <source>no</source> + <translation>no</translation> + </message> + <message> + <source>This label turns red if any recipient receives an amount smaller than the current dust threshold.</source> + <translation>Aquesta etiqueta es torna vermella si cap recipient rep un import inferior al llindar de polsim actual.</translation> + </message> + <message> + <source>Can vary +/- %1 satoshi(s) per input.</source> + <translation>Pot variar en +/- %1 satoshi(s) per entrada.</translation> + </message> + <message> + <source>(no label)</source> + <translation>(sense etiqueta)</translation> + </message> + <message> + <source>change from %1 (%2)</source> + <translation>canvia de %1 (%2)</translation> + </message> + <message> + <source>(change)</source> + <translation>(canvia)</translation> </message> </context> <context> @@ -458,6 +717,38 @@ <source>&Address</source> <translation>&Adreça</translation> </message> + <message> + <source>New receiving address</source> + <translation>Nova adreça de recepció</translation> + </message> + <message> + <source>New sending address</source> + <translation>Nova adreça d'enviament</translation> + </message> + <message> + <source>Edit receiving address</source> + <translation>Edita l'adreça de recepció</translation> + </message> + <message> + <source>Edit sending address</source> + <translation>Edita l'adreça d'enviament</translation> + </message> + <message> + <source>The entered address "%1" is not a valid Bitcoin address.</source> + <translation>L'adreça introduïda «%1» no és una adreça de Bitcoin vàlida.</translation> + </message> + <message> + <source>The entered address "%1" is already in the address book.</source> + <translation>L'adreça introduïda «%1» ja és present a la llibreta d'adreces.</translation> + </message> + <message> + <source>Could not unlock wallet.</source> + <translation>No s'ha pogut desbloquejar el moneder.</translation> + </message> + <message> + <source>New key generation failed.</source> + <translation>Ha fallat la generació d'una clau nova.</translation> + </message> </context> <context> <name>FreespaceChecker</name> @@ -493,6 +784,10 @@ <translation>(%1-bit)</translation> </message> <message> + <source>About %1</source> + <translation>Quant al %1</translation> + </message> + <message> <source>Command-line options</source> <translation>Opcions de línia d'ordres</translation> </message> @@ -528,12 +823,28 @@ <source>Show splash screen on startup (default: %u)</source> <translation>Mostra la pantalla de benvinguda a l'inici (per defecte: %u)</translation> </message> - </context> + <message> + <source>Reset all settings changed in the GUI</source> + <translation>Reinicialitza tots els canvis de configuració fets des de la interfície gràfica</translation> + </message> +</context> <context> <name>Intro</name> <message> <source>Welcome</source> - <translation>Us donem la benviguda</translation> + <translation>Us donem la benvinguda</translation> + </message> + <message> + <source>Welcome to %1.</source> + <translation>Us donem la benvinguda a %1.</translation> + </message> + <message> + <source>As this is the first time the program is launched, you can choose where %1 will store its data.</source> + <translation>Com és la primera vegada que s'executa el programa, podeu triar on %1 emmagatzemarà les dades.</translation> + </message> + <message> + <source>%1 will download and store a copy of the Bitcoin block chain. At least %2GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source> + <translation>%1 baixarà i emmagatzemarà una còpia de la cadena de blocs de Bitcoin. Com a mínim %2GB de dades s'emmagatzemaran en aquest directori, i augmentarà al llarg del temps. El moneder també s'emmagatzemarà en aquest directori.</translation> </message> <message> <source>Use the default data directory</source> @@ -561,6 +872,37 @@ </message> </context> <context> + <name>ModalOverlay</name> + <message> + <source>Form</source> + <translation>Formulari</translation> + </message> + <message> + <source>Last block time</source> + <translation>Últim temps de bloc</translation> + </message> + <message> + <source>Progress</source> + <translation>Progrés</translation> + </message> + <message> + <source>calculating...</source> + <translation>s'està calculant...</translation> + </message> + <message> + <source>Estimated time left until synced</source> + <translation>Temps estimat restant fins sincronitzat</translation> + </message> + <message> + <source>Hide</source> + <translation>Amaga</translation> + </message> + <message> + <source>Unknown. Syncing Headers (%1)...</source> + <translation>Desconegut. Sincronització de les capçaleres (%1)...</translation> + </message> +</context> +<context> <name>OpenURIDialog</name> <message> <source>Open URI</source> @@ -578,6 +920,10 @@ <source>Select payment request file</source> <translation>Selecciona un fitxer de sol·licitud de pagament</translation> </message> + <message> + <source>Select payment request file to open</source> + <translation>Seleccioneu el fitxer de sol·licitud de pagament per obrir</translation> + </message> </context> <context> <name>OptionsDialog</name> @@ -590,6 +936,14 @@ <translation>&Principal</translation> </message> <message> + <source>Automatically start %1 after logging in to the system.</source> + <translation>Inicieu %1 automàticament després d'entrar en el sistema.</translation> + </message> + <message> + <source>&Start %1 on system login</source> + <translation>&Inicia %1 en l'entrada al sistema</translation> + </message> + <message> <source>Size of &database cache</source> <translation>Mida de la memòria cau de la base de &dades</translation> </message> @@ -726,6 +1080,14 @@ <translation>&Finestra</translation> </message> <message> + <source>&Hide the icon from the system tray.</source> + <translation>Ama&ga la icona de la safata del sistema.</translation> + </message> + <message> + <source>Hide tray icon</source> + <translation>Amaga la icona de la safata</translation> + </message> + <message> <source>Show only a tray icon after minimizing the window.</source> <translation>Mostra només la icona de la barra en minimitzar la finestra.</translation> </message> @@ -746,6 +1108,10 @@ <translation>&Llengua de la interfície d'usuari:</translation> </message> <message> + <source>The user interface language can be set here. This setting will take effect after restarting %1.</source> + <translation>Aquí es pot definir la llengua de la interfície d'usuari. Aquest paràmetre tindrà efecte en reiniciar el %1.</translation> + </message> + <message> <source>&Unit to show amounts in:</source> <translation>&Unitats per mostrar els imports en:</translation> </message> @@ -870,6 +1236,97 @@ </message> </context> <context> + <name>PaymentServer</name> + <message> + <source>Payment request error</source> + <translation>Error de la sol·licitud de pagament</translation> + </message> + <message> + <source>Cannot start bitcoin: click-to-pay handler</source> + <translation>No es pot iniciar bitcoin: controlador click-to-pay</translation> + </message> + <message> + <source>URI handling</source> + <translation>Gestió d'URI</translation> + </message> + <message> + <source>Payment request fetch URL is invalid: %1</source> + <translation>L'URL de recuperació de la sol·licitud de pagament no és vàlida: %1</translation> + </message> + <message> + <source>Invalid payment address %1</source> + <translation>Adreça de pagament no vàlida %1</translation> + </message> + <message> + <source>URI cannot be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters.</source> + <translation>L'URI no pot ser analitzat! Això pot ser a causa d'una adreça de Bitcoin no vàlida o per paràmetres URI amb mal format.</translation> + </message> + <message> + <source>Payment request file handling</source> + <translation>Gestió de fitxers de les sol·licituds de pagament</translation> + </message> + <message> + <source>Payment request file cannot be read! This can be caused by an invalid payment request file.</source> + <translation>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.</translation> + </message> + <message> + <source>Payment request rejected</source> + <translation>La sol·licitud de pagament s'ha rebutjat</translation> + </message> + <message> + <source>Payment request network doesn't match client network.</source> + <translation>La xarxa de la sol·licitud de pagament no coincideix amb la xarxa del client.</translation> + </message> + <message> + <source>Payment request expired.</source> + <translation>La sol·licitud de pagament ha vençut.</translation> + </message> + <message> + <source>Payment request is not initialized.</source> + <translation>La sol·licitud de pagament no està inicialitzada.</translation> + </message> + <message> + <source>Unverified payment requests to custom payment scripts are unsupported.</source> + <translation>No s'accepten sol·licituds de pagament no verificades a scripts de pagament personalitzats.</translation> + </message> + <message> + <source>Invalid payment request.</source> + <translation>Sol·licitud de pagament no vàlida.</translation> + </message> + <message> + <source>Requested payment amount of %1 is too small (considered dust).</source> + <translation>L'import de pagament sol·licitat %1 és massa petit (es considera polsim).</translation> + </message> + <message> + <source>Refund from %1</source> + <translation>Reemborsament de %1</translation> + </message> + <message> + <source>Payment request %1 is too large (%2 bytes, allowed %3 bytes).</source> + <translation>La sol·licitud de pagament %1 és massa gran (%2 bytes, permès %3 bytes).</translation> + </message> + <message> + <source>Error communicating with %1: %2</source> + <translation>Error en comunicar amb %1: %2</translation> + </message> + <message> + <source>Payment request cannot be parsed!</source> + <translation>No es pot analitzar la sol·licitud de pagament!</translation> + </message> + <message> + <source>Bad response from server %1</source> + <translation>Mala resposta del servidor %1</translation> + </message> + <message> + <source>Network request error</source> + <translation>Error en la sol·licitud de xarxa</translation> + </message> + <message> + <source>Payment acknowledged</source> + <translation>Pagament reconegut</translation> + </message> +</context> +<context> <name>PeerTableModel</name> <message> <source>User Agent</source> @@ -879,11 +1336,7 @@ <source>Node/Service</source> <translation>Node/Servei</translation> </message> - <message> - <source>Ping Time</source> - <translation>Temps de ping</translation> - </message> -</context> + </context> <context> <name>QObject</name> <message> @@ -922,6 +1375,32 @@ <source>%1 ms</source> <translation>%1 ms</translation> </message> + <message> + <source>%1 and %2</source> + <translation>%1 i %2</translation> + </message> + </context> +<context> + <name>QObject::QObject</name> + </context> +<context> + <name>QRImageWidget</name> + <message> + <source>&Save Image...</source> + <translation>De&sa la imatge...</translation> + </message> + <message> + <source>&Copy Image</source> + <translation>&Copia la imatge</translation> + </message> + <message> + <source>Save QR Code</source> + <translation>Desa el codi QR</translation> + </message> + <message> + <source>PNG Image (*.png)</source> + <translation>Imatge PNG (*.png)</translation> + </message> </context> <context> <name>RPCConsole</name> @@ -950,6 +1429,10 @@ <translation>Utilitzant BerkeleyDB versió</translation> </message> <message> + <source>Datadir</source> + <translation>Datadir</translation> + </message> + <message> <source>Startup time</source> <translation>&Temps d'inici</translation> </message> @@ -1110,14 +1593,6 @@ <translation>Neteja la consola</translation> </message> <message> - <source>&Disconnect Node</source> - <translation>&Desconnecta el node</translation> - </message> - <message> - <source>Ban Node for</source> - <translation>Bandeja el node durant</translation> - </message> - <message> <source>1 &hour</source> <translation>1 &hora</translation> </message> @@ -1134,10 +1609,6 @@ <translation>1 &any</translation> </message> <message> - <source>&Unban Node</source> - <translation>&Desbandeja el node</translation> - </message> - <message> <source>Use up and down arrows to navigate history, and <b>Ctrl-L</b> to clear screen.</source> <translation>Utilitza les fletxes d'amunt i avall per navegar per l'historial, i <b>Ctrl-L<\b> per netejar la pantalla.</translation> </message> @@ -1264,6 +1735,18 @@ <source>Remove</source> <translation>Esborra</translation> </message> + <message> + <source>Copy label</source> + <translation>Copia l'etiqueta</translation> + </message> + <message> + <source>Copy message</source> + <translation>Copia el missatge</translation> + </message> + <message> + <source>Copy amount</source> + <translation>Copia l'import</translation> + </message> </context> <context> <name>ReceiveRequestDialog</name> @@ -1283,6 +1766,73 @@ <source>&Save Image...</source> <translation>De&sa la imatge...</translation> </message> + <message> + <source>Request payment to %1</source> + <translation>Sol·licita un pagament a %1</translation> + </message> + <message> + <source>Payment information</source> + <translation>Informació de pagament</translation> + </message> + <message> + <source>URI</source> + <translation>URI</translation> + </message> + <message> + <source>Address</source> + <translation>Adreça</translation> + </message> + <message> + <source>Amount</source> + <translation>Import</translation> + </message> + <message> + <source>Label</source> + <translation>Etiqueta</translation> + </message> + <message> + <source>Message</source> + <translation>Missatge</translation> + </message> + <message> + <source>Resulting URI too long, try to reduce the text for label / message.</source> + <translation>URI resultant massa llarga, intenta reduir el text per a la etiqueta / missatge</translation> + </message> + <message> + <source>Error encoding URI into QR Code.</source> + <translation>Error en codificar l'URI en un codi QR.</translation> + </message> +</context> +<context> + <name>RecentRequestsTableModel</name> + <message> + <source>Date</source> + <translation>Data</translation> + </message> + <message> + <source>Label</source> + <translation>Etiqueta</translation> + </message> + <message> + <source>Message</source> + <translation>Missatge</translation> + </message> + <message> + <source>(no label)</source> + <translation>(sense etiqueta)</translation> + </message> + <message> + <source>(no message)</source> + <translation>(sense missatge)</translation> + </message> + <message> + <source>(no amount requested)</source> + <translation>(no s'ha sol·licitat import)</translation> + </message> + <message> + <source>Requested</source> + <translation>Sol·licitat</translation> + </message> </context> <context> <name>SendCoinsDialog</name> @@ -1319,10 +1869,6 @@ <translation>Import:</translation> </message> <message> - <source>Priority:</source> - <translation>Prioritat:</translation> - </message> - <message> <source>Fee:</source> <translation>Comissió:</translation> </message> @@ -1391,10 +1937,6 @@ <translation>(No s'ha inicialitzat encara la comissió intel·ligent. Normalment pren uns pocs blocs...)</translation> </message> <message> - <source>Confirmation time:</source> - <translation>Temps de confirmació:</translation> - </message> - <message> <source>normal</source> <translation>normal</translation> </message> @@ -1412,7 +1954,7 @@ </message> <message> <source>Clear all fields of the form.</source> - <translation>Netejar tots els camps del formulari.</translation> + <translation>Esborra tots els camps del formuari.</translation> </message> <message> <source>Dust:</source> @@ -1434,6 +1976,106 @@ <source>S&end</source> <translation>E&nvia</translation> </message> + <message> + <source>Copy quantity</source> + <translation>Copia la quantitat</translation> + </message> + <message> + <source>Copy amount</source> + <translation>Copia l'import</translation> + </message> + <message> + <source>Copy fee</source> + <translation>Copia la comissió</translation> + </message> + <message> + <source>Copy after fee</source> + <translation>Copia la comissió posterior</translation> + </message> + <message> + <source>Copy bytes</source> + <translation>Copia els bytes</translation> + </message> + <message> + <source>Copy dust</source> + <translation>Copia el polsim</translation> + </message> + <message> + <source>Copy change</source> + <translation>Copia el canvi</translation> + </message> + <message> + <source>%1 to %2</source> + <translation>%1 a %2</translation> + </message> + <message> + <source>Are you sure you want to send?</source> + <translation>Esteu segur que ho voleu enviar?</translation> + </message> + <message> + <source>added as transaction fee</source> + <translation>S'ha afegit una taxa de transacció</translation> + </message> + <message> + <source>Total Amount %1</source> + <translation>Import total %1</translation> + </message> + <message> + <source>or</source> + <translation>o</translation> + </message> + <message> + <source>Confirm send coins</source> + <translation>Confirma l'enviament de monedes</translation> + </message> + <message> + <source>The recipient address is not valid. Please recheck.</source> + <translation>L'adreça del destinatari no és vàlida. Torneu-la a comprovar.</translation> + </message> + <message> + <source>The amount to pay must be larger than 0.</source> + <translation>L'import a pagar ha de ser major que 0.</translation> + </message> + <message> + <source>The amount exceeds your balance.</source> + <translation>L'import supera el vostre balanç.</translation> + </message> + <message> + <source>The total exceeds your balance when the %1 transaction fee is included.</source> + <translation>El total excedeix el vostre balanç quan s'afegeix la comissió a la transacció %1.</translation> + </message> + <message> + <source>Duplicate address found: addresses should only be used once each.</source> + <translation>S'ha trobat una adreça duplicada: les adreces només s'haurien d'utilitzar una vegada cada una.</translation> + </message> + <message> + <source>Transaction creation failed!</source> + <translation>La creació de la transacció ha fallat!</translation> + </message> + <message> + <source>A fee higher than %1 is considered an absurdly high fee.</source> + <translation>Una comissió superior a %1 es considera una comissió absurdament alta.</translation> + </message> + <message> + <source>Payment request expired.</source> + <translation>La sol·licitud de pagament ha vençut.</translation> + </message> + <message> + <source>Pay only the required fee of %1</source> + <translation>Paga només la comissió necessària de %1</translation> + </message> + <message> + <source>Warning: Invalid Bitcoin address</source> + <translation>Avís: adreça Bitcoin no vàlida</translation> + </message> + <message> + <source>Warning: Unknown change address</source> + <translation>Avís: adreça de canvi desconeguda</translation> + </message> + <message> + <source>(no label)</source> + <translation>(sense etiqueta)</translation> + </message> </context> <context> <name>SendCoinsEntry</name> @@ -1513,6 +2155,17 @@ <source>Memo:</source> <translation>Memo:</translation> </message> + <message> + <source>Enter a label for this address to add it to your address book</source> + <translation>Introduïu una etiqueta per a aquesta adreça per afegir-la a la llibreta d'adreces</translation> + </message> +</context> +<context> + <name>SendConfirmationDialog</name> + <message> + <source>Yes</source> + <translation>Sí</translation> + </message> </context> <context> <name>ShutdownWindow</name> @@ -1541,15 +2194,15 @@ </message> <message> <source>Choose previously used address</source> - <translation>Tria les adreces fetes servir amb anterioritat</translation> + <translation>Escull una adreça feta servir anteriorment</translation> </message> <message> <source>Alt+A</source> - <translation>Alt+A</translation> + <translation>Alta+A</translation> </message> <message> <source>Paste address from clipboard</source> - <translation>Enganxa l'adreça del porta-retalls</translation> + <translation>Enganxar adreça del porta-retalls</translation> </message> <message> <source>Alt+P</source> @@ -1607,6 +2260,58 @@ <source>Reset all verify message fields</source> <translation>Neteja tots els camps de verificació de missatge</translation> </message> + <message> + <source>Click "Sign Message" to generate signature</source> + <translation>Feu clic a «Signa el missatge» per a generar una signatura</translation> + </message> + <message> + <source>The entered address is invalid.</source> + <translation>L'adreça introduïda no és vàlida.</translation> + </message> + <message> + <source>Please check the address and try again.</source> + <translation>Comproveu l'adreça i torneu-ho a provar.</translation> + </message> + <message> + <source>The entered address does not refer to a key.</source> + <translation>L'adreça introduïda no referencia a cap clau.</translation> + </message> + <message> + <source>Wallet unlock was cancelled.</source> + <translation>El desbloqueig del moneder ha estat cancelat.</translation> + </message> + <message> + <source>Private key for the entered address is not available.</source> + <translation>La clau privada per a la adreça introduïda no està disponible.</translation> + </message> + <message> + <source>Message signing failed.</source> + <translation>La signatura del missatge ha fallat.</translation> + </message> + <message> + <source>Message signed.</source> + <translation>Missatge signat.</translation> + </message> + <message> + <source>The signature could not be decoded.</source> + <translation>La signatura no s'ha pogut descodificar.</translation> + </message> + <message> + <source>Please check the signature and try again.</source> + <translation>Comproveu la signatura i torneu-ho a provar.</translation> + </message> + <message> + <source>The signature did not match the message digest.</source> + <translation>La signatura no coincideix amb el resum del missatge.</translation> + </message> + <message> + <source>Message verification failed.</source> + <translation>Ha fallat la verificació del missatge.</translation> + </message> + <message> + <source>Message verified.</source> + <translation>Missatge verificat.</translation> + </message> </context> <context> <name>SplashScreen</name> @@ -1623,11 +2328,404 @@ </message> </context> <context> + <name>TransactionDesc</name> + <message> + <source>Open until %1</source> + <translation>Obert fins %1</translation> + </message> + <message> + <source>%1/offline</source> + <translation>%1/fora de línia</translation> + </message> + <message> + <source>%1/unconfirmed</source> + <translation>%1/sense confirmar</translation> + </message> + <message> + <source>%1 confirmations</source> + <translation>%1 confirmacions</translation> + </message> + <message> + <source>Status</source> + <translation>Estat</translation> + </message> + <message> + <source>, has not been successfully broadcast yet</source> + <translation>, encara no ha estat emès correctement</translation> + </message> + <message> + <source>Date</source> + <translation>Data</translation> + </message> + <message> + <source>Source</source> + <translation>Font</translation> + </message> + <message> + <source>Generated</source> + <translation>Generada</translation> + </message> + <message> + <source>From</source> + <translation>De</translation> + </message> + <message> + <source>unknown</source> + <translation>desconegut</translation> + </message> + <message> + <source>To</source> + <translation>A</translation> + </message> + <message> + <source>own address</source> + <translation>adreça pròpia</translation> + </message> + <message> + <source>watch-only</source> + <translation>només lectura</translation> + </message> + <message> + <source>label</source> + <translation>etiqueta</translation> + </message> + <message> + <source>Credit</source> + <translation>Crèdit</translation> + </message> + <message> + <source>not accepted</source> + <translation>no acceptat</translation> + </message> + <message> + <source>Debit</source> + <translation>Dèbit</translation> + </message> + <message> + <source>Total debit</source> + <translation>Dèbit total</translation> + </message> + <message> + <source>Total credit</source> + <translation>Crèdit total</translation> + </message> + <message> + <source>Transaction fee</source> + <translation>Comissió de transacció</translation> + </message> + <message> + <source>Net amount</source> + <translation>Import net</translation> + </message> + <message> + <source>Message</source> + <translation>Missatge</translation> + </message> + <message> + <source>Comment</source> + <translation>Comentari</translation> + </message> + <message> + <source>Transaction ID</source> + <translation>ID de la transacció</translation> + </message> + <message> + <source>Merchant</source> + <translation>Mercader</translation> + </message> + <message> + <source>Generated coins must mature %1 blocks before they can be spent. When you generated this block, it was broadcast to the network to be added to the block chain. If it fails to get into the chain, its state will change to "not accepted" and it won't be spendable. This may occasionally happen if another node generates a block within a few seconds of yours.</source> + <translation>Les monedes generades han de madurar %1 blocs abans de poder ser gastades. Quan genereu aquest bloc, es farà saber a la xarxa per tal d'afegir-lo a la cadena de blocs. Si no pot fer-se lloc a la cadena, el seu estat canviarà a «no acceptat» i no es podrà gastar. Això pot passar ocasionalment si un altre node genera un bloc en un marge de segons respecte al vostre.</translation> + </message> + <message> + <source>Debug information</source> + <translation>Informació de depuració</translation> + </message> + <message> + <source>Transaction</source> + <translation>Transacció</translation> + </message> + <message> + <source>Inputs</source> + <translation>Entrades</translation> + </message> + <message> + <source>Amount</source> + <translation>Import</translation> + </message> + <message> + <source>true</source> + <translation>cert</translation> + </message> + <message> + <source>false</source> + <translation>fals</translation> + </message> +</context> +<context> <name>TransactionDescDialog</name> <message> <source>This pane shows a detailed description of the transaction</source> <translation>Aquest panell mostra una descripció detallada de la transacció</translation> </message> + </context> +<context> + <name>TransactionTableModel</name> + <message> + <source>Date</source> + <translation>Data</translation> + </message> + <message> + <source>Type</source> + <translation>Tipus</translation> + </message> + <message> + <source>Label</source> + <translation>Etiqueta</translation> + </message> + <message> + <source>Open until %1</source> + <translation>Obert fins %1</translation> + </message> + <message> + <source>Offline</source> + <translation>Fora de línia</translation> + </message> + <message> + <source>Unconfirmed</source> + <translation>Sense confirmar</translation> + </message> + <message> + <source>Abandoned</source> + <translation>Abandonada</translation> + </message> + <message> + <source>Confirming (%1 of %2 recommended confirmations)</source> + <translation>Confirmant (%1 de %2 confirmacions recomanades)</translation> + </message> + <message> + <source>Confirmed (%1 confirmations)</source> + <translation>Confirmat (%1 confirmacions)</translation> + </message> + <message> + <source>Conflicted</source> + <translation>En conflicte</translation> + </message> + <message> + <source>Immature (%1 confirmations, will be available after %2)</source> + <translation>Immadur (%1 confirmacions, serà disponible després de %2)</translation> + </message> + <message> + <source>This block was not received by any other nodes and will probably not be accepted!</source> + <translation>Aquest bloc no ha estat rebut per cap altre node i probablement no serà acceptat!</translation> + </message> + <message> + <source>Generated but not accepted</source> + <translation>Generat però no acceptat</translation> + </message> + <message> + <source>Received with</source> + <translation>Rebuda amb</translation> + </message> + <message> + <source>Received from</source> + <translation>Rebuda de</translation> + </message> + <message> + <source>Sent to</source> + <translation>Enviada a</translation> + </message> + <message> + <source>Payment to yourself</source> + <translation>Pagament a un mateix</translation> + </message> + <message> + <source>Mined</source> + <translation>Minada</translation> + </message> + <message> + <source>watch-only</source> + <translation>només lectura</translation> + </message> + <message> + <source>(n/a)</source> + <translation>(n/a)</translation> + </message> + <message> + <source>(no label)</source> + <translation>(sense etiqueta)</translation> + </message> + <message> + <source>Transaction status. Hover over this field to show number of confirmations.</source> + <translation>Estat de la transacció. Desplaceu-vos sobre aquest camp per mostrar el nombre de confirmacions.</translation> + </message> + <message> + <source>Date and time that the transaction was received.</source> + <translation>Data i hora en que la transacció va ser rebuda.</translation> + </message> + <message> + <source>Type of transaction.</source> + <translation>Tipus de transacció.</translation> + </message> + <message> + <source>Whether or not a watch-only address is involved in this transaction.</source> + <translation>Si està implicada o no una adreça només de lectura en la transacció.</translation> + </message> + <message> + <source>User-defined intent/purpose of the transaction.</source> + <translation>Intenció/propòsit de la transacció definida per l'usuari.</translation> + </message> + <message> + <source>Amount removed from or added to balance.</source> + <translation>Import extret o afegit del balanç.</translation> + </message> +</context> +<context> + <name>TransactionView</name> + <message> + <source>All</source> + <translation>Tot</translation> + </message> + <message> + <source>Today</source> + <translation>Avui</translation> + </message> + <message> + <source>This week</source> + <translation>Aquesta setmana</translation> + </message> + <message> + <source>This month</source> + <translation>Aquest mes</translation> + </message> + <message> + <source>Last month</source> + <translation>El mes passat</translation> + </message> + <message> + <source>This year</source> + <translation>Enguany</translation> + </message> + <message> + <source>Range...</source> + <translation>Rang...</translation> + </message> + <message> + <source>Received with</source> + <translation>Rebuda amb</translation> + </message> + <message> + <source>Sent to</source> + <translation>Enviada a</translation> + </message> + <message> + <source>To yourself</source> + <translation>A un mateix</translation> + </message> + <message> + <source>Mined</source> + <translation>Minada</translation> + </message> + <message> + <source>Other</source> + <translation>Altres</translation> + </message> + <message> + <source>Enter address or label to search</source> + <translation>Introduïu una adreça o una etiqueta per cercar</translation> + </message> + <message> + <source>Min amount</source> + <translation>Import mínim</translation> + </message> + <message> + <source>Copy address</source> + <translation>Copia l'adreça</translation> + </message> + <message> + <source>Copy label</source> + <translation>Copia l'etiqueta</translation> + </message> + <message> + <source>Copy amount</source> + <translation>Copia l'import</translation> + </message> + <message> + <source>Copy transaction ID</source> + <translation>Copia l'ID de transacció</translation> + </message> + <message> + <source>Copy raw transaction</source> + <translation>Copia la transacció crua</translation> + </message> + <message> + <source>Edit label</source> + <translation>Editar etiqueta</translation> + </message> + <message> + <source>Show transaction details</source> + <translation>Mostra detalls de la transacció</translation> + </message> + <message> + <source>Export Transaction History</source> + <translation>Exporta l'historial de transacció</translation> + </message> + <message> + <source>Comma separated file (*.csv)</source> + <translation>Fitxer separat per comes (*.csv)</translation> + </message> + <message> + <source>Confirmed</source> + <translation>Confirmat</translation> + </message> + <message> + <source>Watch-only</source> + <translation>Només de lectura</translation> + </message> + <message> + <source>Date</source> + <translation>Data</translation> + </message> + <message> + <source>Type</source> + <translation>Tipus</translation> + </message> + <message> + <source>Label</source> + <translation>Etiqueta</translation> + </message> + <message> + <source>Address</source> + <translation>Adreça</translation> + </message> + <message> + <source>ID</source> + <translation>ID</translation> + </message> + <message> + <source>Exporting Failed</source> + <translation>L'exportació ha fallat</translation> + </message> + <message> + <source>There was an error trying to save the transaction history to %1.</source> + <translation>S'ha produït un error en provar de desar l'historial de transacció a %1.</translation> + </message> + <message> + <source>Exporting Successful</source> + <translation>Exportació amb èxit</translation> + </message> + <message> + <source>The transaction history was successfully saved to %1.</source> + <translation>L'historial de transaccions s'ha desat correctament a %1.</translation> + </message> + <message> + <source>Range:</source> + <translation>Rang:</translation> + </message> + <message> + <source>to</source> + <translation>a</translation> + </message> </context> <context> <name>UnitDisplayStatusBarControl</name> @@ -1637,6 +2735,55 @@ </message> </context> <context> + <name>WalletFrame</name> + <message> + <source>No wallet has been loaded.</source> + <translation>No s'ha carregat cap moneder.</translation> + </message> +</context> +<context> + <name>WalletModel</name> + <message> + <source>Send Coins</source> + <translation>Envia monedes</translation> + </message> +</context> +<context> + <name>WalletView</name> + <message> + <source>&Export</source> + <translation>&Exporta</translation> + </message> + <message> + <source>Export the data in the current tab to a file</source> + <translation>Exporta les dades de la pestanya actual a un fitxer</translation> + </message> + <message> + <source>Backup Wallet</source> + <translation>Còpia de seguretat del moneder</translation> + </message> + <message> + <source>Wallet Data (*.dat)</source> + <translation>Dades del moneder (*.dat)</translation> + </message> + <message> + <source>Backup Failed</source> + <translation>Ha fallat la còpia de seguretat</translation> + </message> + <message> + <source>There was an error trying to save the wallet data to %1.</source> + <translation>S'ha produït un error en provar de desar les dades del moneder a %1.</translation> + </message> + <message> + <source>Backup Successful</source> + <translation>La còpia de seguretat s'ha realitzat correctament</translation> + </message> + <message> + <source>The wallet data was successfully saved to %1.</source> + <translation>S'han desat les dades del moneder correctament a %1.</translation> + </message> +</context> +<context> <name>bitcoin-core</name> <message> <source>Options:</source> @@ -1671,10 +2818,6 @@ <translation>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)</translation> </message> <message> - <source>Reduce storage requirements by pruning (deleting) old blocks. This mode is incompatible with -txindex and -rescan. Warning: Reverting this setting requires re-downloading the entire blockchain. (default: 0 = disable pruning blocks, >%u = target size in MiB to use for block files)</source> - <translation>Reduïu els requisits d'emmagatzematge podant (suprimint) els blocs antics. Aquest mode és incompatible amb -txindex i -rescan. Avís: la reversió d'aquest paràmetre implica haver de tornar a baixar la cadena de blocs sencera. (per defecte: 0 = inhabilita la poda de blocs, >%u = mida objectiu en MiB per utilitzar en els fitxers de blocs)</translation> - </message> - <message> <source>Rescans are not possible in pruned mode. You will need to use -reindex which will download the whole blockchain again.</source> <translation>Els rescanejos no són possible en el mode de poda. Caldrà que utilitzeu -reindex, que tornarà a baixar la cadena de blocs sencera.</translation> </message> @@ -1699,12 +2842,8 @@ <translation>No s'ha pogut iniciar el servidor HTTP. Vegeu debug.log per a més detalls.</translation> </message> <message> - <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> - <translation>Accepta connexions de fora (per defecte: 1 si no -proxy o -connect)</translation> - </message> - <message> <source>Bitcoin Core</source> - <translation>Nucli de Bitcoin</translation> + <translation>Bitcoin Core</translation> </message> <message> <source>Bind to given address and always listen on it. Use [host]:port notation for IPv6</source> @@ -1715,10 +2854,6 @@ <translation>Elimina totes les transaccions del moneder i només recupera aquelles de la cadena de blocs a través de -rescan a l'inici</translation> </message> <message> - <source>Distributed under the MIT software license, see the accompanying file COPYING or <http://www.opensource.org/licenses/mit-license.php>.</source> - <translation>Distribuït sota llicència de programari MIT. Vegeu el fitxer acompanyant COPYING o <http://www.opensource.org/licenses/mit-license.php>.</translation> - </message> - <message> <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source> <translation>Executa una ordre quan una transacció del moneder canviï (%s en cmd es canvia per TxID)</translation> </message> @@ -1727,22 +2862,6 @@ <translation>Defineix el nombre de fils de verificació d'scripts (%u a %d, 0 = auto, <0 = deixa tants nuclis lliures, per defecte: %d)</translation> </message> <message> - <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source> - <translation>Aquesta és una versió de pre-llançament - utilitza-la sota la teva responsabilitat - No usar per a minería o aplicacions de compra-venda</translation> - </message> - <message> - <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source> - <translation>Avís: la xarxa no sembla que hi estigui plenament d'acord. Alguns miners sembla que estan experimentant problemes.</translation> - </message> - <message> - <source>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</source> - <translation>Avís: sembla que no estem plenament d'acord amb els nostres iguals! Podria caler que actualitzar l'aplicació, o potser que ho facin altres nodes.</translation> - </message> - <message> - <source>Whitelist peers connecting from the given netmask or IP address. Can be specified multiple times.</source> - <translation>Afegeix a la llista blanca els iguals que es connecten de la màscara de xarxa o adreça IP donada. Es pot especificar moltes vegades.</translation> - </message> - <message> <source><category> can be:</source> <translation><category> pot ser:</translation> </message> @@ -1751,10 +2870,6 @@ <translation>Opcions de la creació de blocs:</translation> </message> <message> - <source>Connect only to the specified node(s)</source> - <translation>Connecta només al(s) node(s) especificats</translation> - </message> - <message> <source>Connection options:</source> <translation>Opcions de connexió:</translation> </message> @@ -1843,6 +2958,10 @@ <translation>Utilitza UPnP per a mapejar el port d'escolta (per defecte: %u)</translation> </message> <message> + <source>Use the test chain</source> + <translation>Utilitza la cadena de proves</translation> + </message> + <message> <source>Verifying blocks...</source> <translation>S'estan verificant els blocs...</translation> </message> @@ -1855,6 +2974,14 @@ <translation>El moneder %s resideix fora del directori de dades %s</translation> </message> <message> + <source>Wallet debugging/testing options:</source> + <translation>Opcions de depuració/proves del moneder:</translation> + </message> + <message> + <source>Wallet needed to be rewritten: restart %s to complete</source> + <translation>Cal reescriure el moneder: reinicieu %s per a completar-ho</translation> + </message> + <message> <source>Wallet options:</source> <translation>Opcions de moneder:</translation> </message> @@ -1899,10 +3026,6 @@ <translation>Mida màxima de les dades en les transaccions de l'operador en què confiem i en les meves (per defecte: %u)</translation> </message> <message> - <source>Query for peer addresses via DNS lookup, if low on addresses (default: 1 unless -connect)</source> - <translation>Consulta a adreces d'iguals a través de DNS, si es troba baix en adreces (per defecte: 1 a menys que -connect)</translation> - </message> - <message> <source>Randomize credentials for every proxy connection. This enables Tor stream isolation (default: %u)</source> <translation>Genera a l'atzar credencials per a cada connexió proxy. Això habilita l'aïllament del flux de Tor (per defecte: %u)</translation> </message> @@ -1915,10 +3038,6 @@ <translation>L'import de la transacció és massa petit per enviar-la després que se'n dedueixi la comissió</translation> </message> <message> - <source>This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit <https://www.openssl.org/> and cryptographic software written by Eric Young and UPnP software written by Thomas Bernard.</source> - <translation>Aquest producte inclou programari desenvolupat pel projecte OpenSSL per a ús a l'OpenSSL Toolkit <https://www.openssl.org/> i programari criptogràfic escrit per Eric Young i programari UPnP escrit per Thomas Bernard.</translation> - </message> - <message> <source>Whitelisted peers cannot be DoS banned and their transactions are always relayed, even if they are already in the mempool, useful e.g. for a gateway</source> <translation>Els iguals en la llista blanca no poden ser bandejats per DoS i es transmetran sempre llurs transaccions, fins i tot si ja són a la mempool. Això és útil, p. ex., per a una passarel·la</translation> </message> @@ -2003,10 +3122,6 @@ <translation>Import de la transacció massa petit</translation> </message> <message> - <source>Transaction amounts must be positive</source> - <translation>Els imports de les transaccions han de ser positius</translation> - </message> - <message> <source>Transaction too large for fee policy</source> <translation>Transacció massa gran per a la política de comissions</translation> </message> @@ -2131,10 +3246,6 @@ <translation>Defineix la mida clau disponible a <n> (per defecte: %u)</translation> </message> <message> - <source>Set minimum block size in bytes (default: %u)</source> - <translation>Defineix la mida de bloc mínima en bytes (per defecte: %u)</translation> - </message> - <message> <source>Set the number of threads to service RPC calls (default: %d)</source> <translation>Defineix el nombre de fils a crides de servei RPC (per defecte: %d)</translation> </message> @@ -2155,10 +3266,22 @@ <translation>Gasta el canvi no confirmat en enviar les transaccions (per defecte: %u)</translation> </message> <message> + <source>Starting network threads...</source> + <translation>S'estan iniciant els fils de la xarxa...</translation> + </message> + <message> <source>Threshold for disconnecting misbehaving peers (default: %u)</source> <translation>Llindar per a desconnectar els iguals de comportament qüestionable (per defecte: %u)</translation> </message> <message> + <source>Transaction amounts must not be negative</source> + <translation>Els imports de la transacció no han de ser negatius</translation> + </message> + <message> + <source>Transaction must have at least one recipient</source> + <translation>La transacció ha de tenir com a mínim un destinatari</translation> + </message> + <message> <source>Unknown network specified in -onlynet: '%s'</source> <translation>Xarxa desconeguda especificada a -onlynet: '%s'</translation> </message> diff --git a/src/qt/locale/bitcoin_cs.ts b/src/qt/locale/bitcoin_cs.ts index 2dfa295ce0..f38c425137 100644 --- a/src/qt/locale/bitcoin_cs.ts +++ b/src/qt/locale/bitcoin_cs.ts @@ -15,7 +15,7 @@ </message> <message> <source>Copy the currently selected address to the system clipboard</source> - <translation>Zkopíruj aktuálně vybranou adresu do systémové schránky</translation> + <translation>Zkopíruj tuto adresu do systémové schránky</translation> </message> <message> <source>&Copy</source> @@ -27,7 +27,7 @@ </message> <message> <source>Delete the currently selected address from the list</source> - <translation>Smaž zvolenou adresu ze seznamu</translation> + <translation>Smaž tuto adresu ze seznamu</translation> </message> <message> <source>Export the data in the current tab to a file</source> @@ -41,6 +41,77 @@ <source>&Delete</source> <translation>S&maž</translation> </message> + <message> + <source>Choose the address to send coins to</source> + <translation>Zvol adresu, na kterou pošleš mince</translation> + </message> + <message> + <source>Choose the address to receive coins with</source> + <translation>Zvol adres na příjem mincí</translation> + </message> + <message> + <source>C&hoose</source> + <translation>&Zvol</translation> + </message> + <message> + <source>Sending addresses</source> + <translation>Odesílací adresy</translation> + </message> + <message> + <source>Receiving addresses</source> + <translation>Přijímací adresy</translation> + </message> + <message> + <source>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source> + <translation>Tohle jsou tvé bitcoinové adresy pro posílání plateb. Před odesláním mincí si vždy zkontroluj částku a cílovou adresu.</translation> + </message> + <message> + <source>These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction.</source> + <translation>Tohle jsou tvé bitcoinové adresy pro příjem plateb. Nezapomeň si pro každou transakci vždy vygenerovat novou adresu.</translation> + </message> + <message> + <source>&Copy Address</source> + <translation>&Kopíruj adresu</translation> + </message> + <message> + <source>Copy &Label</source> + <translation>Kopíruj &označení</translation> + </message> + <message> + <source>&Edit</source> + <translation>&Uprav</translation> + </message> + <message> + <source>Export Address List</source> + <translation>Export seznamu adres</translation> + </message> + <message> + <source>Comma separated file (*.csv)</source> + <translation>Formát CSV (*.csv)</translation> + </message> + <message> + <source>Exporting Failed</source> + <translation>Exportování selhalo</translation> + </message> + <message> + <source>There was an error trying to save the address list to %1. Please try again.</source> + <translation>Při ukládání seznamu adres do %1 se přihodila nějaká chyba. Zkus to prosím znovu.</translation> + </message> +</context> +<context> + <name>AddressTableModel</name> + <message> + <source>Label</source> + <translation>Označení</translation> + </message> + <message> + <source>Address</source> + <translation>Adresa</translation> + </message> + <message> + <source>(no label)</source> + <translation>(bez označení)</translation> + </message> </context> <context> <name>AskPassphraseDialog</name> @@ -60,10 +131,106 @@ <source>Repeat new passphrase</source> <translation>Totéž heslo ještě jednou</translation> </message> + <message> + <source>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>.</source> + <translation>Zadej nové heslo k peněžence.<br/>Použij <b>alespoň deset náhodných znaků</b> nebo <b>alespoň osm slov</b>.</translation> + </message> + <message> + <source>Encrypt wallet</source> + <translation>Zašifruj peněženku</translation> + </message> + <message> + <source>This operation needs your wallet passphrase to unlock the wallet.</source> + <translation>K provedení této operace musíš zadat heslo k peněžence, aby se mohla odemknout.</translation> + </message> + <message> + <source>Unlock wallet</source> + <translation>Odemkni peněženku</translation> + </message> + <message> + <source>This operation needs your wallet passphrase to decrypt the wallet.</source> + <translation>K provedení této operace musíš zadat heslo k peněžence, aby se mohla dešifrovat.</translation> + </message> + <message> + <source>Decrypt wallet</source> + <translation>Dešifruj peněženku</translation> + </message> + <message> + <source>Change passphrase</source> + <translation>Změň heslo</translation> + </message> + <message> + <source>Enter the old passphrase and new passphrase to the wallet.</source> + <translation>Zadej staré a nové heslo k peněžence.</translation> + </message> + <message> + <source>Confirm wallet encryption</source> + <translation>Potvrď zašifrování peněženky</translation> + </message> + <message> + <source>Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR BITCOINS</b>!</source> + <translation>Upozornění: Pokud si zašifruješ peněženku a ztratíš či zapomeneš heslo, <b>PŘIJDEŠ O VŠECHNY BITCOINY</b>!</translation> + </message> + <message> + <source>Are you sure you wish to encrypt your wallet?</source> + <translation>Jsi si jistý, že chceš peněženku zašifrovat?</translation> + </message> + <message> + <source>Wallet encrypted</source> + <translation>Peněženka je zašifrována</translation> + </message> + <message> + <source>%1 will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your bitcoins from being stolen by malware infecting your computer.</source> + <translation>%1 se teď ukončí, aby dokončil zašifrování. Pamatuj však, že pouhé zašifrování peněženky nemůže zabránit krádeži tvých bitcoinů malwarem, kterým se může počítač nakazit.</translation> + </message> + <message> + <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source> + <translation>DŮLEŽITÉ: Všechny předchozí zálohy peněženky by měly být nahrazeny nově vygenerovanou, zašifrovanou peněženkou. Z bezpečnostních důvodů budou předchozí zálohy nešifrované peněženky nepoužitelné, jakmile začneš používat novou zašifrovanou peněženku.</translation> + </message> + <message> + <source>Wallet encryption failed</source> + <translation>Zašifrování peněženky selhalo</translation> + </message> + <message> + <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source> + <translation>Zašifrování peněženky selhalo kvůli vnitřní chybě. Tvá peněženka tedy nebyla zašifrována.</translation> + </message> + <message> + <source>The supplied passphrases do not match.</source> + <translation>Zadaná hesla nejsou shodná.</translation> + </message> + <message> + <source>Wallet unlock failed</source> + <translation>Nepodařilo se odemknout peněženku</translation> + </message> + <message> + <source>The passphrase entered for the wallet decryption was incorrect.</source> + <translation>Nezadal jsi správné heslo pro dešifrování peněženky.</translation> + </message> + <message> + <source>Wallet decryption failed</source> + <translation>Nepodařilo se dešifrovat peněženku</translation> + </message> + <message> + <source>Wallet passphrase was successfully changed.</source> + <translation>Heslo k peněžence bylo v pořádku změněno.</translation> + </message> + <message> + <source>Warning: The Caps Lock key is on!</source> + <translation>Upozornění: Caps Lock je zapnutý!</translation> + </message> </context> <context> <name>BanTableModel</name> - </context> + <message> + <source>IP/Netmask</source> + <translation>IP/Maska</translation> + </message> + <message> + <source>Banned Until</source> + <translation>Blokován do</translation> + </message> +</context> <context> <name>BitcoinGUI</name> <message> @@ -103,6 +270,14 @@ <translation>Ukonči aplikaci</translation> </message> <message> + <source>&About %1</source> + <translation>O &%1</translation> + </message> + <message> + <source>Show information about %1</source> + <translation>Zobraz informace o %1</translation> + </message> + <message> <source>About &Qt</source> <translation>O &Qt</translation> </message> @@ -115,6 +290,10 @@ <translation>&Možnosti...</translation> </message> <message> + <source>Modify configuration options for %1</source> + <translation>Uprav nastavení %1</translation> + </message> + <message> <source>&Encrypt Wallet...</source> <translation>Zaši&fruj peněženku...</translation> </message> @@ -139,12 +318,28 @@ <translation>Načíst &URI...</translation> </message> <message> + <source>Click to disable network activity.</source> + <translation>Kliknutím zařízneš spojení se sítí.</translation> + </message> + <message> + <source>Network activity disabled.</source> + <translation>Síť je vypnutá.</translation> + </message> + <message> + <source>Click to enable network activity again.</source> + <translation>Kliknutím opět umožníš spojení do sítě.</translation> + </message> + <message> + <source>Syncing Headers (%1%)...</source> + <translation>Synchronizuji záhlaví bloků (%1 %)…</translation> + </message> + <message> <source>Reindexing blocks on disk...</source> <translation>Vytvářím nový index bloků na disku...</translation> </message> <message> <source>Send coins to a Bitcoin address</source> - <translation>Pošli mince na Bitcoinovou adresu</translation> + <translation>Pošli mince na bitcoinovou adresu</translation> </message> <message> <source>Backup wallet to another location</source> @@ -196,11 +391,11 @@ </message> <message> <source>Sign messages with your Bitcoin addresses to prove you own them</source> - <translation>Podepiš zprávy svými Bitcoinovými adresami, čímž prokážeš, že jsi jejich vlastníkem</translation> + <translation>Podepiš zprávy svými bitcoinovými adresami, čímž prokážeš, že jsi jejich vlastníkem</translation> </message> <message> <source>Verify messages to ensure they were signed with specified Bitcoin addresses</source> - <translation>Ověř zprávy, aby ses ujistil, že byly podepsány danými Bitcoinovými adresami</translation> + <translation>Ověř zprávy, aby ses ujistil, že byly podepsány danými bitcoinovými adresami</translation> </message> <message> <source>&File</source> @@ -240,39 +435,23 @@ </message> <message numerus="yes"> <source>%n active connection(s) to Bitcoin network</source> - <translation><numerusform>%n aktivní spojení do Bitcoinové sítě</numerusform><numerusform>%n aktivní spojení do Bitcoinové sítě</numerusform><numerusform>%n aktivních spojení do Bitcoinové sítě</numerusform></translation> + <translation><numerusform>%n aktivní spojení do bitcoinové sítě</numerusform><numerusform>%n aktivní spojení do bitcoinové sítě</numerusform><numerusform>%n aktivních spojení do bitcoinové sítě</numerusform></translation> </message> <message> - <source>No block source available...</source> - <translation>Není dostupný žádný zdroj bloků...</translation> - </message> - <message numerus="yes"> - <source>Processed %n block(s) of transaction history.</source> - <translation><numerusform>Zpracován %n blok transakční historie.</numerusform><numerusform>Zpracovány %n bloky transakční historie.</numerusform><numerusform>Zpracováno %n bloků transakční historie.</numerusform></translation> - </message> - <message numerus="yes"> - <source>%n hour(s)</source> - <translation><numerusform>%n hodinu</numerusform><numerusform>%n hodiny</numerusform><numerusform>%n hodin</numerusform></translation> - </message> - <message numerus="yes"> - <source>%n day(s)</source> - <translation><numerusform>%n den</numerusform><numerusform>%n dny</numerusform><numerusform>%n dnů</numerusform></translation> - </message> - <message numerus="yes"> - <source>%n week(s)</source> - <translation><numerusform>%n týden</numerusform><numerusform>%n týdny</numerusform><numerusform>%n týdnů</numerusform></translation> + <source>Indexing blocks on disk...</source> + <translation>Vytvářím index bloků na disku...</translation> </message> <message> - <source>%1 and %2</source> - <translation>%1 a %2</translation> + <source>Processing blocks on disk...</source> + <translation>Zpracovávám bloky na disku...</translation> </message> <message numerus="yes"> - <source>%n year(s)</source> - <translation><numerusform>%n rok</numerusform><numerusform>%n roky</numerusform><numerusform>%n roků</numerusform></translation> + <source>Processed %n block(s) of transaction history.</source> + <translation><numerusform>Zpracován %n blok transakční historie.</numerusform><numerusform>Zpracovány %n bloky transakční historie.</numerusform><numerusform>Zpracováno %n bloků transakční historie.</numerusform></translation> </message> <message> <source>%1 behind</source> - <translation>Stahuji ještě bloky transakcí za poslední %1</translation> + <translation>Stahuji ještě %1 bloků transakcí</translation> </message> <message> <source>Last received block was generated %1 ago.</source> @@ -280,7 +459,7 @@ </message> <message> <source>Transactions after this will not yet be visible.</source> - <translation>Novější transakce zatím nejsou vidět.</translation> + <translation>Následné transakce ještě nebudou vidět.</translation> </message> <message> <source>Error</source> @@ -299,6 +478,18 @@ <translation>Aktuální</translation> </message> <message> + <source>Show the %1 help message to get a list with possible Bitcoin command-line options</source> + <translation>Seznam argumentů Bitcoinu pro příkazovou řádku získáš v nápovědě %1</translation> + </message> + <message> + <source>%1 client</source> + <translation>%1 klient</translation> + </message> + <message> + <source>Connecting to peers...</source> + <translation>Připojuji se…</translation> + </message> + <message> <source>Catching up...</source> <translation>Stahuji...</translation> </message> @@ -341,6 +532,14 @@ <translation>Příchozí transakce</translation> </message> <message> + <source>HD key generation is <b>enabled</b></source> + <translation>HD generování klíčů je <b>zapnuté</b></translation> + </message> + <message> + <source>HD key generation is <b>disabled</b></source> + <translation>HD generování klíčů je <b>vypnuté</b></translation> + </message> + <message> <source>Wallet is <b>encrypted</b> and currently <b>unlocked</b></source> <translation>Peněženka je <b>zašifrovaná</b> a momentálně <b>odemčená</b></translation> </message> @@ -348,6 +547,10 @@ <source>Wallet is <b>encrypted</b> and currently <b>locked</b></source> <translation>Peněženka je <b>zašifrovaná</b> a momentálně <b>zamčená</b></translation> </message> + <message> + <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> + <translation>Stala se fatální chyba. Bitcoin nemůže bezpečně pokračovat v činnosti, a proto skončí.</translation> + </message> </context> <context> <name>CoinControlDialog</name> @@ -368,10 +571,6 @@ <translation>Částka:</translation> </message> <message> - <source>Priority:</source> - <translation>Priorita:</translation> - </message> - <message> <source>Fee:</source> <translation>Poplatek:</translation> </message> @@ -424,8 +623,84 @@ <translation>Potvrzeno</translation> </message> <message> - <source>Priority</source> - <translation>Priorita</translation> + <source>Copy address</source> + <translation>Kopíruj adresu</translation> + </message> + <message> + <source>Copy label</source> + <translation>Kopíruj její označení</translation> + </message> + <message> + <source>Copy amount</source> + <translation>Kopíruj částku</translation> + </message> + <message> + <source>Copy transaction ID</source> + <translation>Kopíruj ID transakce</translation> + </message> + <message> + <source>Lock unspent</source> + <translation>Zamkni neutracené</translation> + </message> + <message> + <source>Unlock unspent</source> + <translation>Odemkni k utracení</translation> + </message> + <message> + <source>Copy quantity</source> + <translation>Kopíruj počet</translation> + </message> + <message> + <source>Copy fee</source> + <translation>Kopíruj poplatek</translation> + </message> + <message> + <source>Copy after fee</source> + <translation>Kopíruj čistou částku</translation> + </message> + <message> + <source>Copy bytes</source> + <translation>Kopíruj bajty</translation> + </message> + <message> + <source>Copy dust</source> + <translation>Kopíruj prach</translation> + </message> + <message> + <source>Copy change</source> + <translation>Kopíruj drobné</translation> + </message> + <message> + <source>(%1 locked)</source> + <translation>(%1 zamčeno)</translation> + </message> + <message> + <source>yes</source> + <translation>ano</translation> + </message> + <message> + <source>no</source> + <translation>ne</translation> + </message> + <message> + <source>This label turns red if any recipient receives an amount smaller than the current dust threshold.</source> + <translation>Popisek zčervená, pokud má některý příjemce obdržet částku menší, než je aktuální práh pro prach.</translation> + </message> + <message> + <source>Can vary +/- %1 satoshi(s) per input.</source> + <translation>Může se lišit o +/– %1 satoshi na každý vstup.</translation> + </message> + <message> + <source>(no label)</source> + <translation>(bez označení)</translation> + </message> + <message> + <source>change from %1 (%2)</source> + <translation>drobné z %1 (%2)</translation> + </message> + <message> + <source>(change)</source> + <translation>(drobné)</translation> </message> </context> <context> @@ -450,6 +725,38 @@ <source>&Address</source> <translation>&Adresa</translation> </message> + <message> + <source>New receiving address</source> + <translation>Nová přijímací adresa</translation> + </message> + <message> + <source>New sending address</source> + <translation>Nová odesílací adresa</translation> + </message> + <message> + <source>Edit receiving address</source> + <translation>Uprav přijímací adresu</translation> + </message> + <message> + <source>Edit sending address</source> + <translation>Uprav odesílací adresu</translation> + </message> + <message> + <source>The entered address "%1" is not a valid Bitcoin address.</source> + <translation>Zadaná adresa „%1“ není platná bitcoinová adresa.</translation> + </message> + <message> + <source>The entered address "%1" is already in the address book.</source> + <translation>Zadaná adresa „%1“ už v adresáři je.</translation> + </message> + <message> + <source>Could not unlock wallet.</source> + <translation>Nemohu odemknout peněženku.</translation> + </message> + <message> + <source>New key generation failed.</source> + <translation>Nepodařilo se mi vygenerovat nový klíč.</translation> + </message> </context> <context> <name>FreespaceChecker</name> @@ -485,6 +792,10 @@ <translation>(%1-bit)</translation> </message> <message> + <source>About %1</source> + <translation>O %1</translation> + </message> + <message> <source>Command-line options</source> <translation>Argumenty příkazové řádky</translation> </message> @@ -520,7 +831,11 @@ <source>Show splash screen on startup (default: %u)</source> <translation>Zobrazit startovací obrazovku (výchozí: %u)</translation> </message> - </context> + <message> + <source>Reset all settings changed in the GUI</source> + <translation>Vrátit všechny volby měněné v GUI na výchozí hodnoty</translation> + </message> +</context> <context> <name>Intro</name> <message> @@ -528,6 +843,18 @@ <translation>Vítej</translation> </message> <message> + <source>Welcome to %1.</source> + <translation>Vítej v %1.</translation> + </message> + <message> + <source>As this is the first time the program is launched, you can choose where %1 will store its data.</source> + <translation>Tohle je poprvé, co spouštíš %1, takže si můžeš zvolit, kam bude ukládat svá data.</translation> + </message> + <message> + <source>%1 will download and store a copy of the Bitcoin block chain. At least %2GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source> + <translation>%1 bude stahovat kopii řetězce bloků. Proto bude potřeba do tohoto adresáře uložit nejméně %2 GB dat – toto číslo bude navíc v průběhu času růst. Tvá peněženka bude rovněž uložena v tomto adresáři.</translation> + </message> + <message> <source>Use the default data directory</source> <translation>Použij výchozí adresář pro data</translation> </message> @@ -553,6 +880,57 @@ </message> </context> <context> + <name>ModalOverlay</name> + <message> + <source>Form</source> + <translation>Formulář</translation> + </message> + <message> + <source>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 bitcoin network, as detailed below.</source> + <translation>Nedávné transakce ještě nemusí být vidět, takže stav tvého účtu nemusí být platný. Jakmile se však tvá peněženka dosynchronizuje s bitcoinovou sítí (viz informace níže), tak už bude stav správně.</translation> + </message> + <message> + <source>Attempting to spend bitcoins that are affected by not-yet-displayed transactions will not be accepted by the network.</source> + <translation>Utrácení bitcoinů, které už utratily zatím nezobrazené transakce, nebude bitcoinovou sítí umožněno.</translation> + </message> + <message> + <source>Number of blocks left</source> + <translation>Zbývající počet bloků</translation> + </message> + <message> + <source>Unknown...</source> + <translation>neznámý…</translation> + </message> + <message> + <source>Last block time</source> + <translation>Čas posledního bloku</translation> + </message> + <message> + <source>Progress</source> + <translation>Stav</translation> + </message> + <message> + <source>Progress increase per hour</source> + <translation>Postup za hodinu</translation> + </message> + <message> + <source>calculating...</source> + <translation>propočítávám…</translation> + </message> + <message> + <source>Estimated time left until synced</source> + <translation>Odhadovaný zbývající čas</translation> + </message> + <message> + <source>Hide</source> + <translation>Skryj</translation> + </message> + <message> + <source>Unknown. Syncing Headers (%1)...</source> + <translation>Neznámý. Synchronizuji záhlaví bloků (%1)…</translation> + </message> +</context> +<context> <name>OpenURIDialog</name> <message> <source>Open URI</source> @@ -570,6 +948,10 @@ <source>Select payment request file</source> <translation>Vyber soubor platebního požadavku</translation> </message> + <message> + <source>Select payment request file to open</source> + <translation>Vyber soubor platebního požadavku k načtení</translation> + </message> </context> <context> <name>OptionsDialog</name> @@ -582,6 +964,14 @@ <translation>&Hlavní</translation> </message> <message> + <source>Automatically start %1 after logging in to the system.</source> + <translation>Automaticky spustí %1 po přihlášení do systému.</translation> + </message> + <message> + <source>&Start %1 on system login</source> + <translation>S&pustit %1 po přihlášení do systému</translation> + </message> + <message> <source>Size of &database cache</source> <translation>Velikost &databázové cache</translation> </message> @@ -619,7 +1009,7 @@ </message> <message> <source>Active command-line options that override above options:</source> - <translation>Aktivní argumenty z příkazové řádky, které mají přednost před nastavením výše:</translation> + <translation>Aktivní argumenty z příkazové řádky, které přetloukly tato nastavení:</translation> </message> <message> <source>Reset all client options to default.</source> @@ -667,7 +1057,7 @@ </message> <message> <source>Connect to the Bitcoin network through a SOCKS5 proxy.</source> - <translation>Připojí se do Bitcoinové sítě přes SOCKS5 proxy.</translation> + <translation>Připojí se do bitcoinové sítě přes SOCKS5 proxy.</translation> </message> <message> <source>&Connect through SOCKS5 proxy (default proxy):</source> @@ -687,7 +1077,7 @@ </message> <message> <source>Used for reaching peers via:</source> - <translation>Použije se k připojování k protějškům přes:</translation> + <translation>Použije se k připojování k protějskům přes:</translation> </message> <message> <source>Shows, if the supplied default SOCKS5 proxy is used to reach peers via this network type.</source> @@ -707,7 +1097,7 @@ </message> <message> <source>Connect to the Bitcoin network through a separate SOCKS5 proxy for Tor hidden services.</source> - <translation>Připojí se do Bitcoinové sítě přes SOCKS5 proxy vyhrazenou pro skryté služby v Tor síti.</translation> + <translation>Připojí se do bitcoinové sítě přes SOCKS5 proxy vyhrazenou pro skryté služby v Tor síti.</translation> </message> <message> <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services:</source> @@ -718,6 +1108,14 @@ <translation>O&kno</translation> </message> <message> + <source>&Hide the icon from the system tray.</source> + <translation>Skryje ikonu, která se zobrazuje v panelu.</translation> + </message> + <message> + <source>Hide tray icon</source> + <translation>Skrýt &ikonu z panelu</translation> + </message> + <message> <source>Show only a tray icon after minimizing the window.</source> <translation>Po minimalizaci okna zobrazí pouze ikonu v panelu.</translation> </message> @@ -738,6 +1136,10 @@ <translation>&Jazyk uživatelského rozhraní:</translation> </message> <message> + <source>The user interface language can be set here. This setting will take effect after restarting %1.</source> + <translation>Tady lze nastavit jazyk uživatelského rozhraní. Nastavení se projeví až po restartování %1.</translation> + </message> + <message> <source>&Unit to show amounts in:</source> <translation>Je&dnotka pro částky:</translation> </message> @@ -751,7 +1153,7 @@ </message> <message> <source>&OK</source> - <translation>&Použít</translation> + <translation>&Budiž</translation> </message> <message> <source>&Cancel</source> @@ -779,7 +1181,7 @@ </message> <message> <source>This change would require a client restart.</source> - <translation>Tato změna vyžaduje restart aplikace.</translation> + <translation>Tahle změna bude chtít restartovat klienta.</translation> </message> <message> <source>The supplied proxy address is invalid.</source> @@ -794,7 +1196,7 @@ </message> <message> <source>The displayed information may be out of date. Your wallet automatically synchronizes with the Bitcoin network after a connection is established, but this process has not completed yet.</source> - <translation>Zobrazené informace nemusí být aktuální. Tvá peněženka se automaticky sesynchronizuje s Bitcoinovou sítí, jakmile se s ní spojí. Zatím ale ještě není synchronizace dokončena.</translation> + <translation>Zobrazené informace nemusí být aktuální. Tvá peněženka se automaticky sesynchronizuje s bitcoinovou sítí, jakmile se s ní spojí. Zatím ale ještě není synchronizace dokončena.</translation> </message> <message> <source>Watch-only:</source> @@ -826,7 +1228,7 @@ </message> <message> <source>Balances</source> - <translation>Stav účtů</translation> + <translation>Stavy účtů</translation> </message> <message> <source>Total:</source> @@ -862,6 +1264,97 @@ </message> </context> <context> + <name>PaymentServer</name> + <message> + <source>Payment request error</source> + <translation>Chyba platebního požadavku</translation> + </message> + <message> + <source>Cannot start bitcoin: click-to-pay handler</source> + <translation>Nemůžu spustit bitcoin: obsluha click-to-pay</translation> + </message> + <message> + <source>URI handling</source> + <translation>Zpracování URI</translation> + </message> + <message> + <source>Payment request fetch URL is invalid: %1</source> + <translation>Zdrojová URL platebního požadavku není platná: %1</translation> + </message> + <message> + <source>Invalid payment address %1</source> + <translation>Neplatná platební adresa %1</translation> + </message> + <message> + <source>URI cannot be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters.</source> + <translation>Nepodařilo se analyzovat URI! Důvodem může být neplatná bitcoinová adresa nebo poškozené parametry URI.</translation> + </message> + <message> + <source>Payment request file handling</source> + <translation>Zpracování souboru platebního požadavku</translation> + </message> + <message> + <source>Payment request file cannot be read! This can be caused by an invalid payment request file.</source> + <translation>Soubor platebního požadavku nejde přečíst nebo zpracovat! Příčinou může být špatný soubor platebního požadavku.</translation> + </message> + <message> + <source>Payment request rejected</source> + <translation>Platební požadavek byl odmítnut</translation> + </message> + <message> + <source>Payment request network doesn't match client network.</source> + <translation>Síť platebního požadavku neodpovídá síti klienta.</translation> + </message> + <message> + <source>Payment request expired.</source> + <translation>Platební požadavek vypršel.</translation> + </message> + <message> + <source>Payment request is not initialized.</source> + <translation>Platební požadavek není zahájený.</translation> + </message> + <message> + <source>Unverified payment requests to custom payment scripts are unsupported.</source> + <translation>Neověřené platební požadavky k uživatelským platebním skriptům nejsou podporované.</translation> + </message> + <message> + <source>Invalid payment request.</source> + <translation>Neplatný platební požadavek.</translation> + </message> + <message> + <source>Requested payment amount of %1 is too small (considered dust).</source> + <translation>Požadovaná platební částka %1 je příliš malá (je považována za prach).</translation> + </message> + <message> + <source>Refund from %1</source> + <translation>Vrácení peněz od %1</translation> + </message> + <message> + <source>Payment request %1 is too large (%2 bytes, allowed %3 bytes).</source> + <translation>Platební požadavek %1 je moc velký (%2 bajtů, povoleno %3 bajtů).</translation> + </message> + <message> + <source>Error communicating with %1: %2</source> + <translation>Chyba při komunikaci s %1: %2</translation> + </message> + <message> + <source>Payment request cannot be parsed!</source> + <translation>Platební požadavek je nečitelný!</translation> + </message> + <message> + <source>Bad response from server %1</source> + <translation>Chybná odpověď ze serveru %1</translation> + </message> + <message> + <source>Network request error</source> + <translation>Chyba síťového požadavku</translation> + </message> + <message> + <source>Payment acknowledged</source> + <translation>Platba potvrzena</translation> + </message> +</context> +<context> <name>PeerTableModel</name> <message> <source>User Agent</source> @@ -872,7 +1365,11 @@ <translation>Uzel/Služba</translation> </message> <message> - <source>Ping Time</source> + <source>NodeId</source> + <translation>Id uzlu</translation> + </message> + <message> + <source>Ping</source> <translation>Odezva</translation> </message> </context> @@ -884,7 +1381,7 @@ </message> <message> <source>Enter a Bitcoin address (e.g. %1)</source> - <translation>Zadej Bitcoinovou adresu (např. %1)</translation> + <translation>Zadej bitcoinovou adresu (např. %1)</translation> </message> <message> <source>%1 d</source> @@ -914,12 +1411,78 @@ <source>%1 ms</source> <translation>%1 ms</translation> </message> + <message numerus="yes"> + <source>%n second(s)</source> + <translation><numerusform>%n vteřinu</numerusform><numerusform>%n vteřiny</numerusform><numerusform>%n vteřin</numerusform></translation> + </message> + <message numerus="yes"> + <source>%n minute(s)</source> + <translation><numerusform>%n minutu</numerusform><numerusform>%n minuty</numerusform><numerusform>%n minut</numerusform></translation> + </message> + <message numerus="yes"> + <source>%n hour(s)</source> + <translation><numerusform>%n hodinu</numerusform><numerusform>%n hodiny</numerusform><numerusform>%n hodin</numerusform></translation> + </message> + <message numerus="yes"> + <source>%n day(s)</source> + <translation><numerusform>%n den</numerusform><numerusform>%n dny</numerusform><numerusform>%n dnů</numerusform></translation> + </message> + <message numerus="yes"> + <source>%n week(s)</source> + <translation><numerusform>%n týden</numerusform><numerusform>%n týdny</numerusform><numerusform>%n týdnů</numerusform></translation> + </message> + <message> + <source>%1 and %2</source> + <translation>%1 a %2</translation> + </message> + <message numerus="yes"> + <source>%n year(s)</source> + <translation><numerusform>%n rok</numerusform><numerusform>%n roky</numerusform><numerusform>%n roků</numerusform></translation> + </message> + <message> + <source>%1 didn't yet exit safely...</source> + <translation>%1 ještě bezpečně neskončil…</translation> + </message> +</context> +<context> + <name>QObject::QObject</name> + <message> + <source>Error: Specified data directory "%1" does not exist.</source> + <translation>Chyba: Zadaný adresář pro data „%1“ neexistuje.</translation> + </message> + <message> + <source>Error: Cannot parse configuration file: %1. Only use key=value syntax.</source> + <translation>Chyba: Nemohu zpracovat konfigurační soubor: %1. Používej pouze syntaxi klíč=hodnota.</translation> + </message> + <message> + <source>Error: %1</source> + <translation>Chyba: %1</translation> + </message> +</context> +<context> + <name>QRImageWidget</name> + <message> + <source>&Save Image...</source> + <translation>&Ulož obrázek...</translation> + </message> + <message> + <source>&Copy Image</source> + <translation>&Kopíruj obrázek</translation> + </message> + <message> + <source>Save QR Code</source> + <translation>Ulož QR kód</translation> + </message> + <message> + <source>PNG Image (*.png)</source> + <translation>PNG obrázek (*.png)</translation> + </message> </context> <context> <name>RPCConsole</name> <message> <source>N/A</source> - <translation>N/A</translation> + <translation>nedostupná informace</translation> </message> <message> <source>Client version</source> @@ -942,6 +1505,10 @@ <translation>Používaná verze BerkeleyDB</translation> </message> <message> + <source>Datadir</source> + <translation>Adresář s daty</translation> + </message> + <message> <source>Startup time</source> <translation>Čas spuštění</translation> </message> @@ -966,8 +1533,16 @@ <translation>Aktuální počet bloků</translation> </message> <message> + <source>Memory Pool</source> + <translation>Transakční zásobník</translation> + </message> + <message> + <source>Current number of transactions</source> + <translation>Aktuální množství transakcí</translation> + </message> + <message> <source>Memory usage</source> - <translation>Využití paměti</translation> + <translation>Obsazenost paměti</translation> </message> <message> <source>Received</source> @@ -982,10 +1557,18 @@ <translation>&Protějšky</translation> </message> <message> + <source>Banned peers</source> + <translation>Protějšky pod klatbou (blokované)</translation> + </message> + <message> <source>Select a peer to view detailed information.</source> <translation>Vyber protějšek a uvidíš jeho detailní informace.</translation> </message> <message> + <source>Whitelisted</source> + <translation>Vždy vítán</translation> + </message> + <message> <source>Direction</source> <translation>Směr</translation> </message> @@ -994,10 +1577,34 @@ <translation>Verze</translation> </message> <message> + <source>Starting Block</source> + <translation>Počáteční blok</translation> + </message> + <message> + <source>Synced Headers</source> + <translation>Aktuálně hlaviček</translation> + </message> + <message> + <source>Synced Blocks</source> + <translation>Aktuálně bloků</translation> + </message> + <message> <source>User Agent</source> <translation>Typ klienta</translation> </message> <message> + <source>Open the %1 debug log file from the current data directory. This can take a few seconds for large log files.</source> + <translation>Otevři soubor s ladicími záznamy %1 z aktuálního datového adresáře. U velkých žurnálů to může pár vteřin zabrat.</translation> + </message> + <message> + <source>Decrease font size</source> + <translation>Zmenšit písmo</translation> + </message> + <message> + <source>Increase font size</source> + <translation>Zvětšit písmo</translation> + </message> + <message> <source>Services</source> <translation>Služby</translation> </message> @@ -1022,6 +1629,18 @@ <translation>Odezva</translation> </message> <message> + <source>The duration of a currently outstanding ping.</source> + <translation>Jak dlouho už čekám na pong.</translation> + </message> + <message> + <source>Ping Wait</source> + <translation>Doba čekání na odezvu</translation> + </message> + <message> + <source>Min Ping</source> + <translation>Nejrychlejší odezva</translation> + </message> + <message> <source>Time Offset</source> <translation>Časový posun</translation> </message> @@ -1066,14 +1685,6 @@ <translation>Vyčistit konzoli</translation> </message> <message> - <source>&Disconnect Node</source> - <translation>&Odpojit uzel</translation> - </message> - <message> - <source>Ban Node for</source> - <translation>Uvalit na uzel klatbu na</translation> - </message> - <message> <source>1 &hour</source> <translation>1 &hodinu</translation> </message> @@ -1090,8 +1701,20 @@ <translation>1 &rok</translation> </message> <message> - <source>&Unban Node</source> - <translation>&Zbavit uzel klatby</translation> + <source>&Disconnect</source> + <translation>&Odpoj</translation> + </message> + <message> + <source>Ban for</source> + <translation>Uval klatbu na</translation> + </message> + <message> + <source>&Unban</source> + <translation>&Odblokuj</translation> + </message> + <message> + <source>Welcome to the %1 RPC console.</source> + <translation>Vítej v RPC konzoli %1.</translation> </message> <message> <source>Use up and down arrows to navigate history, and <b>Ctrl-L</b> to clear screen.</source> @@ -1102,6 +1725,14 @@ <translation>Napsáním <b>help</b> si vypíšeš přehled dostupných příkazů.</translation> </message> <message> + <source>WARNING: Scammers have been active, telling users to type commands here, stealing their wallet contents. Do not use this console without fully understanding the ramification of a command.</source> + <translation>UPOZORNĚNÍ: Podvodníci jsou aktivní a říkají uživatelům, aby sem zadávali příkazy, kterými jim pak ale vykradou jejich peněženky. Nepoužívej tuhle konzoli, pokud úplně neznáš důsledky jednotlivých příkazů.</translation> + </message> + <message> + <source>Network activity disabled</source> + <translation>Síť je vypnutá</translation> + </message> + <message> <source>%1 B</source> <translation>%1 B</translation> </message> @@ -1174,7 +1805,7 @@ </message> <message> <source>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 Bitcoin network.</source> - <translation>Volitelná zpráva, která se připojí k platebnímu požadavku a která se zobrazí, když se požadavek otevře. Poznámka: tahle zpráva se neposílá s platbou po Bitcoinové síti.</translation> + <translation>Volitelná zpráva, která se připojí k platebnímu požadavku a která se zobrazí, když se požadavek otevře. Poznámka: tahle zpráva se neposílá s platbou po bitcoinové síti.</translation> </message> <message> <source>An optional label to associate with the new receiving address.</source> @@ -1220,6 +1851,22 @@ <source>Remove</source> <translation>Smazat</translation> </message> + <message> + <source>Copy URI</source> + <translation>Kopíruj URI</translation> + </message> + <message> + <source>Copy label</source> + <translation>Kopíruj její označení</translation> + </message> + <message> + <source>Copy message</source> + <translation>Kopíruj zprávu</translation> + </message> + <message> + <source>Copy amount</source> + <translation>Kopíruj částku</translation> + </message> </context> <context> <name>ReceiveRequestDialog</name> @@ -1239,6 +1886,73 @@ <source>&Save Image...</source> <translation>&Ulož obrázek...</translation> </message> + <message> + <source>Request payment to %1</source> + <translation>Platební požadavek: %1</translation> + </message> + <message> + <source>Payment information</source> + <translation>Informace o platbě</translation> + </message> + <message> + <source>URI</source> + <translation>URI</translation> + </message> + <message> + <source>Address</source> + <translation>Adresa</translation> + </message> + <message> + <source>Amount</source> + <translation>Částka</translation> + </message> + <message> + <source>Label</source> + <translation>Označení</translation> + </message> + <message> + <source>Message</source> + <translation>Zpráva</translation> + </message> + <message> + <source>Resulting URI too long, try to reduce the text for label / message.</source> + <translation>Výsledná URI je příliš dlouhá, zkus zkrátit text označení/zprávy.</translation> + </message> + <message> + <source>Error encoding URI into QR Code.</source> + <translation>Chyba při kódování URI do QR kódu.</translation> + </message> +</context> +<context> + <name>RecentRequestsTableModel</name> + <message> + <source>Date</source> + <translation>Datum</translation> + </message> + <message> + <source>Label</source> + <translation>Označení</translation> + </message> + <message> + <source>Message</source> + <translation>Zpráva</translation> + </message> + <message> + <source>(no label)</source> + <translation>(bez označení)</translation> + </message> + <message> + <source>(no message)</source> + <translation>(bez zprávy)</translation> + </message> + <message> + <source>(no amount requested)</source> + <translation>(bez požadované částky)</translation> + </message> + <message> + <source>Requested</source> + <translation>Požádáno</translation> + </message> </context> <context> <name>SendCoinsDialog</name> @@ -1275,10 +1989,6 @@ <translation>Částka:</translation> </message> <message> - <source>Priority:</source> - <translation>Priorita:</translation> - </message> - <message> <source>Fee:</source> <translation>Poplatek:</translation> </message> @@ -1347,10 +2057,6 @@ <translation>(Inteligentní poplatek ještě není inicializovaný. Obvykle mu to tak pár bloků trvá...)</translation> </message> <message> - <source>Confirmation time:</source> - <translation>Rychlost potvrzení:</translation> - </message> - <message> <source>normal</source> <translation>normální</translation> </message> @@ -1375,6 +2081,10 @@ <translation>Prach:</translation> </message> <message> + <source>Confirmation time target:</source> + <translation>Časové cílování potvrzení:</translation> + </message> + <message> <source>Clear &All</source> <translation>Všechno s&maž</translation> </message> @@ -1390,6 +2100,126 @@ <source>S&end</source> <translation>Pošl&i</translation> </message> + <message> + <source>Copy quantity</source> + <translation>Kopíruj počet</translation> + </message> + <message> + <source>Copy amount</source> + <translation>Kopíruj částku</translation> + </message> + <message> + <source>Copy fee</source> + <translation>Kopíruj poplatek</translation> + </message> + <message> + <source>Copy after fee</source> + <translation>Kopíruj čistou částku</translation> + </message> + <message> + <source>Copy bytes</source> + <translation>Kopíruj bajty</translation> + </message> + <message> + <source>Copy dust</source> + <translation>Kopíruj prach</translation> + </message> + <message> + <source>Copy change</source> + <translation>Kopíruj drobné</translation> + </message> + <message> + <source>%1 to %2</source> + <translation>%1 pro %2</translation> + </message> + <message> + <source>Are you sure you want to send?</source> + <translation>Jsi si jistý, že to chceš poslat?</translation> + </message> + <message> + <source>added as transaction fee</source> + <translation>přidán jako transakční poplatek</translation> + </message> + <message> + <source>Total Amount %1</source> + <translation>Celková částka %1</translation> + </message> + <message> + <source>or</source> + <translation>nebo</translation> + </message> + <message> + <source>Confirm send coins</source> + <translation>Potvrď odeslání mincí</translation> + </message> + <message> + <source>The recipient address is not valid. Please recheck.</source> + <translation>Adresa příjemce je neplatná – překontroluj ji prosím.</translation> + </message> + <message> + <source>The amount to pay must be larger than 0.</source> + <translation>Odesílaná částka musí být větší než 0.</translation> + </message> + <message> + <source>The amount exceeds your balance.</source> + <translation>Částka překračuje stav účtu.</translation> + </message> + <message> + <source>The total exceeds your balance when the %1 transaction fee is included.</source> + <translation>Celková částka při připočítání poplatku %1 překročí stav účtu.</translation> + </message> + <message> + <source>Duplicate address found: addresses should only be used once each.</source> + <translation>Zaznamenána duplicitní adresa: každá adresa by ale měla být použita vždy jen jednou.</translation> + </message> + <message> + <source>Transaction creation failed!</source> + <translation>Vytvoření transakce selhalo!</translation> + </message> + <message> + <source>The transaction was rejected with the following reason: %1</source> + <translation>Transakce byla zamítnuta s tímto odůvodněním: %1</translation> + </message> + <message> + <source>A fee higher than %1 is considered an absurdly high fee.</source> + <translation>Poplatek vyšší než %1 je považován za absurdně vysoký.</translation> + </message> + <message> + <source>Payment request expired.</source> + <translation>Platební požadavek vypršel.</translation> + </message> + <message numerus="yes"> + <source>%n block(s)</source> + <translation><numerusform>%n blok</numerusform><numerusform>%n bloky</numerusform><numerusform>%n bloků</numerusform></translation> + </message> + <message> + <source>Pay only the required fee of %1</source> + <translation>Zaplatit pouze vyžadovaný poplatek %1</translation> + </message> + <message numerus="yes"> + <source>Estimated to begin confirmation within %n block(s).</source> + <translation><numerusform>Potvrzování by podle odhadu mělo začít během %n bloku.</numerusform><numerusform>Potvrzování by podle odhadu mělo začít během %n bloků.</numerusform><numerusform>Potvrzování by podle odhadu mělo začít během %n bloků.</numerusform></translation> + </message> + <message> + <source>Warning: Invalid Bitcoin address</source> + <translation>Upozornění: Neplatná bitcoinová adresa</translation> + </message> + <message> + <source>Warning: Unknown change address</source> + <translation>Upozornění: Neznámá adresa pro drobné</translation> + </message> + <message> + <source>Confirm custom change address</source> + <translation>Potvrď vlastní adresu pro drobné</translation> + </message> + <message> + <source>The address you selected for change is not part of this wallet. Any or all funds in your wallet may be sent to this address. Are you sure?</source> + <translation>Adresa, kterou jsi zvolil pro drobné, není součástí této peněženky. Potenciálně všechny prostředky z tvé peněženky mohou být na tuto adresu odeslány. Souhlasíš, aby se tak stalo?</translation> + </message> + <message> + <source>(no label)</source> + <translation>(bez označení)</translation> + </message> </context> <context> <name>SendCoinsEntry</name> @@ -1459,7 +2289,7 @@ </message> <message> <source>A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source> - <translation>Zpráva, která byla připojena k bitcoin: URI a která se ti pro přehled uloží k transakci. Poznámka: Tahle zpráva se neposílá s platbou po Bitcoinové síti.</translation> + <translation>Zpráva, která byla připojena k bitcoin: URI a která se ti pro přehled uloží k transakci. Poznámka: Tahle zpráva se neposílá s platbou po bitcoinové síti.</translation> </message> <message> <source>Pay To:</source> @@ -1469,10 +2299,25 @@ <source>Memo:</source> <translation>Poznámka:</translation> </message> + <message> + <source>Enter a label for this address to add it to your address book</source> + <translation>Zadej označení této adresy; obojí se ti pak uloží do adresáře</translation> + </message> +</context> +<context> + <name>SendConfirmationDialog</name> + <message> + <source>Yes</source> + <translation>Ano</translation> + </message> </context> <context> <name>ShutdownWindow</name> <message> + <source>%1 is shutting down...</source> + <translation>%1 se ukončuje...</translation> + </message> + <message> <source>Do not shut down the computer until this window disappears.</source> <translation>Nevypínej počítač, dokud toto okno nezmizí.</translation> </message> @@ -1525,7 +2370,7 @@ </message> <message> <source>Sign the message to prove you own this Bitcoin address</source> - <translation>Podepiš zprávu, čímž prokážeš, že jsi vlastníkem této Bitcoinové adresy</translation> + <translation>Podepiš zprávu, čímž prokážeš, že jsi vlastníkem této bitcoinové adresy</translation> </message> <message> <source>Sign &Message</source> @@ -1553,7 +2398,7 @@ </message> <message> <source>Verify the message to ensure it was signed with the specified Bitcoin address</source> - <translation>Ověř zprávu, aby ses ujistil, že byla podepsána danou Bitcoinovou adresou</translation> + <translation>Ověř zprávu, aby ses ujistil, že byla podepsána danou bitcoinovou adresou</translation> </message> <message> <source>Verify &Message</source> @@ -1563,6 +2408,58 @@ <source>Reset all verify message fields</source> <translation>Vymaž všechna pole formuláře pro ověření zrávy</translation> </message> + <message> + <source>Click "Sign Message" to generate signature</source> + <translation>Kliknutím na „Podepiš zprávu“ vygeneruješ podpis</translation> + </message> + <message> + <source>The entered address is invalid.</source> + <translation>Zadaná adresa je neplatná.</translation> + </message> + <message> + <source>Please check the address and try again.</source> + <translation>Zkontroluj ji prosím a zkus to pak znovu.</translation> + </message> + <message> + <source>The entered address does not refer to a key.</source> + <translation>Zadaná adresa nepasuje ke klíči.</translation> + </message> + <message> + <source>Wallet unlock was cancelled.</source> + <translation>Odemčení peněženky bylo zrušeno.</translation> + </message> + <message> + <source>Private key for the entered address is not available.</source> + <translation>Soukromý klíč pro zadanou adresu není dostupný.</translation> + </message> + <message> + <source>Message signing failed.</source> + <translation>Nepodařilo se podepsat zprávu.</translation> + </message> + <message> + <source>Message signed.</source> + <translation>Zpráva podepsána.</translation> + </message> + <message> + <source>The signature could not be decoded.</source> + <translation>Podpis nejde dekódovat.</translation> + </message> + <message> + <source>Please check the signature and try again.</source> + <translation>Zkontroluj ho prosím a zkus to pak znovu.</translation> + </message> + <message> + <source>The signature did not match the message digest.</source> + <translation>Podpis se neshoduje s hašem zprávy.</translation> + </message> + <message> + <source>Message verification failed.</source> + <translation>Nepodařilo se ověřit zprávu.</translation> + </message> + <message> + <source>Message verified.</source> + <translation>Zpráva ověřena.</translation> + </message> </context> <context> <name>SplashScreen</name> @@ -1579,11 +2476,460 @@ </message> </context> <context> + <name>TransactionDesc</name> + <message numerus="yes"> + <source>Open for %n more block(s)</source> + <translation><numerusform>Otevřeno pro %n další blok</numerusform><numerusform>Otevřeno pro %n další bloky</numerusform><numerusform>Otevřeno pro %n dalších bloků</numerusform></translation> + </message> + <message> + <source>Open until %1</source> + <translation>Otřevřeno dokud %1</translation> + </message> + <message> + <source>conflicted with a transaction with %1 confirmations</source> + <translation>koliduje s transakcí o %1 konfirmacích</translation> + </message> + <message> + <source>%1/offline</source> + <translation>%1/offline</translation> + </message> + <message> + <source>0/unconfirmed, %1</source> + <translation>0/nepotvrzeno, %1</translation> + </message> + <message> + <source>in memory pool</source> + <translation>v transakčním zásobníku</translation> + </message> + <message> + <source>not in memory pool</source> + <translation>není ani v transakčním zásobníku</translation> + </message> + <message> + <source>abandoned</source> + <translation>zanechaná</translation> + </message> + <message> + <source>%1/unconfirmed</source> + <translation>%1/nepotvrzeno</translation> + </message> + <message> + <source>%1 confirmations</source> + <translation>%1 potvrzení</translation> + </message> + <message> + <source>Status</source> + <translation>Stav</translation> + </message> + <message> + <source>, has not been successfully broadcast yet</source> + <translation>, ještě nebylo rozesláno</translation> + </message> + <message numerus="yes"> + <source>, broadcast through %n node(s)</source> + <translation><numerusform>, rozesláno přes %n uzel</numerusform><numerusform>, rozesláno přes %n uzly</numerusform><numerusform>, rozesláno přes %n uzlů</numerusform></translation> + </message> + <message> + <source>Date</source> + <translation>Datum</translation> + </message> + <message> + <source>Source</source> + <translation>Zdroj</translation> + </message> + <message> + <source>Generated</source> + <translation>Vygenerováno</translation> + </message> + <message> + <source>From</source> + <translation>Od</translation> + </message> + <message> + <source>unknown</source> + <translation>neznámo</translation> + </message> + <message> + <source>To</source> + <translation>Pro</translation> + </message> + <message> + <source>own address</source> + <translation>vlastní adresa</translation> + </message> + <message> + <source>watch-only</source> + <translation>sledovaná</translation> + </message> + <message> + <source>label</source> + <translation>označení</translation> + </message> + <message> + <source>Credit</source> + <translation>Příjem</translation> + </message> + <message numerus="yes"> + <source>matures in %n more block(s)</source> + <translation><numerusform>dozraje po %n bloku</numerusform><numerusform>dozraje po %n blocích</numerusform><numerusform>dozraje po %n blocích</numerusform></translation> + </message> + <message> + <source>not accepted</source> + <translation>neakceptováno</translation> + </message> + <message> + <source>Debit</source> + <translation>Výdaj</translation> + </message> + <message> + <source>Total debit</source> + <translation>Celkové výdaje</translation> + </message> + <message> + <source>Total credit</source> + <translation>Celkové příjmy</translation> + </message> + <message> + <source>Transaction fee</source> + <translation>Transakční poplatek</translation> + </message> + <message> + <source>Net amount</source> + <translation>Čistá částka</translation> + </message> + <message> + <source>Message</source> + <translation>Zpráva</translation> + </message> + <message> + <source>Comment</source> + <translation>Komentář</translation> + </message> + <message> + <source>Transaction ID</source> + <translation>ID transakce</translation> + </message> + <message> + <source>Transaction total size</source> + <translation>Celková velikost transakce</translation> + </message> + <message> + <source>Output index</source> + <translation>Pořadí výstupu</translation> + </message> + <message> + <source>Merchant</source> + <translation>Obchodník</translation> + </message> + <message> + <source>Generated coins must mature %1 blocks before they can be spent. When you generated this block, it was broadcast to the network to be added to the block chain. If it fails to get into the chain, its state will change to "not accepted" and it won't be spendable. This may occasionally happen if another node generates a block within a few seconds of yours.</source> + <translation>Vygenerované mince musí čekat %1 bloků, než mohou být utraceny. Když jsi vygeneroval tenhle blok, tak byl rozposlán do sítě, aby byl přidán do řetězce bloků. Pokud se mu nepodaří dostat se do řetězce, změní se na „neakceptovaný“ a nepůjde utratit. To se občas může stát, pokud jiný uzel vygeneruje blok zhruba ve stejném okamžiku jako ty.</translation> + </message> + <message> + <source>Debug information</source> + <translation>Ladicí informace</translation> + </message> + <message> + <source>Transaction</source> + <translation>Transakce</translation> + </message> + <message> + <source>Inputs</source> + <translation>Vstupy</translation> + </message> + <message> + <source>Amount</source> + <translation>Částka</translation> + </message> + <message> + <source>true</source> + <translation>true</translation> + </message> + <message> + <source>false</source> + <translation>false</translation> + </message> +</context> +<context> <name>TransactionDescDialog</name> <message> <source>This pane shows a detailed description of the transaction</source> <translation>Toto okno zobrazuje detailní popis transakce</translation> </message> + <message> + <source>Details for %1</source> + <translation>Podrobnosti o %1</translation> + </message> +</context> +<context> + <name>TransactionTableModel</name> + <message> + <source>Date</source> + <translation>Datum</translation> + </message> + <message> + <source>Type</source> + <translation>Typ</translation> + </message> + <message> + <source>Label</source> + <translation>Označení</translation> + </message> + <message numerus="yes"> + <source>Open for %n more block(s)</source> + <translation><numerusform>Otevřeno pro %n další blok</numerusform><numerusform>Otevřeno pro %n další bloky</numerusform><numerusform>Otevřeno pro %n dalších bloků</numerusform></translation> + </message> + <message> + <source>Open until %1</source> + <translation>Otřevřeno dokud %1</translation> + </message> + <message> + <source>Offline</source> + <translation>Offline</translation> + </message> + <message> + <source>Unconfirmed</source> + <translation>Nepotvrzeno</translation> + </message> + <message> + <source>Abandoned</source> + <translation>Zanechaná</translation> + </message> + <message> + <source>Confirming (%1 of %2 recommended confirmations)</source> + <translation>Potvrzuje se (%1 z %2 doporučených potvrzení)</translation> + </message> + <message> + <source>Confirmed (%1 confirmations)</source> + <translation>Potvrzeno (%1 potvrzení)</translation> + </message> + <message> + <source>Conflicted</source> + <translation>V kolizi</translation> + </message> + <message> + <source>Immature (%1 confirmations, will be available after %2)</source> + <translation>Nedozráno (%1 potvrzení, dozraje při %2 potvrzeních)</translation> + </message> + <message> + <source>This block was not received by any other nodes and will probably not be accepted!</source> + <translation>Tento blok nedostal žádný jiný uzel a pravděpodobně nebude akceptován!</translation> + </message> + <message> + <source>Generated but not accepted</source> + <translation>Vygenerováno, ale neakceptováno</translation> + </message> + <message> + <source>Received with</source> + <translation>Přijato do</translation> + </message> + <message> + <source>Received from</source> + <translation>Přijato od</translation> + </message> + <message> + <source>Sent to</source> + <translation>Posláno na</translation> + </message> + <message> + <source>Payment to yourself</source> + <translation>Platba sama sobě</translation> + </message> + <message> + <source>Mined</source> + <translation>Vytěženo</translation> + </message> + <message> + <source>watch-only</source> + <translation>sledovací</translation> + </message> + <message> + <source>(n/a)</source> + <translation>(n/a)</translation> + </message> + <message> + <source>(no label)</source> + <translation>(bez označení)</translation> + </message> + <message> + <source>Transaction status. Hover over this field to show number of confirmations.</source> + <translation>Stav transakce. Najetím myši na toto políčko si zobrazíš počet potvrzení.</translation> + </message> + <message> + <source>Date and time that the transaction was received.</source> + <translation>Datum a čas přijetí transakce.</translation> + </message> + <message> + <source>Type of transaction.</source> + <translation>Druh transakce.</translation> + </message> + <message> + <source>Whether or not a watch-only address is involved in this transaction.</source> + <translation>Zda tato transakce zahrnuje i některou sledovanou adresu.</translation> + </message> + <message> + <source>User-defined intent/purpose of the transaction.</source> + <translation>Uživatelsky určený účel transakce.</translation> + </message> + <message> + <source>Amount removed from or added to balance.</source> + <translation>Částka odečtená z nebo přičtená k účtu.</translation> + </message> +</context> +<context> + <name>TransactionView</name> + <message> + <source>All</source> + <translation>Vše</translation> + </message> + <message> + <source>Today</source> + <translation>Dnes</translation> + </message> + <message> + <source>This week</source> + <translation>Tento týden</translation> + </message> + <message> + <source>This month</source> + <translation>Tento měsíc</translation> + </message> + <message> + <source>Last month</source> + <translation>Minulý měsíc</translation> + </message> + <message> + <source>This year</source> + <translation>Letos</translation> + </message> + <message> + <source>Range...</source> + <translation>Rozsah...</translation> + </message> + <message> + <source>Received with</source> + <translation>Přijato</translation> + </message> + <message> + <source>Sent to</source> + <translation>Posláno</translation> + </message> + <message> + <source>To yourself</source> + <translation>Sám sobě</translation> + </message> + <message> + <source>Mined</source> + <translation>Vytěženo</translation> + </message> + <message> + <source>Other</source> + <translation>Ostatní</translation> + </message> + <message> + <source>Enter address or label to search</source> + <translation>Zadej adresu nebo označení pro její vyhledání</translation> + </message> + <message> + <source>Min amount</source> + <translation>Minimální částka</translation> + </message> + <message> + <source>Abandon transaction</source> + <translation>Zapomenout transakci</translation> + </message> + <message> + <source>Copy address</source> + <translation>Kopíruj adresu</translation> + </message> + <message> + <source>Copy label</source> + <translation>Kopíruj její označení</translation> + </message> + <message> + <source>Copy amount</source> + <translation>Kopíruj částku</translation> + </message> + <message> + <source>Copy transaction ID</source> + <translation>Kopíruj ID transakce</translation> + </message> + <message> + <source>Copy raw transaction</source> + <translation>Kopíruj surovou transakci</translation> + </message> + <message> + <source>Copy full transaction details</source> + <translation>Kopíruj kompletní podrobnosti o transakci</translation> + </message> + <message> + <source>Edit label</source> + <translation>Uprav označení</translation> + </message> + <message> + <source>Show transaction details</source> + <translation>Zobraz detaily transakce</translation> + </message> + <message> + <source>Export Transaction History</source> + <translation>Exportuj transakční historii</translation> + </message> + <message> + <source>Comma separated file (*.csv)</source> + <translation>Formát CSV (*.csv)</translation> + </message> + <message> + <source>Confirmed</source> + <translation>Potvrzeno</translation> + </message> + <message> + <source>Watch-only</source> + <translation>Sledovaná</translation> + </message> + <message> + <source>Date</source> + <translation>Datum</translation> + </message> + <message> + <source>Type</source> + <translation>Typ</translation> + </message> + <message> + <source>Label</source> + <translation>Označení</translation> + </message> + <message> + <source>Address</source> + <translation>Adresa</translation> + </message> + <message> + <source>ID</source> + <translation>ID</translation> + </message> + <message> + <source>Exporting Failed</source> + <translation>Exportování selhalo</translation> + </message> + <message> + <source>There was an error trying to save the transaction history to %1.</source> + <translation>Při ukládání transakční historie do %1 se přihodila nějaká chyba.</translation> + </message> + <message> + <source>Exporting Successful</source> + <translation>Úspěšně vyexportováno</translation> + </message> + <message> + <source>The transaction history was successfully saved to %1.</source> + <translation>Transakční historie byla v pořádku uložena do %1.</translation> + </message> + <message> + <source>Range:</source> + <translation>Rozsah:</translation> + </message> + <message> + <source>to</source> + <translation>až</translation> + </message> </context> <context> <name>UnitDisplayStatusBarControl</name> @@ -1593,6 +2939,55 @@ </message> </context> <context> + <name>WalletFrame</name> + <message> + <source>No wallet has been loaded.</source> + <translation>Žádná peněženka se nenačetla.</translation> + </message> +</context> +<context> + <name>WalletModel</name> + <message> + <source>Send Coins</source> + <translation>Pošli mince</translation> + </message> +</context> +<context> + <name>WalletView</name> + <message> + <source>&Export</source> + <translation>&Export</translation> + </message> + <message> + <source>Export the data in the current tab to a file</source> + <translation>Exportuj data z tohoto panelu do souboru</translation> + </message> + <message> + <source>Backup Wallet</source> + <translation>Záloha peněženky</translation> + </message> + <message> + <source>Wallet Data (*.dat)</source> + <translation>Data peněženky (*.dat)</translation> + </message> + <message> + <source>Backup Failed</source> + <translation>Zálohování selhalo</translation> + </message> + <message> + <source>There was an error trying to save the wallet data to %1.</source> + <translation>Při ukládání peněženky do %1 se přihodila nějaká chyba.</translation> + </message> + <message> + <source>Backup Successful</source> + <translation>Úspěšně zazálohováno</translation> + </message> + <message> + <source>The wallet data was successfully saved to %1.</source> + <translation>Data z peněženky byla v pořádku uložena do %1.</translation> + </message> +</context> +<context> <name>bitcoin-core</name> <message> <source>Options:</source> @@ -1615,6 +3010,18 @@ <translation>Akceptovat příkazy z příkazové řádky a přes JSON-RPC</translation> </message> <message> + <source>Accept connections from outside (default: 1 if no -proxy or -connect/-noconnect)</source> + <translation>Přijímat spojení zvenčí (výchozí: 1, pokud není zadáno -proxy nebo -connect/-noconnect)</translation> + </message> + <message> + <source>Connect only to the specified node(s); -noconnect or -connect=0 alone to disable automatic connections</source> + <translation>Připojovat se pouze k určeným uzlům; samotné -noconnect nebo -connect=0 zakáží automatické připojování</translation> + </message> + <message> + <source>Distributed under the MIT software license, see the accompanying file %s or %s</source> + <translation>Šířen pod softwarovou licencí MIT, viz přiložený soubor %s nebo %s</translation> + </message> + <message> <source>If <category> is not supplied or if <category> = 1, output all debugging information.</source> <translation>Pokud není <category> zadána nebo je <category> = 1, bude tisknout veškeré ladicí informace.</translation> </message> @@ -1627,10 +3034,6 @@ <translation>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ý řetězec bloků)</translation> </message> <message> - <source>Reduce storage requirements by pruning (deleting) old blocks. This mode is incompatible with -txindex and -rescan. Warning: Reverting this setting requires re-downloading the entire blockchain. (default: 0 = disable pruning blocks, >%u = target size in MiB to use for block files)</source> - <translation>Omezit nároky na úložný prostor prořezáváním (mazáním) starých bloků. Tento režim není slučitelný s -txindex ani -rescan. Upozornění: opětovná změna tohoto nastavení bude vyžadovat nové stažení celého řetězce bloků. (výchozí: 0 = bloky neprořezávat, >%u = cílová velikost souborů s bloky, v MiB)</translation> - </message> - <message> <source>Rescans are not possible in pruned mode. You will need to use -reindex which will download the whole blockchain again.</source> <translation>V prořezávacím režimu není možné přeskenovávat řetězec bloků. Musíš provést -reindex, což znovu stáhne celý řetězec bloků.</translation> </message> @@ -1655,16 +3058,12 @@ <translation>Nemohu spustit HTTP server. Detaily viz v debug.log.</translation> </message> <message> - <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> - <translation>Přijímat spojení zvenčí (výchozí: 1, pokud není zadáno -proxy nebo -connect)</translation> - </message> - <message> <source>Bitcoin Core</source> <translation>Bitcoin Core</translation> </message> <message> - <source>-fallbackfee is set very high! This is the transaction fee you may pay when fee estimates are not available.</source> - <translation>-fallbackfee je nastaveno velmi vysoko! Toto je transakční poplatek, který bys platil, pokud nebude k dispozici odhad poplatků.</translation> + <source>The %s developers</source> + <translation>Vývojáři %s</translation> </message> <message> <source>A fee rate (in %s/kB) that will be used when fee estimation has insufficient data (default: %s)</source> @@ -1679,20 +3078,56 @@ <translation>Poslouchat na zadané adrese. Pro zápis IPv6 adresy použij notaci [adresa]:port</translation> </message> <message> + <source>Cannot obtain a lock on data directory %s. %s is probably already running.</source> + <translation>Nedaří se mi získat zámek na datový adresář %s. %s pravděpodobně už jednou běží.</translation> + </message> + <message> <source>Delete all wallet transactions and only recover those parts of the blockchain through -rescan on startup</source> <translation>Smazat všechny transakce peněženky a při startu obnovit pouze relevantní části řetězce bloků pomocí -rescan</translation> </message> <message> - <source>Distributed under the MIT software license, see the accompanying file COPYING or <http://www.opensource.org/licenses/mit-license.php>.</source> - <translation>Šířen pod softwarovou licencí MIT, viz přiložený soubor COPYING nebo <http://www.opensource.org/licenses/mit-license.php>.</translation> + <source>Error loading %s: You can't enable HD on a already existing non-HD wallet</source> + <translation>Chyba při načítání %s: nemůžeš zapnout HD u existující ne-HD peněženky</translation> + </message> + <message> + <source>Error reading %s! All keys read correctly, but transaction data or address book entries might be missing or incorrect.</source> + <translation>Nastala chyba při čtení souboru %s! Všechny klíče se přečetly správně, ale data o transakcích nebo záznamy v adresáři mohou chybět či být nesprávné.</translation> </message> <message> <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source> <translation>Spustit příkaz, když se objeví transakce týkající se peněženky (%s se v příkazu nahradí za TxID)</translation> </message> <message> - <source>Force relay of transactions from whitelisted peers even they violate local relay policy (default: %d)</source> - <translation>Vynutit přeposílání transakcí od vždy vítaných protějšků (tj. těch na bílé listině), i když porušují místní zásady pro přeposílání (výchozí: %d)</translation> + <source>Extra transactions to keep in memory for compact block reconstructions (default: %u)</source> + <translation>Počet extra transakcí, které se mají držet v paměti pro účely rekonstrukce kompaktních bloků (výchozí: %u)</translation> + </message> + <message> + <source>If this block is in the chain assume that it and its ancestors are valid and potentially skip their script verification (0 to verify all, default: %s, testnet: %s)</source> + <translation>Pokud je tenhle blok v řetězci, tak předpokládat, že on i jeho následníci jsou platní, a potenciálně přeskočit ověřování jejich skriptů (0 = ověřovat vše, výchozí: %s, testnet: %s)</translation> + </message> + <message> + <source>Maximum allowed median peer time offset adjustment. Local perspective of time may be influenced by peers forward or backward by this amount. (default: %u seconds)</source> + <translation>Maximální povolené seřizování času mediánem časů protějšků. Místní vnímání času může být ovlivněno protějšky, a to dopředu nebo dozadu až o toto množství. (výchozí: %u vteřin)</translation> + </message> + <message> + <source>Maximum total fees (in %s) to use in a single wallet transaction or raw transaction; setting this too low may abort large transactions (default: %s)</source> + <translation>Horní hranice pro celkový poplatek (v %s) za jednu transakci z peněženky nebo jednu surovou transakci; příliš nízká hodnota může zmařit velké transakce (výchozí: %s)</translation> + </message> + <message> + <source>Please check that your computer's date and time are correct! If your clock is wrong, %s will not work properly.</source> + <translation>Zkontroluj, že máš v počítači správně nastavený datum a čas! Pokud jsou nastaveny špatně, %s nebude fungovat správně.</translation> + </message> + <message> + <source>Please contribute if you find %s useful. Visit %s for further information about the software.</source> + <translation>Prosíme, zapoj se nebo přispěj, pokud ti %s přijde užitečný. Více informací o programu je na %s.</translation> + </message> + <message> + <source>Reduce storage requirements by enabling pruning (deleting) of old blocks. This allows the pruneblockchain RPC to be called to delete specific blocks, and enables automatic pruning of old blocks if a target size in MiB is provided. This mode is incompatible with -txindex and -rescan. Warning: Reverting this setting requires re-downloading the entire blockchain. (default: 0 = disable pruning blocks, 1 = allow manual pruning via RPC, >%u = automatically prune block files to stay under the specified target size in MiB)</source> + <translation>Omezit nároky na úložný prostor prořezáváním (mazáním) starých bloků. Tato volba také umožní použít RPC volání pruneblockchain ke smazání konkrétních bloků a dále automatické prořezávání starých bloků, pokud je zadána cílová velikost souborů s bloky v MiB. Tento režim není slučitelný s -txindex ani -rescan. Upozornění: opětovná změna tohoto nastavení bude vyžadovat nové stažení celého řetězce bloků. (výchozí: 0 = bloky neprořezávat, 1 = povolit ruční prořezávání skrze RPC, >%u = automatické prořezávání bloků tak, aby byla udržena cílová velikost souborů s bloky, v MiB)</translation> + </message> + <message> + <source>Set lowest fee rate (in %s/kB) for transactions to be included in block creation. (default: %s)</source> + <translation>Nastavit nejnižší akceptovatelný poplatek (v %s/kB) pro transakce, které mají být zahrnuty do nových bloků. (výchozí: %s)</translation> </message> <message> <source>Set the number of script verification threads (%u to %d, 0 = auto, <0 = leave that many cores free, default: %d)</source> @@ -1707,10 +3142,22 @@ <translation>Tohle je testovací verze – používej ji jen na vlastní riziko, ale rozhodně ji nepoužívej k těžbě nebo pro obchodní aplikace</translation> </message> <message> + <source>Unable to rewind the database to a pre-fork state. You will need to redownload the blockchain</source> + <translation>Nedaří se mi vrátit databázi do stavu před štěpem. Budeš muset znovu stáhnout celý řetězec bloků</translation> + </message> + <message> <source>Use UPnP to map the listening port (default: 1 when listening and no -proxy)</source> <translation>Použít UPnP k namapování naslouchacího portu (výchozí: 1, pokud naslouchá a nepoužívá -proxy)</translation> </message> <message> + <source>Username and hashed password for JSON-RPC connections. The field <userpw> comes in the format: <USERNAME>:<SALT>$<HASH>. A canonical python script is included in share/rpcuser. The client then connects normally using the rpcuser=<USERNAME>/rpcpassword=<PASSWORD> pair of arguments. This option can be specified multiple times</source> + <translation>Uživatelské jméno a zahašované heslo pro JSON-RPC spojení. Pole <userpw> má formát: <UŽIVATELSKÉ_JMÉNO>:<SŮL>$<HAŠ>. Pomocný pythonní skript je přiložen v share/rpcuser. Klient se pak už připojuje normálně pomocí páru argumentů rpcuser=<UŽIVATELSKÉ_JMÉNO>/rpcpassword=<HESLO>. Tuto volbu lze použít i vícekrát</translation> + </message> + <message> + <source>Wallet will not create transactions that violate mempool chain limits (default: %u)</source> + <translation>Peněženka nebude vytvářet transakce, které by porušovaly limity transakčního zásobníku na řetězce (výchozí: %u)</translation> + </message> + <message> <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source> <translation>Upozornění: Síť podle všeho není v konzistentním stavu. Někteří těžaři jsou zřejmě v potížích.</translation> </message> @@ -1719,8 +3166,12 @@ <translation>Upozornění: Nesouhlasím zcela se svými protějšky! Možná potřebuji aktualizovat nebo ostatní uzly potřebují aktualizovat.</translation> </message> <message> - <source>Whitelist peers connecting from the given netmask or IP address. Can be specified multiple times.</source> - <translation>Vždy vítat protějšky připojující se z dané podsítě či IP adresy. Lze zadat i vícekrát.</translation> + <source>You need to rebuild the database using -reindex-chainstate to change -txindex</source> + <translation>Je třeba přestavět databázi použitím -reindex-chainstate, aby bylo možné změnit -txindex</translation> + </message> + <message> + <source>%s corrupt, salvage failed</source> + <translation>%s je poškozen, jeho záchrana se nezdařila</translation> </message> <message> <source>-maxmempool must be at least %d MB</source> @@ -1735,18 +3186,34 @@ <translation>Připojit komentář k typu klienta</translation> </message> <message> + <source>Attempt to recover private keys from a corrupt wallet on startup</source> + <translation>Pokusit se při startu zachránit soukromé klíče z poškozeného souboru s klíči</translation> + </message> + <message> <source>Block creation options:</source> <translation>Možnosti vytváření bloku:</translation> </message> <message> - <source>Connect only to the specified node(s)</source> - <translation>Připojit se pouze k zadanému uzlu (příp. zadaným uzlům)</translation> + <source>Cannot resolve -%s address: '%s'</source> + <translation>Nemohu přeložit -%s adresu: '%s'</translation> + </message> + <message> + <source>Chain selection options:</source> + <translation>Možnosti výběru řetězce:</translation> + </message> + <message> + <source>Change index out of range</source> + <translation>Index drobných je mimo platný rozsah</translation> </message> <message> <source>Connection options:</source> <translation>Možnosti připojení:</translation> </message> <message> + <source>Copyright (C) %i-%i</source> + <translation>Copyright (C) %i–%i</translation> + </message> + <message> <source>Corrupted block database detected</source> <translation>Bylo zjištěno poškození databáze bloků</translation> </message> @@ -1763,6 +3230,26 @@ <translation>Chceš přestavět databázi bloků hned teď?</translation> </message> <message> + <source>Enable publish hash block in <address></source> + <translation>Zapnout oznamování hashů bloků na adrese <address></translation> + </message> + <message> + <source>Enable publish hash transaction in <address></source> + <translation>Zapnout oznamování hashů transakcí na adrese <address></translation> + </message> + <message> + <source>Enable publish raw block in <address></source> + <translation>Zapnout oznamování surových bloků na adrese <address></translation> + </message> + <message> + <source>Enable publish raw transaction in <address></source> + <translation>Zapnout oznamování surových transakcí na adrese <address></translation> + </message> + <message> + <source>Enable transaction replacement in the memory pool (default: %u)</source> + <translation>Povolit výměnu transakcí v transakčním zásobníku (výchozí: %u)</translation> + </message> + <message> <source>Error initializing block database</source> <translation>Chyba při zakládání databáze bloků</translation> </message> @@ -1771,6 +3258,22 @@ <translation>Chyba při vytváření databázového prostředí %s pro peněženku!</translation> </message> <message> + <source>Error loading %s</source> + <translation>Chyba při načítání %s</translation> + </message> + <message> + <source>Error loading %s: Wallet corrupted</source> + <translation>Chyba při načítání %s: peněženka je poškozená</translation> + </message> + <message> + <source>Error loading %s: Wallet requires newer version of %s</source> + <translation>Chyba při načítání %s: peněženka vyžaduje novější verzi %s</translation> + </message> + <message> + <source>Error loading %s: You can't disable HD on a already existing HD wallet</source> + <translation>Chyba při načítání %s: nemůžeš vypnout HD u existující HD peněženky</translation> + </message> + <message> <source>Error loading block database</source> <translation>Chyba při načítání databáze bloků</translation> </message> @@ -1795,10 +3298,18 @@ <translation>Nemám žádný nebo jen špatný genesis blok. Není špatně nastavený datadir?</translation> </message> <message> + <source>Initialization sanity check failed. %s is shutting down.</source> + <translation>Selhala úvodní zevrubná prověrka. %s se ukončuje.</translation> + </message> + <message> <source>Invalid -onion address: '%s'</source> <translation>Neplatná -onion adresa: '%s'</translation> </message> <message> + <source>Invalid amount for -%s=<amount>: '%s'</source> + <translation>Neplatná částka pro -%s=<částka>: '%s'</translation> + </message> + <message> <source>Invalid amount for -fallbackfee=<amount>: '%s'</source> <translation>Neplatná částka pro -fallbackfee=<částka>: '%s'</translation> </message> @@ -1807,12 +3318,12 @@ <translation>Udržovat zasobník transakcí menší než <n> megabajtů (výchozí: %u)</translation> </message> <message> - <source>Location of the auth cookie (default: data dir)</source> - <translation>Místo pro autentizační cookie (výchozí: adresář pro data)</translation> + <source>Loading banlist...</source> + <translation>Načítám seznam klateb...</translation> </message> <message> - <source>Minimum bytes per sigop in transactions we relay and mine (default: %u)</source> - <translation>Minimální počet bajtů na každý sigop v transakcích, které přeposíláme a těžíme (výchozí: %u)</translation> + <source>Location of the auth cookie (default: data dir)</source> + <translation>Místo pro autentizační cookie (výchozí: adresář pro data)</translation> </message> <message> <source>Not enough file descriptors available.</source> @@ -1823,6 +3334,10 @@ <translation>Připojovat se pouze k uzlům v <net> síti (ipv4, ipv6 nebo onion)</translation> </message> <message> + <source>Print this help message and exit</source> + <translation>Vypsat tuto nápovědu a skončit</translation> + </message> + <message> <source>Print version and exit</source> <translation>Vypsat verzi a skončit</translation> </message> @@ -1835,6 +3350,18 @@ <translation>Prořezávací režim není kompatibilní s -txindex.</translation> </message> <message> + <source>Rebuild chain state and block index from the blk*.dat files on disk</source> + <translation>Při startu znovu vytvořit index řetězce bloků z aktuálních blk*.dat souborů</translation> + </message> + <message> + <source>Rebuild chain state from the currently indexed blocks</source> + <translation>Znovu vytvořit stav řetězce bloků z aktuálně indexovaných bloků</translation> + </message> + <message> + <source>Rewinding blocks...</source> + <translation>Vracím bloky…</translation> + </message> + <message> <source>Set database cache size in megabytes (%d to %d, default: %d)</source> <translation>Nastavit velikost databázové vyrovnávací paměti v megabajtech (%d až %d, výchozí: %d)</translation> </message> @@ -1847,6 +3374,14 @@ <translation>Udej název souboru s peněženkou (v rámci datového adresáře)</translation> </message> <message> + <source>The source code is available from %s.</source> + <translation>Zdrojový kód je dostupný na %s.</translation> + </message> + <message> + <source>Unable to bind to %s on this computer. %s is probably already running.</source> + <translation>Nedaří se mi připojit na %s na tomhle počítači. %s už pravděpodobně jednou běží.</translation> + </message> + <message> <source>Unsupported argument -benchmark ignored, use -debug=bench.</source> <translation>Nepodporovaný argument -benchmark se ignoruje, použij -debug=bench.</translation> </message> @@ -1863,22 +3398,34 @@ <translation>Použít UPnP k namapování naslouchacího portu (výchozí: %u)</translation> </message> <message> + <source>Use the test chain</source> + <translation>Použít testovací řetězec</translation> + </message> + <message> <source>User Agent comment (%s) contains unsafe characters.</source> <translation>Komentář u typu klienta (%s) obsahuje riskantní znaky.</translation> </message> <message> <source>Verifying blocks...</source> - <translation>Ověřuji bloky...</translation> + <translation>Ověřuji bloky…</translation> </message> <message> <source>Verifying wallet...</source> - <translation>Kontroluji peněženku...</translation> + <translation>Kontroluji peněženku…</translation> </message> <message> <source>Wallet %s resides outside data directory %s</source> <translation>Peněženka %s se nachází mimo datový adresář %s</translation> </message> <message> + <source>Wallet debugging/testing options:</source> + <translation>Možnosti ladění/testování peněženky:</translation> + </message> + <message> + <source>Wallet needed to be rewritten: restart %s to complete</source> + <translation>Soubor s peněženkou potřeboval přepsat: restartuj %s, aby se operace dokončila</translation> + </message> + <message> <source>Wallet options:</source> <translation>Možnosti peněženky:</translation> </message> @@ -1927,10 +3474,6 @@ <translation>Maximální velikost dat v transakcích nesoucích data, se kterou jsme ochotni je ještě přeposílat a těžit (výchozí: %u)</translation> </message> <message> - <source>Query for peer addresses via DNS lookup, if low on addresses (default: 1 unless -connect)</source> - <translation>Při nedostatku adres získat další protějšky z DNS (výchozí: 1, pokud není použito -connect)</translation> - </message> - <message> <source>Randomize credentials for every proxy connection. This enables Tor stream isolation (default: %u)</source> <translation>Použít náhodné údaje pro každé proxy spojení. To umožní izolovat nesouvisející datové toky v Toru (výchozí: %u)</translation> </message> @@ -1943,8 +3486,8 @@ <translation>Částka v transakci po odečtení poplatku je příliš malá na odeslání</translation> </message> <message> - <source>This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit <https://www.openssl.org/> and cryptographic software written by Eric Young and UPnP software written by Thomas Bernard.</source> - <translation>Tento produkt zahrnuje programy vyvinuté OpenSSL Projektem pro použití v OpenSSL Toolkitu <https://www.openssl.org/> a kryptografický program od Erika Younga a program UPnP od Thomase Bernarda.</translation> + <source>Use hierarchical deterministic key generation (HD) after BIP32. Only has effect during wallet creation/first start</source> + <translation>Použít hierarchické deterministické generování klíčů (HD) podle BIP32. Má vliv pouze během vytváření peněženky/prvního startu</translation> </message> <message> <source>Whitelisted peers cannot be DoS banned and their transactions are always relayed, even if they are already in the mempool, useful e.g. for a gateway</source> @@ -2055,10 +3598,6 @@ <translation>Částka v transakci je příliš malá</translation> </message> <message> - <source>Transaction amounts must be positive</source> - <translation>Částky v transakci musí být kladné</translation> - </message> - <message> <source>Transaction too large for fee policy</source> <translation>Transakce je na poplatkovou politiku příliš velká</translation> </message> @@ -2083,6 +3622,10 @@ <translation>Upozornění</translation> </message> <message> + <source>Warning: unknown new rules activated (versionbit %i)</source> + <translation>Upozornění: aktivována neznámá nová pravidla (verzový bit %i)</translation> + </message> + <message> <source>Whether to operate in a blocks only mode (default: %u)</source> <translation>Zda fungovat v čistě blokovém režimu (výchozí: %u)</translation> </message> @@ -2092,7 +3635,7 @@ </message> <message> <source>ZeroMQ notification options:</source> - <translation>Možnosti ZeroMQ oznámení:</translation> + <translation>Možnosti ZeroMQ oznamování:</translation> </message> <message> <source>Password for JSON-RPC connections</source> @@ -2119,18 +3662,22 @@ <translation>-maxtxfee je nastaveno velmi vysoko! Takto vysoký poplatek může být zaplacen v jednotlivé transakci.</translation> </message> <message> - <source>-paytxfee is set very high! This is the transaction fee you will pay if you send a transaction.</source> - <translation>-paytxfee je nastaveno velmi vysoko! Toto je transakční poplatek, který zaplatíš za každou poslanou transakci.</translation> - </message> - <message> <source>Do not keep transactions in the mempool longer than <n> hours (default: %u)</source> <translation>Nedržet transakce v zásobníku déle než <n> hodin (výchozí: %u)</translation> </message> <message> + <source>Equivalent bytes per sigop in transactions for relay and mining (default: %u)</source> + <translation>Ekvivalent bajtů za každý sigop v transakcích – pro účely přeposílání a těžení (výchozí: %u)</translation> + </message> + <message> <source>Fees (in %s/kB) smaller than this are considered zero fee for transaction creation (default: %s)</source> <translation>Poplatky (v %s/kB) menší než tato hodnota jsou považovány za nulové pro účely vytváření transakcí (výchozí: %s)</translation> </message> <message> + <source>Force relay of transactions from whitelisted peers even if they violate local relay policy (default: %d)</source> + <translation>Vynutit přeposílání transakcí od vždy vítaných protějšků (tj. těch na bílé listině), i když porušují místní zásady pro přeposílání (výchozí: %d)</translation> + </message> + <message> <source>How thorough the block verification of -checkblocks is (0-4, default: %u)</source> <translation>Jak moc důkladná má být verifikace bloků -checkblocks (0-4, výchozí: %u)</translation> </message> @@ -2147,10 +3694,26 @@ <translation>Tisknout ladicí informace (výchozí: %u, zadání <category> je volitelné)</translation> </message> <message> + <source>Query for peer addresses via DNS lookup, if low on addresses (default: 1 unless -connect/-noconnect)</source> + <translation>Při nedostatku adres získat další protějšky z DNS (výchozí: 1, pokud není použito -connect/-noconnect)</translation> + </message> + <message> + <source>Sets the serialization of raw transaction or block hex returned in non-verbose mode, non-segwit(0) or segwit(1) (default: %d)</source> + <translation>Nastaví serializaci surových transakcí nebo bloků, jak jsou vraceny v méně povídavém módu: ne-segwit (0) nebo segwit (1) (výchozí: %d)</translation> + </message> + <message> <source>Support filtering of blocks and transaction with bloom filters (default: %u)</source> <translation>Umožnit filtrování bloků a transakcí pomocí Bloomova filtru (výchozí: %u)</translation> </message> <message> + <source>This is the transaction fee you may pay when fee estimates are not available.</source> + <translation>Toto je transakční poplatek, který se platí, pokud náhodou není k dispozici odhad poplatků.</translation> + </message> + <message> + <source>This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit %s and cryptographic software written by Eric Young and UPnP software written by Thomas Bernard.</source> + <translation>Tento produkt zahrnuje programy vyvinuté OpenSSL Projektem pro použití v OpenSSL Toolkitu %s a kryptografický program od Erika Younga a program UPnP od Thomase Bernarda.</translation> + </message> + <message> <source>Total length of network version string (%i) exceeds maximum length (%i). Reduce the number or size of uacomments.</source> <translation>Celková délka síťového identifikačního řetězce (%i) překročila svůj horní limit (%i). Omez počet nebo velikost voleb uacomment.</translation> </message> @@ -2171,8 +3734,20 @@ <translation>Použít samostatnou SOCKS5 proxy ke spojení s protějšky přes skryté služby v Toru (výchozí: %s)</translation> </message> <message> - <source>Username and hashed password for JSON-RPC connections. The field <userpw> comes in the format: <USERNAME>:<SALT>$<HASH>. A canonical python script is included in share/rpcuser. This option can be specified multiple times</source> - <translation>Uživatelské jméno a zahašované heslo pro JSON-RPC spojení. Pole <userpw> má formát: <UŽIVATELSKÉ_JMÉNO>:<SŮL>$<HAŠ>. Pomocný pythonní skript je přiložen v share/rpcuser. Tuto volbu lze použít i vícekrát</translation> + <source>Warning: Unknown block versions being mined! It's possible unknown rules are in effect</source> + <translation>Upozornění: Síť těží neznámé verze bloků! Je možné, že jsou v platnosti neznámá pravidla</translation> + </message> + <message> + <source>Warning: Wallet file corrupt, data salvaged! Original %s saved as %s in %s; if your balance or transactions are incorrect you should restore from a backup.</source> + <translation>Upozornění: soubor s peněženkou je poškozený, data jsou však zachráněna! Původní soubor %s je uložený jako %s v %s. Pokud nejsou stav tvého účtu nebo transakce v pořádku, zřejmě bys měl obnovit zálohu.</translation> + </message> + <message> + <source>Whitelist peers connecting from the given IP address (e.g. 1.2.3.4) or CIDR notated network (e.g. 1.2.3.0/24). Can be specified multiple times.</source> + <translation>Vždy vítat protějšky připojující se z dané IP adresy (např. 1.2.3.4) či podsítě (CIDR zápis, např. 1.2.3.0/24). Lze zadat i vícekrát.</translation> + </message> + <message> + <source>%s is set very high!</source> + <translation>%s je nastaveno velmi vysoko!</translation> </message> <message> <source>(default: %s)</source> @@ -2195,6 +3770,10 @@ <translation>Neplatná -proxy adresa: '%s'</translation> </message> <message> + <source>Keypool ran out, please call keypoolrefill first</source> + <translation>Vyčerpal se zásobník klíčů, zavolej prvně, prosím, keypoolrefill</translation> + </message> + <message> <source>Listen for JSON-RPC connections on <port> (default: %u or testnet: %u)</source> <translation>Čekat na JSON-RPC spojení na <portu> (výchozí: %u nebo testnet: %u)</translation> </message> @@ -2231,12 +3810,16 @@ <translation>Přeposílat ne-P2SH multisig (výchozí: %u)</translation> </message> <message> + <source>Send transactions with full-RBF opt-in enabled (default: %u)</source> + <translation>Posílat transakce se zapnutým plným RBF (= replace-by-fee) (výchozí: %u)</translation> + </message> + <message> <source>Set key pool size to <n> (default: %u)</source> <translation>Nastavit zásobník klíčů na velikost <n> (výchozí: %u)</translation> </message> <message> - <source>Set minimum block size in bytes (default: %u)</source> - <translation>Nastavit minimální velikost bloku v bajtech (výchozí: %u)</translation> + <source>Set maximum BIP141 block weight (default: %d)</source> + <translation>Nastavit maximální váhu bloku pro BIP141 (výchozí: %d)</translation> </message> <message> <source>Set the number of threads to service RPC calls (default: %d)</source> @@ -2255,10 +3838,38 @@ <translation>Utrácet i ještě nepotvrzené drobné při posílání transakcí (výchozí: %u)</translation> </message> <message> + <source>Starting network threads...</source> + <translation>Spouštím síťová vlákna…</translation> + </message> + <message> + <source>The wallet will avoid paying less than the minimum relay fee.</source> + <translation>Peněženka zaručí přiložení poplatku alespoň ve výši minima pro přenos transakce.</translation> + </message> + <message> + <source>This is the minimum transaction fee you pay on every transaction.</source> + <translation>Toto je minimální poplatek, který zaplatíš za každou transakci.</translation> + </message> + <message> + <source>This is the transaction fee you will pay if you send a transaction.</source> + <translation>Toto je poplatek, který zaplatíš za každou poslanou transakci.</translation> + </message> + <message> <source>Threshold for disconnecting misbehaving peers (default: %u)</source> <translation>Práh pro odpojování zlobivých protějšků (výchozí: %u)</translation> </message> <message> + <source>Transaction amounts must not be negative</source> + <translation>Částky v transakci nemohou být záporné</translation> + </message> + <message> + <source>Transaction has too long of a mempool chain</source> + <translation>Transakce má v transakčním zásobníku příliš dlouhý řetězec</translation> + </message> + <message> + <source>Transaction must have at least one recipient</source> + <translation>Transakce musí mít alespoň jednoho příjemce</translation> + </message> + <message> <source>Unknown network specified in -onlynet: '%s'</source> <translation>V -onlynet byla uvedena neznámá síť: '%s'</translation> </message> @@ -2288,7 +3899,7 @@ </message> <message> <source>Rescanning...</source> - <translation>Přeskenovávám...</translation> + <translation>Přeskenovávám…</translation> </message> <message> <source>Done loading</source> diff --git a/src/qt/locale/bitcoin_cs_CZ.ts b/src/qt/locale/bitcoin_cs_CZ.ts deleted file mode 100644 index 70aa981f50..0000000000 --- a/src/qt/locale/bitcoin_cs_CZ.ts +++ /dev/null @@ -1,300 +0,0 @@ -<TS language="cs_CZ" version="2.1"> -<context> - <name>AddressBookPage</name> - <message> - <source>Right-click to edit address or label</source> - <translation>Pravým klikem editujte adresu nebo popisek</translation> - </message> - <message> - <source>Create a new address</source> - <translation>Vytvořit novou adresu</translation> - </message> - <message> - <source>Copy the currently selected address to the system clipboard</source> - <translation>Kopírovat aktuálně vybrané adresy do schránky</translation> - </message> - <message> - <source>Delete the currently selected address from the list</source> - <translation>Odstraní aktuálně vybrané adresy ze seznamu</translation> - </message> - <message> - <source>Export the data in the current tab to a file</source> - <translation>Exportovat aktuální pohled do souboru</translation> - </message> - <message> - <source>&Export</source> - <translation>&Exportovat</translation> - </message> - <message> - <source>&Delete</source> - <translation>&Odstranit</translation> - </message> -</context> -<context> - <name>AskPassphraseDialog</name> - <message> - <source>Enter passphrase</source> - <translation>Zadej heslo</translation> - </message> - <message> - <source>New passphrase</source> - <translation>Nové heslo</translation> - </message> - <message> - <source>Repeat new passphrase</source> - <translation>Zopakujte nové heslo</translation> - </message> -</context> -<context> - <name>BanTableModel</name> - </context> -<context> - <name>BitcoinGUI</name> - <message> - <source>Synchronizing with network...</source> - <translation>Synchronizuji se sítí...</translation> - </message> - <message> - <source>&Overview</source> - <translation>&Přehled</translation> - </message> - <message> - <source>Show general overview of wallet</source> - <translation>Zobrazit základní přehled o peněžence</translation> - </message> - <message> - <source>&Transactions</source> - <translation>&Transakce</translation> - </message> - <message> - <source>Browse transaction history</source> - <translation>Procházení historií transakcí</translation> - </message> - <message> - <source>Quit application</source> - <translation>Ukončit aplikaci</translation> - </message> - <message> - <source>&Options...</source> - <translation>&Možnosti...</translation> - </message> - <message> - <source>Change the passphrase used for wallet encryption</source> - <translation>Změnit heslo k šifrování peněženky</translation> - </message> - <message> - <source>Bitcoin</source> - <translation>Bitcoin</translation> - </message> - <message> - <source>&File</source> - <translation>&Soubor</translation> - </message> - <message> - <source>&Settings</source> - <translation>&Nastavení</translation> - </message> - <message> - <source>&Help</source> - <translation>Nápo&věda</translation> - </message> - <message> - <source>Tabs toolbar</source> - <translation>Panely</translation> - </message> - <message> - <source>Up to date</source> - <translation>Aktuální</translation> - </message> - <message> - <source>Catching up...</source> - <translation>Zachytávám...</translation> - </message> - <message> - <source>Sent transaction</source> - <translation>Odeslané transakce</translation> - </message> - <message> - <source>Incoming transaction</source> - <translation>Příchozí transakce</translation> - </message> - <message> - <source>Wallet is <b>encrypted</b> and currently <b>unlocked</b></source> - <translation>Peněženka je <b>zašifrována</b> a momentálně <b>odemčená</b></translation> - </message> - <message> - <source>Wallet is <b>encrypted</b> and currently <b>locked</b></source> - <translation>Peněženka je <b>zašifrována</b> a momentálně <b>uzamčená</b></translation> - </message> -</context> -<context> - <name>CoinControlDialog</name> - <message> - <source>Amount:</source> - <translation>Množství:</translation> - </message> - <message> - <source>Amount</source> - <translation>Množství</translation> - </message> - <message> - <source>Date</source> - <translation>Datum</translation> - </message> - <message> - <source>Confirmed</source> - <translation>Potvrzeno</translation> - </message> - </context> -<context> - <name>EditAddressDialog</name> - <message> - <source>Edit Address</source> - <translation>Upravit adresu</translation> - </message> - <message> - <source>&Label</source> - <translation>&Popisek</translation> - </message> - <message> - <source>&Address</source> - <translation>&Adresa</translation> - </message> -</context> -<context> - <name>FreespaceChecker</name> - </context> -<context> - <name>HelpMessageDialog</name> - <message> - <source>Usage:</source> - <translation>Použití:</translation> - </message> - </context> -<context> - <name>Intro</name> - </context> -<context> - <name>OpenURIDialog</name> - </context> -<context> - <name>OptionsDialog</name> - <message> - <source>Options</source> - <translation>Možnosti</translation> - </message> - <message> - <source>Map port using &UPnP</source> - <translation>Mapovat port pomocí &UPnP</translation> - </message> - <message> - <source>&Minimize to the tray instead of the taskbar</source> - <translation>&Minimalizovat do systémové lišty (tray) namísto do hlavního panelu</translation> - </message> - <message> - <source>M&inimize on close</source> - <translation>M&inimalizovat při zavření</translation> - </message> - </context> -<context> - <name>OverviewPage</name> - </context> -<context> - <name>PeerTableModel</name> - </context> -<context> - <name>QObject</name> - <message> - <source>Amount</source> - <translation>Množství</translation> - </message> - </context> -<context> - <name>RPCConsole</name> - <message> - <source>Name</source> - <translation>Jméno</translation> - </message> - </context> -<context> - <name>ReceiveCoinsDialog</name> - <message> - <source>&Label:</source> - <translation>&Popisek:</translation> - </message> - <message> - <source>&Message:</source> - <translation>Zpráva:</translation> - </message> - </context> -<context> - <name>ReceiveRequestDialog</name> - </context> -<context> - <name>SendCoinsDialog</name> - <message> - <source>Amount:</source> - <translation>Množství:</translation> - </message> - <message> - <source>Balance:</source> - <translation>Zůstatek:</translation> - </message> - </context> -<context> - <name>SendCoinsEntry</name> - <message> - <source>&Label:</source> - <translation>&Popisek:</translation> - </message> - <message> - <source>Message:</source> - <translation>Zpráva:</translation> - </message> - </context> -<context> - <name>ShutdownWindow</name> - </context> -<context> - <name>SignVerifyMessageDialog</name> - </context> -<context> - <name>SplashScreen</name> - <message> - <source>[testnet]</source> - <translation>[testnet]</translation> - </message> -</context> -<context> - <name>TrafficGraphWidget</name> - </context> -<context> - <name>TransactionDescDialog</name> - <message> - <source>This pane shows a detailed description of the transaction</source> - <translation>Toto podokno zobrazuje detailní popis transakce</translation> - </message> -</context> -<context> - <name>UnitDisplayStatusBarControl</name> - </context> -<context> - <name>bitcoin-core</name> - <message> - <source>Options:</source> - <translation>Možnosti:</translation> - </message> - <message> - <source>Loading addresses...</source> - <translation>Načítání adres...</translation> - </message> - <message> - <source>Loading wallet...</source> - <translation>Načítání peněženky...</translation> - </message> - <message> - <source>Done loading</source> - <translation>Načítání dokončeno</translation> - </message> - </context> -</TS>
\ No newline at end of file diff --git a/src/qt/locale/bitcoin_cy.ts b/src/qt/locale/bitcoin_cy.ts index 38bc45775b..9f2d87b606 100644 --- a/src/qt/locale/bitcoin_cy.ts +++ b/src/qt/locale/bitcoin_cy.ts @@ -29,7 +29,10 @@ <source>&Delete</source> <translation>&Dileu</translation> </message> -</context> + </context> +<context> + <name>AddressTableModel</name> + </context> <context> <name>AskPassphraseDialog</name> <message> @@ -44,7 +47,7 @@ <source>Repeat new passphrase</source> <translation>Ailadroddwch gyfrinymadrodd newydd</translation> </message> -</context> + </context> <context> <name>BanTableModel</name> </context> @@ -146,26 +149,6 @@ <source>Tabs toolbar</source> <translation>Bar offer tabiau</translation> </message> - <message numerus="yes"> - <source>%n hour(s)</source> - <translation><numerusform>%n awr</numerusform><numerusform>%n awr</numerusform><numerusform>%n awr</numerusform><numerusform>%n awr</numerusform></translation> - </message> - <message numerus="yes"> - <source>%n day(s)</source> - <translation><numerusform>%n dydd</numerusform><numerusform>%n dydd</numerusform><numerusform>%n dydd</numerusform><numerusform>%n dydd</numerusform></translation> - </message> - <message numerus="yes"> - <source>%n week(s)</source> - <translation><numerusform>%n wythnos</numerusform><numerusform>%n wythnos</numerusform><numerusform>%n wythnos</numerusform><numerusform>%n wythnos</numerusform></translation> - </message> - <message> - <source>%1 and %2</source> - <translation>%1 a %2</translation> - </message> - <message numerus="yes"> - <source>%n year(s)</source> - <translation><numerusform>%n blwydd</numerusform><numerusform>%n blwydd</numerusform><numerusform>%n blwydd</numerusform><numerusform>%n blwydd</numerusform></translation> - </message> <message> <source>Error</source> <translation>Gwall</translation> @@ -226,7 +209,7 @@ <source>Wallet is <b>encrypted</b> and currently <b>locked</b></source> <translation>Mae'r waled <b>wedi'i amgryptio</b> ac <b>ar glo</b> ar hyn o bryd</translation> </message> -</context> + </context> <context> <name>CoinControlDialog</name> <message> @@ -252,7 +235,7 @@ <source>&Address</source> <translation>&Cyfeiriad</translation> </message> -</context> + </context> <context> <name>FreespaceChecker</name> <message> @@ -279,6 +262,13 @@ </message> </context> <context> + <name>ModalOverlay</name> + <message> + <source>Form</source> + <translation>Ffurflen</translation> + </message> + </context> +<context> <name>OpenURIDialog</name> <message> <source>Open URI</source> @@ -332,10 +322,23 @@ </message> </context> <context> + <name>PaymentServer</name> + </context> +<context> <name>PeerTableModel</name> </context> <context> <name>QObject</name> + <message> + <source>%1 and %2</source> + <translation>%1 a %2</translation> + </message> + </context> +<context> + <name>QObject::QObject</name> + </context> +<context> + <name>QRImageWidget</name> </context> <context> <name>RPCConsole</name> @@ -367,6 +370,9 @@ </message> </context> <context> + <name>RecentRequestsTableModel</name> + </context> +<context> <name>SendCoinsDialog</name> <message> <source>Send Coins</source> @@ -417,6 +423,9 @@ </message> </context> <context> + <name>SendConfirmationDialog</name> + </context> +<context> <name>ShutdownWindow</name> </context> <context> @@ -445,12 +454,30 @@ <name>TrafficGraphWidget</name> </context> <context> + <name>TransactionDesc</name> + </context> +<context> <name>TransactionDescDialog</name> </context> <context> + <name>TransactionTableModel</name> + </context> +<context> + <name>TransactionView</name> + </context> +<context> <name>UnitDisplayStatusBarControl</name> </context> <context> + <name>WalletFrame</name> + </context> +<context> + <name>WalletModel</name> + </context> +<context> + <name>WalletView</name> + </context> +<context> <name>bitcoin-core</name> <message> <source>Options:</source> diff --git a/src/qt/locale/bitcoin_da.ts b/src/qt/locale/bitcoin_da.ts index d298c81bd4..54ef4a2bdf 100644 --- a/src/qt/locale/bitcoin_da.ts +++ b/src/qt/locale/bitcoin_da.ts @@ -41,6 +41,77 @@ <source>&Delete</source> <translation>&Slet</translation> </message> + <message> + <source>Choose the address to send coins to</source> + <translation>Vælg adresse at sende bitcoins til</translation> + </message> + <message> + <source>Choose the address to receive coins with</source> + <translation>Vælg adresse at modtage bitcoins med</translation> + </message> + <message> + <source>C&hoose</source> + <translation>&Vælg</translation> + </message> + <message> + <source>Sending addresses</source> + <translation>Afsendelsesadresser</translation> + </message> + <message> + <source>Receiving addresses</source> + <translation>Modtagelsesadresser</translation> + </message> + <message> + <source>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source> + <translation>Disse er dine Bitcoin-adresser til afsendelse af betalinger. Tjek altid beløb og modtagelsesadresse, inden du sender bitcoins.</translation> + </message> + <message> + <source>These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction.</source> + <translation>Dette er dine Bitcoin-adresser til modtagelse af betalinger. Det anbefales at bruge en ny modtagelsesadresse for hver transaktion.</translation> + </message> + <message> + <source>&Copy Address</source> + <translation>&Kopiér adresse</translation> + </message> + <message> + <source>Copy &Label</source> + <translation>Kopiér &mærkat</translation> + </message> + <message> + <source>&Edit</source> + <translation>&Redigér</translation> + </message> + <message> + <source>Export Address List</source> + <translation>Eksportér adresseliste</translation> + </message> + <message> + <source>Comma separated file (*.csv)</source> + <translation>Kommasepareret fil (*.csv)</translation> + </message> + <message> + <source>Exporting Failed</source> + <translation>Eksport mislykkedes</translation> + </message> + <message> + <source>There was an error trying to save the address list to %1. Please try again.</source> + <translation>Der opstod en fejl under gemning af adresselisten til %1. Prøv venligst igen.</translation> + </message> +</context> +<context> + <name>AddressTableModel</name> + <message> + <source>Label</source> + <translation>Mærkat</translation> + </message> + <message> + <source>Address</source> + <translation>Adresse</translation> + </message> + <message> + <source>(no label)</source> + <translation>(ingen mærkat)</translation> + </message> </context> <context> <name>AskPassphraseDialog</name> @@ -60,6 +131,94 @@ <source>Repeat new passphrase</source> <translation>Gentag ny adgangskode</translation> </message> + <message> + <source>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>.</source> + <translation>Indtast det nye kodeord til tegnebogen.<br/>Brug venligst et kodeord på <b>ti eller flere tilfældige tegn</b> eller <b>otte eller flere ord</b>.</translation> + </message> + <message> + <source>Encrypt wallet</source> + <translation>Kryptér tegnebog</translation> + </message> + <message> + <source>This operation needs your wallet passphrase to unlock the wallet.</source> + <translation>Denne funktion har brug for din tegnebogs adgangskode for at låse tegnebogen op.</translation> + </message> + <message> + <source>Unlock wallet</source> + <translation>Lås tegnebog op</translation> + </message> + <message> + <source>This operation needs your wallet passphrase to decrypt the wallet.</source> + <translation>Denne funktion har brug for din tegnebogs adgangskode for at dekryptere tegnebogen.</translation> + </message> + <message> + <source>Decrypt wallet</source> + <translation>Dekryptér tegnebog</translation> + </message> + <message> + <source>Change passphrase</source> + <translation>Skift adgangskode</translation> + </message> + <message> + <source>Enter the old passphrase and new passphrase to the wallet.</source> + <translation>Indtast den gamle adgangskode og en ny adgangskode til tegnebogen.</translation> + </message> + <message> + <source>Confirm wallet encryption</source> + <translation>Bekræft tegnebogskryptering</translation> + </message> + <message> + <source>Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR BITCOINS</b>!</source> + <translation>Advarsel: Hvis du krypterer din tegnebog og mister din adgangskode, vil du <b>MISTE ALLE DINE BITCOINS</b>!</translation> + </message> + <message> + <source>Are you sure you wish to encrypt your wallet?</source> + <translation>Er du sikker på, at du ønsker at kryptere din tegnebog?</translation> + </message> + <message> + <source>Wallet encrypted</source> + <translation>Tegnebog krypteret</translation> + </message> + <message> + <source>%1 will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your bitcoins from being stolen by malware infecting your computer.</source> + <translation>%1 vil nu lukke for at færdiggøre krypteringsprocessen. Husk at kryptering af din tegnebog kan ikke beskytte dine bitcoin fuldt ud mod at blive stjålet af eventuel malware, der måtte have inficeret din computer.</translation> + </message> + <message> + <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source> + <translation>VIGTIGT: Enhver tidligere sikkerhedskopi, som du har lavet af tegnebogsfilen, bør blive erstattet af den nyligt genererede, krypterede tegnebogsfil. Af sikkerhedsmæssige årsager vil tidligere sikkerhedskopier af den ikke-krypterede tegnebogsfil blive ubrugelige i det øjeblik, du starter med at anvende den nye, krypterede tegnebog.</translation> + </message> + <message> + <source>Wallet encryption failed</source> + <translation>Tegnebogskryptering mislykkedes</translation> + </message> + <message> + <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source> + <translation>Tegnebogskryptering mislykkedes på grund af en intern fejl. Din tegnebog blev ikke krypteret.</translation> + </message> + <message> + <source>The supplied passphrases do not match.</source> + <translation>De angivne adgangskoder stemmer ikke overens.</translation> + </message> + <message> + <source>Wallet unlock failed</source> + <translation>Tegnebogsoplåsning mislykkedes</translation> + </message> + <message> + <source>The passphrase entered for the wallet decryption was incorrect.</source> + <translation>Den angivne adgangskode for tegnebogsdekrypteringen er forkert.</translation> + </message> + <message> + <source>Wallet decryption failed</source> + <translation>Tegnebogsdekryptering mislykkedes</translation> + </message> + <message> + <source>Wallet passphrase was successfully changed.</source> + <translation>Tegnebogens adgangskode blev ændret.</translation> + </message> + <message> + <source>Warning: The Caps Lock key is on!</source> + <translation>Advarsel: Caps Lock-tasten er aktiveret!</translation> + </message> </context> <context> <name>BanTableModel</name> @@ -76,7 +235,7 @@ <name>BitcoinGUI</name> <message> <source>Sign &message...</source> - <translation>Underskriv &besked…</translation> + <translation>Signér &besked…</translation> </message> <message> <source>Synchronizing with network...</source> @@ -159,6 +318,22 @@ <translation>&Åbn URI…</translation> </message> <message> + <source>Click to disable network activity.</source> + <translation>Klik for at deaktivere netværksaktivitet.</translation> + </message> + <message> + <source>Network activity disabled.</source> + <translation>Netværksaktivitet deaktiveret.</translation> + </message> + <message> + <source>Click to enable network activity again.</source> + <translation>Klik for a aktivere netværksaktivitet igen.</translation> + </message> + <message> + <source>Syncing Headers (%1%)...</source> + <translation>Synkroniserer hoveder (%1%)…</translation> + </message> + <message> <source>Reindexing blocks on disk...</source> <translation>Genindekserer blokke på disken…</translation> </message> @@ -216,11 +391,11 @@ </message> <message> <source>Sign messages with your Bitcoin addresses to prove you own them</source> - <translation>Underskriv beskeder med dine Bitcoin-adresser for at bevise, at de tilhører dig</translation> + <translation>Signér beskeder med dine Bitcoin-adresser for at bevise, at de tilhører dig</translation> </message> <message> <source>Verify messages to ensure they were signed with specified Bitcoin addresses</source> - <translation>Verificér beskeder for at sikre, at de er underskrevet med de angivne Bitcoin-adresser</translation> + <translation>Verificér beskeder for at sikre, at de er signeret med de angivne Bitcoin-adresser</translation> </message> <message> <source>&File</source> @@ -240,7 +415,7 @@ </message> <message> <source>Request payments (generates QR codes and bitcoin: URIs)</source> - <translation>Anmod om betalinger (genererer QR-koder og "bitcoin:"-URI'er)</translation> + <translation>Anmod om betalinger (genererer QR-koder og “bitcoin:”-URI'er)</translation> </message> <message> <source>Show the list of used sending addresses and labels</source> @@ -252,7 +427,7 @@ </message> <message> <source>Open a bitcoin: URI or payment request</source> - <translation>Åbn en "bitcoin:"-URI eller betalingsanmodning</translation> + <translation>Åbn en “bitcoin:”-URI eller betalingsanmodning</translation> </message> <message> <source>&Command-line options</source> @@ -270,34 +445,10 @@ <source>Processing blocks on disk...</source> <translation>Bearbejder blokke på disken…</translation> </message> - <message> - <source>No block source available...</source> - <translation>Ingen blokkilde tilgængelig…</translation> - </message> <message numerus="yes"> <source>Processed %n block(s) of transaction history.</source> <translation><numerusform>Bearbejdede %n blok med transaktionshistorik.</numerusform><numerusform>Bearbejdede %n blokke med transaktionshistorik.</numerusform></translation> </message> - <message numerus="yes"> - <source>%n hour(s)</source> - <translation><numerusform>%n time</numerusform><numerusform>%n timer</numerusform></translation> - </message> - <message numerus="yes"> - <source>%n day(s)</source> - <translation><numerusform>%n dag</numerusform><numerusform>%n dage</numerusform></translation> - </message> - <message numerus="yes"> - <source>%n week(s)</source> - <translation><numerusform>%n uge</numerusform><numerusform>%n uger</numerusform></translation> - </message> - <message> - <source>%1 and %2</source> - <translation>%1 og %2</translation> - </message> - <message numerus="yes"> - <source>%n year(s)</source> - <translation><numerusform>%n år</numerusform><numerusform>%n år</numerusform></translation> - </message> <message> <source>%1 behind</source> <translation>%1 bagud</translation> @@ -335,6 +486,10 @@ <translation>%1-klient</translation> </message> <message> + <source>Connecting to peers...</source> + <translation>Forbinder til knuder…</translation> + </message> + <message> <source>Catching up...</source> <translation>Indhenter…</translation> </message> @@ -377,6 +532,14 @@ <translation>Indgående transaktion</translation> </message> <message> + <source>HD key generation is <b>enabled</b></source> + <translation>Generering af HD-nøgler er <b>aktiveret</b></translation> + </message> + <message> + <source>HD key generation is <b>disabled</b></source> + <translation>Generering af HD-nøgler er <b>deaktiveret</b></translation> + </message> + <message> <source>Wallet is <b>encrypted</b> and currently <b>unlocked</b></source> <translation>Tegnebog er <b>krypteret</b> og i øjeblikket <b>ulåst</b></translation> </message> @@ -384,6 +547,10 @@ <source>Wallet is <b>encrypted</b> and currently <b>locked</b></source> <translation>Tegnebog er <b>krypteret</b> og i øjeblikket <b>låst</b></translation> </message> + <message> + <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> + <translation>Der opstod en fatal fejl. Bitcoin kan ikke længere fortsætte sikkert og vil afslutte.</translation> + </message> </context> <context> <name>CoinControlDialog</name> @@ -404,10 +571,6 @@ <translation>Beløb:</translation> </message> <message> - <source>Priority:</source> - <translation>Prioritet:</translation> - </message> - <message> <source>Fee:</source> <translation>Gebyr:</translation> </message> @@ -460,8 +623,84 @@ <translation>Bekræftet</translation> </message> <message> - <source>Priority</source> - <translation>Prioritet</translation> + <source>Copy address</source> + <translation>Kopiér adresse</translation> + </message> + <message> + <source>Copy label</source> + <translation>Kopiér mærkat</translation> + </message> + <message> + <source>Copy amount</source> + <translation>Kopiér beløb</translation> + </message> + <message> + <source>Copy transaction ID</source> + <translation>Kopiér transaktions-ID</translation> + </message> + <message> + <source>Lock unspent</source> + <translation>Fastlås ubrugte</translation> + </message> + <message> + <source>Unlock unspent</source> + <translation>Lås ubrugte op</translation> + </message> + <message> + <source>Copy quantity</source> + <translation>Kopiér mængde</translation> + </message> + <message> + <source>Copy fee</source> + <translation>Kopiér gebyr</translation> + </message> + <message> + <source>Copy after fee</source> + <translation>Kopiér eftergebyr</translation> + </message> + <message> + <source>Copy bytes</source> + <translation>Kopiér byte</translation> + </message> + <message> + <source>Copy dust</source> + <translation>Kopiér støv</translation> + </message> + <message> + <source>Copy change</source> + <translation>Kopiér byttepenge</translation> + </message> + <message> + <source>(%1 locked)</source> + <translation>(%1 fastlåst)</translation> + </message> + <message> + <source>yes</source> + <translation>ja</translation> + </message> + <message> + <source>no</source> + <translation>nej</translation> + </message> + <message> + <source>This label turns red if any recipient receives an amount smaller than the current dust threshold.</source> + <translation>Denne mærkat bliver rød, hvis en eller flere modtagere modtager et beløb, der er mindre end den aktuelle støvgrænse.</translation> + </message> + <message> + <source>Can vary +/- %1 satoshi(s) per input.</source> + <translation>Kan variere med ±%1 satoshi per input.</translation> + </message> + <message> + <source>(no label)</source> + <translation>(ingen mærkat)</translation> + </message> + <message> + <source>change from %1 (%2)</source> + <translation>byttepenge fra %1 (%2)</translation> + </message> + <message> + <source>(change)</source> + <translation>(byttepange)</translation> </message> </context> <context> @@ -486,6 +725,38 @@ <source>&Address</source> <translation>&Adresse</translation> </message> + <message> + <source>New receiving address</source> + <translation>Ny modtagelsesadresse</translation> + </message> + <message> + <source>New sending address</source> + <translation>Ny afsendelsesadresse</translation> + </message> + <message> + <source>Edit receiving address</source> + <translation>Redigér modtagelsesadresse</translation> + </message> + <message> + <source>Edit sending address</source> + <translation>Redigér afsendelsesadresse</translation> + </message> + <message> + <source>The entered address "%1" is not a valid Bitcoin address.</source> + <translation>Den indtastede adresse “%1” er ikke en gyldig Bitcoin-adresse.</translation> + </message> + <message> + <source>The entered address "%1" is already in the address book.</source> + <translation>Den indtastede adresse “%1” er allerede i adressebogen.</translation> + </message> + <message> + <source>Could not unlock wallet.</source> + <translation>Kunne ikke låse tegnebog op.</translation> + </message> + <message> + <source>New key generation failed.</source> + <translation>Ny nøglegenerering mislykkedes.</translation> + </message> </context> <context> <name>FreespaceChecker</name> @@ -546,7 +817,7 @@ </message> <message> <source>Set language, for example "de_DE" (default: system locale)</source> - <translation>Vælg sprog; fx "da_DK" (standard: systemsprog)</translation> + <translation>Vælg sprog; fx “da_DK” (standard: systemsprog)</translation> </message> <message> <source>Start minimized</source> @@ -593,7 +864,7 @@ </message> <message> <source>Error: Specified data directory "%1" cannot be created.</source> - <translation>Fejl: Angivet datamappe "%1" kan ikke oprettes.</translation> + <translation>Fejl: Angivet datamappe “%1” kan ikke oprettes.</translation> </message> <message> <source>Error</source> @@ -605,7 +876,58 @@ </message> <message numerus="yes"> <source>(of %n GB needed)</source> - <translation><numerusform>(ud af %n GB behøvet)</numerusform><numerusform>(ud af %n GB behøvet)</numerusform></translation> + <translation><numerusform>(ud af %n GB nødvendig)</numerusform><numerusform>(ud af %n GB nødvendig)</numerusform></translation> + </message> +</context> +<context> + <name>ModalOverlay</name> + <message> + <source>Form</source> + <translation>Formular</translation> + </message> + <message> + <source>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 bitcoin network, as detailed below.</source> + <translation>Nylige transaktioner er måske ikke synlige endnu, og derfor kan din tegnebogs saldo være ukorrekt. Denne information vil være korrekt, når din tegnebog er færdig med at synkronisere med bitcoin-netværket, som detaljerne herunder viser.</translation> + </message> + <message> + <source>Attempting to spend bitcoins that are affected by not-yet-displayed transactions will not be accepted by the network.</source> + <translation>Forsøg på at bruge bitcoin, som er indeholdt i endnu-ikke-viste transaktioner, accepteres ikke af netværket.</translation> + </message> + <message> + <source>Number of blocks left</source> + <translation>Antal blokke tilbage</translation> + </message> + <message> + <source>Unknown...</source> + <translation>Ukendt…</translation> + </message> + <message> + <source>Last block time</source> + <translation>Tidsstempel for seneste blok</translation> + </message> + <message> + <source>Progress</source> + <translation>Fremgang</translation> + </message> + <message> + <source>Progress increase per hour</source> + <translation>Øgning af fremgang pr. time</translation> + </message> + <message> + <source>calculating...</source> + <translation>beregner…</translation> + </message> + <message> + <source>Estimated time left until synced</source> + <translation>Estimeret tid tilbage af synkronisering</translation> + </message> + <message> + <source>Hide</source> + <translation>Skjul</translation> + </message> + <message> + <source>Unknown. Syncing Headers (%1)...</source> + <translation>Ukendt. Synkroniserer hoveder (%1)…</translation> </message> </context> <context> @@ -626,6 +948,10 @@ <source>Select payment request file</source> <translation>Vælg fil for betalingsanmodning</translation> </message> + <message> + <source>Select payment request file to open</source> + <translation>Vælg fil for betalingsanmodning til åbning</translation> + </message> </context> <context> <name>OptionsDialog</name> @@ -715,7 +1041,7 @@ </message> <message> <source>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.</source> - <translation>Hvis du slår brug af ubekræftede byttepenge fra, kan byttepengene fra en transaktion ikke bruges, før pågældende transaktion har mindst én bekræftelse. Dette påvirker også måden hvorpå din saldo beregnes.</translation> + <translation>Hvis du deaktiverer brug af ubekræftede byttepenge, kan byttepengene fra en transaktion ikke bruges, før pågældende transaktion har mindst én bekræftelse. Dette påvirker også måden hvorpå din saldo beregnes.</translation> </message> <message> <source>&Spend unconfirmed change</source> @@ -938,6 +1264,97 @@ </message> </context> <context> + <name>PaymentServer</name> + <message> + <source>Payment request error</source> + <translation>Fejl i betalingsanmodning</translation> + </message> + <message> + <source>Cannot start bitcoin: click-to-pay handler</source> + <translation>Kan ikke starte bitcoin: click-to-pay-håndtering</translation> + </message> + <message> + <source>URI handling</source> + <translation>URI-håndtering</translation> + </message> + <message> + <source>Payment request fetch URL is invalid: %1</source> + <translation>Hentnings-URL for betalingsanmodning er ugyldig: %1</translation> + </message> + <message> + <source>Invalid payment address %1</source> + <translation>Ugyldig betalingsadresse %1</translation> + </message> + <message> + <source>URI cannot be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters.</source> + <translation>URI kan ikke tolkes! Dette kan skyldes en ugyldig Bitcoin-adresse eller forkert udformede URL-parametre.</translation> + </message> + <message> + <source>Payment request file handling</source> + <translation>Filhåndtering for betalingsanmodninger</translation> + </message> + <message> + <source>Payment request file cannot be read! This can be caused by an invalid payment request file.</source> + <translation>Fil for betalingsanmodning kan ikke læses! Dette kan skyldes en ugyldig fil for betalingsanmodning.</translation> + </message> + <message> + <source>Payment request rejected</source> + <translation>Betalingsanmodning afvist</translation> + </message> + <message> + <source>Payment request network doesn't match client network.</source> + <translation>Netværk for betalingsanmodning stemmer ikke overens med klientens netværk.</translation> + </message> + <message> + <source>Payment request expired.</source> + <translation>Betalingsanmodning er udløbet.</translation> + </message> + <message> + <source>Payment request is not initialized.</source> + <translation>Betalingsanmodning er ikke klargjort.</translation> + </message> + <message> + <source>Unverified payment requests to custom payment scripts are unsupported.</source> + <translation>Ikke-verificerede betalingsanmodninger for tilpassede betalings-scripts understøttes ikke.</translation> + </message> + <message> + <source>Invalid payment request.</source> + <translation>Ugyldig betalingsanmodning.</translation> + </message> + <message> + <source>Requested payment amount of %1 is too small (considered dust).</source> + <translation>Anmodet betalingsbeløb på %1 er for lille (regnes som støv).</translation> + </message> + <message> + <source>Refund from %1</source> + <translation>Tilbagebetaling fra %1</translation> + </message> + <message> + <source>Payment request %1 is too large (%2 bytes, allowed %3 bytes).</source> + <translation>Betalingsanmodning %1 er for stor (%2 byte; %3 byte tilladt).</translation> + </message> + <message> + <source>Error communicating with %1: %2</source> + <translation>Fejl under kommunikation med %1: %2</translation> + </message> + <message> + <source>Payment request cannot be parsed!</source> + <translation>Betalingsanmodning kan ikke tolkes!</translation> + </message> + <message> + <source>Bad response from server %1</source> + <translation>Fejlagtigt svar fra server %1</translation> + </message> + <message> + <source>Network request error</source> + <translation>Fejl i netværksforespørgsel</translation> + </message> + <message> + <source>Payment acknowledged</source> + <translation>Betaling anerkendt</translation> + </message> +</context> +<context> <name>PeerTableModel</name> <message> <source>User Agent</source> @@ -948,8 +1365,12 @@ <translation>Knude/tjeneste</translation> </message> <message> - <source>Ping Time</source> - <translation>Ping-tid</translation> + <source>NodeId</source> + <translation>Knude-id</translation> + </message> + <message> + <source>Ping</source> + <translation>Ping</translation> </message> </context> <context> @@ -990,6 +1411,72 @@ <source>%1 ms</source> <translation>%1 ms</translation> </message> + <message numerus="yes"> + <source>%n second(s)</source> + <translation><numerusform>%n sekund</numerusform><numerusform>%n sekunder</numerusform></translation> + </message> + <message numerus="yes"> + <source>%n minute(s)</source> + <translation><numerusform>%n minut</numerusform><numerusform>%n minutter</numerusform></translation> + </message> + <message numerus="yes"> + <source>%n hour(s)</source> + <translation><numerusform>%n time</numerusform><numerusform>%n timer</numerusform></translation> + </message> + <message numerus="yes"> + <source>%n day(s)</source> + <translation><numerusform>%n dag</numerusform><numerusform>%n dage</numerusform></translation> + </message> + <message numerus="yes"> + <source>%n week(s)</source> + <translation><numerusform>%n uge</numerusform><numerusform>%n uger</numerusform></translation> + </message> + <message> + <source>%1 and %2</source> + <translation>%1 og %2</translation> + </message> + <message numerus="yes"> + <source>%n year(s)</source> + <translation><numerusform>%n år</numerusform><numerusform>%n år</numerusform></translation> + </message> + <message> + <source>%1 didn't yet exit safely...</source> + <translation>%1 har endnu ikke afsluttet på sikker vis…</translation> + </message> +</context> +<context> + <name>QObject::QObject</name> + <message> + <source>Error: Specified data directory "%1" does not exist.</source> + <translation>Fejl: Angivet datamappe “%1” eksisterer ikke.</translation> + </message> + <message> + <source>Error: Cannot parse configuration file: %1. Only use key=value syntax.</source> + <translation>Fejl: Kan ikke fortolke konfigurationsfil: %1. Brug kun syntaksen nøgle=værdi.</translation> + </message> + <message> + <source>Error: %1</source> + <translation>Fejl: %1</translation> + </message> +</context> +<context> + <name>QRImageWidget</name> + <message> + <source>&Save Image...</source> + <translation>Gem billede…</translation> + </message> + <message> + <source>&Copy Image</source> + <translation>&Kopiér foto</translation> + </message> + <message> + <source>Save QR Code</source> + <translation>Gem QR-kode</translation> + </message> + <message> + <source>PNG Image (*.png)</source> + <translation>PNG-billede (*.png)</translation> + </message> </context> <context> <name>RPCConsole</name> @@ -1150,6 +1637,10 @@ <translation>Ping-ventetid</translation> </message> <message> + <source>Min Ping</source> + <translation>Minimum ping</translation> + </message> + <message> <source>Time Offset</source> <translation>Tidsforskydning</translation> </message> @@ -1194,14 +1685,6 @@ <translation>Ryd konsol</translation> </message> <message> - <source>&Disconnect Node</source> - <translation>&Afbryd forbindelse til knude</translation> - </message> - <message> - <source>Ban Node for</source> - <translation>Bandlys knude i</translation> - </message> - <message> <source>1 &hour</source> <translation>1 &time</translation> </message> @@ -1218,8 +1701,16 @@ <translation>1 &år</translation> </message> <message> - <source>&Unban Node</source> - <translation>&Fjern bandlysning af knude</translation> + <source>&Disconnect</source> + <translation>&Afbryd forbindelse</translation> + </message> + <message> + <source>Ban for</source> + <translation>Bandlys i</translation> + </message> + <message> + <source>&Unban</source> + <translation>&Fjern bandlysning</translation> </message> <message> <source>Welcome to the %1 RPC console.</source> @@ -1234,6 +1725,14 @@ <translation>Tast <b>help</b> for en oversigt over de tilgængelige kommandoer.</translation> </message> <message> + <source>WARNING: Scammers have been active, telling users to type commands here, stealing their wallet contents. Do not use this console without fully understanding the ramification of a command.</source> + <translation>ADVARSEL: Svindlere har tidligere forsøgt at få folk til at indtaste kommandoer her og derved stjæle indholdet af deres tegnebog. Brug ikke denne konsol uden fuldt ud at forstå følgerne for en kommando.</translation> + </message> + <message> + <source>Network activity disabled</source> + <translation>Netværksaktivitet deaktiveret</translation> + </message> + <message> <source>%1 B</source> <translation>%1 B</translation> </message> @@ -1352,6 +1851,22 @@ <source>Remove</source> <translation>Fjern</translation> </message> + <message> + <source>Copy URI</source> + <translation>Kopiér URI</translation> + </message> + <message> + <source>Copy label</source> + <translation>Kopiér mærkat</translation> + </message> + <message> + <source>Copy message</source> + <translation>Kopiér besked</translation> + </message> + <message> + <source>Copy amount</source> + <translation>Kopiér beløb</translation> + </message> </context> <context> <name>ReceiveRequestDialog</name> @@ -1371,6 +1886,73 @@ <source>&Save Image...</source> <translation>&Gem billede…</translation> </message> + <message> + <source>Request payment to %1</source> + <translation>Anmod om betaling til %1</translation> + </message> + <message> + <source>Payment information</source> + <translation>Betalingsinformation</translation> + </message> + <message> + <source>URI</source> + <translation>URI</translation> + </message> + <message> + <source>Address</source> + <translation>Adresse</translation> + </message> + <message> + <source>Amount</source> + <translation>Beløb</translation> + </message> + <message> + <source>Label</source> + <translation>Mærkat</translation> + </message> + <message> + <source>Message</source> + <translation>Besked</translation> + </message> + <message> + <source>Resulting URI too long, try to reduce the text for label / message.</source> + <translation>Resulterende URI var for lang; prøv at forkorte teksten til mærkaten/beskeden.</translation> + </message> + <message> + <source>Error encoding URI into QR Code.</source> + <translation>Fejl ved kodning fra URI til QR-kode.</translation> + </message> +</context> +<context> + <name>RecentRequestsTableModel</name> + <message> + <source>Date</source> + <translation>Dato</translation> + </message> + <message> + <source>Label</source> + <translation>Mærkat</translation> + </message> + <message> + <source>Message</source> + <translation>Besked</translation> + </message> + <message> + <source>(no label)</source> + <translation>(ingen mærkat)</translation> + </message> + <message> + <source>(no message)</source> + <translation>(ingen besked)</translation> + </message> + <message> + <source>(no amount requested)</source> + <translation>(intet anmodet beløb)</translation> + </message> + <message> + <source>Requested</source> + <translation>Anmodet</translation> + </message> </context> <context> <name>SendCoinsDialog</name> @@ -1407,10 +1989,6 @@ <translation>Beløb:</translation> </message> <message> - <source>Priority:</source> - <translation>Prioritet:</translation> - </message> - <message> <source>Fee:</source> <translation>Gebyr:</translation> </message> @@ -1448,7 +2026,7 @@ </message> <message> <source>If the custom fee is set to 1000 satoshis and the transaction is only 250 bytes, then "per kilobyte" only pays 250 satoshis in fee, while "total at least" pays 1000 satoshis. For transactions bigger than a kilobyte both pay by kilobyte.</source> - <translation>Hvis det brugertilpassede gebyr er sat til 1000 satoshis, og transaktionen kun fylder 250 byte, betaler "pr. kilobyte" kun 250 satoshis i gebyr, mens "total mindst" betaler 1000 satoshis. For transaktioner større end en kilobyte betaler begge pr. kilobyte.</translation> + <translation>Hvis det brugertilpassede gebyr er sat til 1000 satoshis, og transaktionen kun fylder 250 byte, betaler “pr. kilobyte” kun 250 satoshis i gebyr, mens “total mindst” betaler 1000 satoshis. For transaktioner større end en kilobyte betaler begge pr. kilobyte.</translation> </message> <message> <source>Hide</source> @@ -1479,10 +2057,6 @@ <translation>(Smart-gebyr er ikke initialiseret endnu. Dette tager typisk nogle få blokke…)</translation> </message> <message> - <source>Confirmation time:</source> - <translation>Bekræftelsestid:</translation> - </message> - <message> <source>normal</source> <translation>normal</translation> </message> @@ -1507,6 +2081,10 @@ <translation>Støv:</translation> </message> <message> + <source>Confirmation time target:</source> + <translation>Mål for bekræftelsestid:</translation> + </message> + <message> <source>Clear &All</source> <translation>Ryd &alle</translation> </message> @@ -1522,6 +2100,126 @@ <source>S&end</source> <translation>&Afsend</translation> </message> + <message> + <source>Copy quantity</source> + <translation>Kopiér mængde</translation> + </message> + <message> + <source>Copy amount</source> + <translation>Kopiér beløb</translation> + </message> + <message> + <source>Copy fee</source> + <translation>Kopiér gebyr</translation> + </message> + <message> + <source>Copy after fee</source> + <translation>Kopiér eftergebyr</translation> + </message> + <message> + <source>Copy bytes</source> + <translation>Kopiér byte</translation> + </message> + <message> + <source>Copy dust</source> + <translation>Kopiér støv</translation> + </message> + <message> + <source>Copy change</source> + <translation>Kopiér byttepenge</translation> + </message> + <message> + <source>%1 to %2</source> + <translation>%1 til %2</translation> + </message> + <message> + <source>Are you sure you want to send?</source> + <translation>Er du sikker på, at du vil sende?</translation> + </message> + <message> + <source>added as transaction fee</source> + <translation>tilføjet som transaktionsgebyr</translation> + </message> + <message> + <source>Total Amount %1</source> + <translation>Beløb i alt %1</translation> + </message> + <message> + <source>or</source> + <translation>eller</translation> + </message> + <message> + <source>Confirm send coins</source> + <translation>Bekræft afsendelse af bitcoins</translation> + </message> + <message> + <source>The recipient address is not valid. Please recheck.</source> + <translation>Modtageradressen er ikke gyldig. Tjek venligst igen.</translation> + </message> + <message> + <source>The amount to pay must be larger than 0.</source> + <translation>Beløbet til betaling skal være større end 0.</translation> + </message> + <message> + <source>The amount exceeds your balance.</source> + <translation>Beløbet overstiger din saldo.</translation> + </message> + <message> + <source>The total exceeds your balance when the %1 transaction fee is included.</source> + <translation>Totalen overstiger din saldo, når transaktionsgebyret på %1 er inkluderet.</translation> + </message> + <message> + <source>Duplicate address found: addresses should only be used once each.</source> + <translation>Adressegenganger fundet. Adresser bør kun bruges én gang hver.</translation> + </message> + <message> + <source>Transaction creation failed!</source> + <translation>Oprettelse af transaktion mislykkedes!</translation> + </message> + <message> + <source>The transaction was rejected with the following reason: %1</source> + <translation>Transaktionen blev afvist med følgende begrundelse: %1</translation> + </message> + <message> + <source>A fee higher than %1 is considered an absurdly high fee.</source> + <translation>Et gebyr højere end %1 opfattes som et absurd højt gebyr.</translation> + </message> + <message> + <source>Payment request expired.</source> + <translation>Betalingsanmodning er udløbet.</translation> + </message> + <message numerus="yes"> + <source>%n block(s)</source> + <translation><numerusform>%n blok</numerusform><numerusform>%n blokke</numerusform></translation> + </message> + <message> + <source>Pay only the required fee of %1</source> + <translation>Betal kun det påkrævede gebyr på %1</translation> + </message> + <message numerus="yes"> + <source>Estimated to begin confirmation within %n block(s).</source> + <translation><numerusform>Bekræftelse estimeret til at begynde om %n blok.</numerusform><numerusform>Bekræftelse estimeret til at begynde om %n blokke.</numerusform></translation> + </message> + <message> + <source>Warning: Invalid Bitcoin address</source> + <translation>Advarsel: Ugyldig Bitcoin-adresse</translation> + </message> + <message> + <source>Warning: Unknown change address</source> + <translation>Advarsel: Ukendt byttepengeadresse</translation> + </message> + <message> + <source>Confirm custom change address</source> + <translation>Bekræft tilpasset byttepengeadresse</translation> + </message> + <message> + <source>The address you selected for change is not part of this wallet. Any or all funds in your wallet may be sent to this address. Are you sure?</source> + <translation>Den adresse, du har valgt til byttepenge, er ikke en del af denne tegnebog. Nogle af eller alle penge i din tegnebog kan blive sendt til denne adresse. Er du sikker?</translation> + </message> + <message> + <source>(no label)</source> + <translation>(ingen mærkat)</translation> + </message> </context> <context> <name>SendCoinsEntry</name> @@ -1591,7 +2289,7 @@ </message> <message> <source>A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source> - <translation>En besked, som blev føjet til "bitcon:"-URI'en, som vil gemmes med transaktionen til din reference. Bemærk: Denne besked vil ikke blive sendt over Bitcoin-netværket.</translation> + <translation>En besked, som blev føjet til “bitcon:”-URI'en, som vil gemmes med transaktionen til din reference. Bemærk: Denne besked vil ikke blive sendt over Bitcoin-netværket.</translation> </message> <message> <source>Pay To:</source> @@ -1601,6 +2299,17 @@ <source>Memo:</source> <translation>Memo:</translation> </message> + <message> + <source>Enter a label for this address to add it to your address book</source> + <translation>Indtast en mærkat for denne adresse for at føje den til din adressebog</translation> + </message> +</context> +<context> + <name>SendConfirmationDialog</name> + <message> + <source>Yes</source> + <translation>Ja</translation> + </message> </context> <context> <name>ShutdownWindow</name> @@ -1617,11 +2326,11 @@ <name>SignVerifyMessageDialog</name> <message> <source>Signatures - Sign / Verify a Message</source> - <translation>Signature - Underskriv/verificér en besked</translation> + <translation>Signaturer – Underskriv/verificér en besked</translation> </message> <message> <source>&Sign Message</source> - <translation>&Underskriv besked</translation> + <translation>&Singér besked</translation> </message> <message> <source>You can sign messages/agreements with your addresses to prove you can receive bitcoins 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.</source> @@ -1649,27 +2358,27 @@ </message> <message> <source>Enter the message you want to sign here</source> - <translation>Indtast her beskeden, du ønsker at underskrive</translation> + <translation>Indtast her beskeden, du ønsker at signere</translation> </message> <message> <source>Signature</source> - <translation>Underskrift</translation> + <translation>Signatur</translation> </message> <message> <source>Copy the current signature to the system clipboard</source> - <translation>Kopiér den nuværende underskrift til systemets udklipsholder</translation> + <translation>Kopiér den nuværende signatur til systemets udklipsholder</translation> </message> <message> <source>Sign the message to prove you own this Bitcoin address</source> - <translation>Underskriv denne besked for at bevise, at Bitcoin-adressen tilhører dig</translation> + <translation>Signér denne besked for at bevise, at Bitcoin-adressen tilhører dig</translation> </message> <message> <source>Sign &Message</source> - <translation>Underskriv &besked</translation> + <translation>Signér &besked</translation> </message> <message> <source>Reset all sign message fields</source> - <translation>Nulstil alle "underskriv besked"-felter</translation> + <translation>Nulstil alle “signér besked”-felter</translation> </message> <message> <source>Clear &All</source> @@ -1689,7 +2398,7 @@ </message> <message> <source>Verify the message to ensure it was signed with the specified Bitcoin address</source> - <translation>Verificér beskeden for at sikre, at den er underskrevet med den angivne Bitcoin-adresse</translation> + <translation>Verificér beskeden for at sikre, at den er signeret med den angivne Bitcoin-adresse</translation> </message> <message> <source>Verify &Message</source> @@ -1697,7 +2406,59 @@ </message> <message> <source>Reset all verify message fields</source> - <translation>Nulstil alle "verificér besked"-felter</translation> + <translation>Nulstil alle “verificér besked”-felter</translation> + </message> + <message> + <source>Click "Sign Message" to generate signature</source> + <translation>Klik “Signér besked” for at generere underskriften</translation> + </message> + <message> + <source>The entered address is invalid.</source> + <translation>Den indtastede adresse er ugyldig.</translation> + </message> + <message> + <source>Please check the address and try again.</source> + <translation>Tjek venligst adressen og forsøg igen.</translation> + </message> + <message> + <source>The entered address does not refer to a key.</source> + <translation>Den indtastede adresse henviser ikke til en nøgle.</translation> + </message> + <message> + <source>Wallet unlock was cancelled.</source> + <translation>Tegnebogsoplåsning annulleret.</translation> + </message> + <message> + <source>Private key for the entered address is not available.</source> + <translation>Den private nøgle for den indtastede adresse er ikke tilgængelig.</translation> + </message> + <message> + <source>Message signing failed.</source> + <translation>Signering af besked mislykkedes.</translation> + </message> + <message> + <source>Message signed.</source> + <translation>Besked signeret.</translation> + </message> + <message> + <source>The signature could not be decoded.</source> + <translation>Signaturen kunne ikke afkodes.</translation> + </message> + <message> + <source>Please check the signature and try again.</source> + <translation>Tjek venligst signaturen og forsøg igen.</translation> + </message> + <message> + <source>The signature did not match the message digest.</source> + <translation>Signaturen passer ikke overens med beskedens indhold.</translation> + </message> + <message> + <source>Message verification failed.</source> + <translation>Verificering af besked mislykkedes.</translation> + </message> + <message> + <source>Message verified.</source> + <translation>Besked verificeret.</translation> </message> </context> <context> @@ -1715,11 +2476,460 @@ </message> </context> <context> + <name>TransactionDesc</name> + <message numerus="yes"> + <source>Open for %n more block(s)</source> + <translation><numerusform>Åben i %n yderligere blok</numerusform><numerusform>Åben i %n yderligere blokke</numerusform></translation> + </message> + <message> + <source>Open until %1</source> + <translation>Åben indtil %1</translation> + </message> + <message> + <source>conflicted with a transaction with %1 confirmations</source> + <translation>i konflikt med en transaktion, der har %1 bekræftelser</translation> + </message> + <message> + <source>%1/offline</source> + <translation>%1/offline</translation> + </message> + <message> + <source>0/unconfirmed, %1</source> + <translation>0/ubekræftet, %1</translation> + </message> + <message> + <source>in memory pool</source> + <translation>i hukommelsespulje</translation> + </message> + <message> + <source>not in memory pool</source> + <translation>ikke i hukommelsespulje</translation> + </message> + <message> + <source>abandoned</source> + <translation>opgivet</translation> + </message> + <message> + <source>%1/unconfirmed</source> + <translation>%1/ubekræftet</translation> + </message> + <message> + <source>%1 confirmations</source> + <translation>%1 bekræftelser</translation> + </message> + <message> + <source>Status</source> + <translation>Status</translation> + </message> + <message> + <source>, has not been successfully broadcast yet</source> + <translation>, er ikke blevet transmitteret endnu</translation> + </message> + <message numerus="yes"> + <source>, broadcast through %n node(s)</source> + <translation><numerusform>, transmitteret igennem %n knude</numerusform><numerusform>, transmitteret igennem %n knuder</numerusform></translation> + </message> + <message> + <source>Date</source> + <translation>Dato</translation> + </message> + <message> + <source>Source</source> + <translation>Kilde</translation> + </message> + <message> + <source>Generated</source> + <translation>Genereret</translation> + </message> + <message> + <source>From</source> + <translation>Fra</translation> + </message> + <message> + <source>unknown</source> + <translation>ukendt</translation> + </message> + <message> + <source>To</source> + <translation>Til</translation> + </message> + <message> + <source>own address</source> + <translation>egen adresse</translation> + </message> + <message> + <source>watch-only</source> + <translation>kigge</translation> + </message> + <message> + <source>label</source> + <translation>mærkat</translation> + </message> + <message> + <source>Credit</source> + <translation>Kredit</translation> + </message> + <message numerus="yes"> + <source>matures in %n more block(s)</source> + <translation><numerusform>modner om %n blok</numerusform><numerusform>modner om %n blokke</numerusform></translation> + </message> + <message> + <source>not accepted</source> + <translation>ikke accepteret</translation> + </message> + <message> + <source>Debit</source> + <translation>Debet</translation> + </message> + <message> + <source>Total debit</source> + <translation>Total debet</translation> + </message> + <message> + <source>Total credit</source> + <translation>Total kredit</translation> + </message> + <message> + <source>Transaction fee</source> + <translation>Transaktionsgebyr</translation> + </message> + <message> + <source>Net amount</source> + <translation>Nettobeløb</translation> + </message> + <message> + <source>Message</source> + <translation>Besked</translation> + </message> + <message> + <source>Comment</source> + <translation>Kommentar</translation> + </message> + <message> + <source>Transaction ID</source> + <translation>Transaktions-ID</translation> + </message> + <message> + <source>Transaction total size</source> + <translation>Totalstørrelse af transaktion</translation> + </message> + <message> + <source>Output index</source> + <translation>Outputindeks</translation> + </message> + <message> + <source>Merchant</source> + <translation>Forretningsdrivende</translation> + </message> + <message> + <source>Generated coins must mature %1 blocks before they can be spent. When you generated this block, it was broadcast to the network to be added to the block chain. If it fails to get into the chain, its state will change to "not accepted" and it won't be spendable. This may occasionally happen if another node generates a block within a few seconds of yours.</source> + <translation>Minede bitcoins skal modne %1 blokke, før de kan bruges. Da du genererede denne blok, blev den transmitteret til netværket for at blive føjet til blokkæden. Hvis det ikke lykkes at få den i kæden, vil dens tilstand ændres til “ikke accepteret”, og den vil ikke kunne bruges. Dette kan ske nu og da, hvis en anden knude udvinder en blok inden for nogle få sekunder fra din.</translation> + </message> + <message> + <source>Debug information</source> + <translation>Fejlsøgningsinformation</translation> + </message> + <message> + <source>Transaction</source> + <translation>Transaktion</translation> + </message> + <message> + <source>Inputs</source> + <translation>Input</translation> + </message> + <message> + <source>Amount</source> + <translation>Beløb</translation> + </message> + <message> + <source>true</source> + <translation>sand</translation> + </message> + <message> + <source>false</source> + <translation>falsk</translation> + </message> +</context> +<context> <name>TransactionDescDialog</name> <message> <source>This pane shows a detailed description of the transaction</source> <translation>Denne rude viser en detaljeret beskrivelse af transaktionen</translation> </message> + <message> + <source>Details for %1</source> + <translation>Detaljer for %1</translation> + </message> +</context> +<context> + <name>TransactionTableModel</name> + <message> + <source>Date</source> + <translation>Dato</translation> + </message> + <message> + <source>Type</source> + <translation>Type</translation> + </message> + <message> + <source>Label</source> + <translation>Mærkat</translation> + </message> + <message numerus="yes"> + <source>Open for %n more block(s)</source> + <translation><numerusform>Åben i %n yderligere blok</numerusform><numerusform>Åben i %n yderligere blokke</numerusform></translation> + </message> + <message> + <source>Open until %1</source> + <translation>Åben indtil %1</translation> + </message> + <message> + <source>Offline</source> + <translation>Offline</translation> + </message> + <message> + <source>Unconfirmed</source> + <translation>Ubekræftet</translation> + </message> + <message> + <source>Abandoned</source> + <translation>Opgivet</translation> + </message> + <message> + <source>Confirming (%1 of %2 recommended confirmations)</source> + <translation>Bekræfter (%1 af %2 anbefalede bekræftelser)</translation> + </message> + <message> + <source>Confirmed (%1 confirmations)</source> + <translation>Bekræftet (%1 bekræftelser)</translation> + </message> + <message> + <source>Conflicted</source> + <translation>Konflikt</translation> + </message> + <message> + <source>Immature (%1 confirmations, will be available after %2)</source> + <translation>Umoden (%1 bekræftelser; vil være tilgængelig efter %2)</translation> + </message> + <message> + <source>This block was not received by any other nodes and will probably not be accepted!</source> + <translation>Denne blok blev ikke modtaget af nogen andre knuder og vil formentlig ikke blive accepteret!</translation> + </message> + <message> + <source>Generated but not accepted</source> + <translation>Genereret, men ikke accepteret</translation> + </message> + <message> + <source>Received with</source> + <translation>Modtaget med</translation> + </message> + <message> + <source>Received from</source> + <translation>Modtaget fra</translation> + </message> + <message> + <source>Sent to</source> + <translation>Sendt til</translation> + </message> + <message> + <source>Payment to yourself</source> + <translation>Betaling til dig selv</translation> + </message> + <message> + <source>Mined</source> + <translation>Minet</translation> + </message> + <message> + <source>watch-only</source> + <translation>kigge</translation> + </message> + <message> + <source>(n/a)</source> + <translation>(n/a)</translation> + </message> + <message> + <source>(no label)</source> + <translation>(ingen mærkat)</translation> + </message> + <message> + <source>Transaction status. Hover over this field to show number of confirmations.</source> + <translation>Transaktionsstatus. Hold musen over dette felt for at vise antallet af bekræftelser.</translation> + </message> + <message> + <source>Date and time that the transaction was received.</source> + <translation>Dato og klokkeslæt for modtagelse af transaktionen.</translation> + </message> + <message> + <source>Type of transaction.</source> + <translation>Transaktionstype.</translation> + </message> + <message> + <source>Whether or not a watch-only address is involved in this transaction.</source> + <translation>Afgør hvorvidt en kigge-adresse er involveret i denne transaktion.</translation> + </message> + <message> + <source>User-defined intent/purpose of the transaction.</source> + <translation>Brugerdefineret hensigt/formål med transaktionen.</translation> + </message> + <message> + <source>Amount removed from or added to balance.</source> + <translation>Beløb trukket fra eller tilføjet balance.</translation> + </message> +</context> +<context> + <name>TransactionView</name> + <message> + <source>All</source> + <translation>Alle</translation> + </message> + <message> + <source>Today</source> + <translation>I dag</translation> + </message> + <message> + <source>This week</source> + <translation>Denne uge</translation> + </message> + <message> + <source>This month</source> + <translation>Denne måned</translation> + </message> + <message> + <source>Last month</source> + <translation>Sidste måned</translation> + </message> + <message> + <source>This year</source> + <translation>I år</translation> + </message> + <message> + <source>Range...</source> + <translation>Interval…</translation> + </message> + <message> + <source>Received with</source> + <translation>Modtaget med</translation> + </message> + <message> + <source>Sent to</source> + <translation>Sendt til</translation> + </message> + <message> + <source>To yourself</source> + <translation>Til dig selv</translation> + </message> + <message> + <source>Mined</source> + <translation>Minet</translation> + </message> + <message> + <source>Other</source> + <translation>Andet</translation> + </message> + <message> + <source>Enter address or label to search</source> + <translation>Indtast adresse eller mærkat for at søge</translation> + </message> + <message> + <source>Min amount</source> + <translation>Minimumsbeløb</translation> + </message> + <message> + <source>Abandon transaction</source> + <translation>Opgiv transaktion</translation> + </message> + <message> + <source>Copy address</source> + <translation>Kopiér adresse</translation> + </message> + <message> + <source>Copy label</source> + <translation>Kopiér mærkat</translation> + </message> + <message> + <source>Copy amount</source> + <translation>Kopiér beløb</translation> + </message> + <message> + <source>Copy transaction ID</source> + <translation>Kopiér transaktions-ID</translation> + </message> + <message> + <source>Copy raw transaction</source> + <translation>Kopiér rå transaktion</translation> + </message> + <message> + <source>Copy full transaction details</source> + <translation>Kopiér komplette transaktionsdetaljer</translation> + </message> + <message> + <source>Edit label</source> + <translation>Redigér mærkat</translation> + </message> + <message> + <source>Show transaction details</source> + <translation>Vis transaktionsdetaljer</translation> + </message> + <message> + <source>Export Transaction History</source> + <translation>Eksportér transaktionshistorik</translation> + </message> + <message> + <source>Comma separated file (*.csv)</source> + <translation>Kommasepareret fil (*.csv)</translation> + </message> + <message> + <source>Confirmed</source> + <translation>Bekræftet</translation> + </message> + <message> + <source>Watch-only</source> + <translation>Kigge</translation> + </message> + <message> + <source>Date</source> + <translation>Dato</translation> + </message> + <message> + <source>Type</source> + <translation>Type</translation> + </message> + <message> + <source>Label</source> + <translation>Mærkat</translation> + </message> + <message> + <source>Address</source> + <translation>Adresse</translation> + </message> + <message> + <source>ID</source> + <translation>ID</translation> + </message> + <message> + <source>Exporting Failed</source> + <translation>Eksport mislykkedes</translation> + </message> + <message> + <source>There was an error trying to save the transaction history to %1.</source> + <translation>En fejl opstod under gemning af transaktionshistorik til %1.</translation> + </message> + <message> + <source>Exporting Successful</source> + <translation>Eksport problemfri</translation> + </message> + <message> + <source>The transaction history was successfully saved to %1.</source> + <translation>Transaktionshistorikken blev gemt til %1.</translation> + </message> + <message> + <source>Range:</source> + <translation>Interval:</translation> + </message> + <message> + <source>to</source> + <translation>til</translation> + </message> </context> <context> <name>UnitDisplayStatusBarControl</name> @@ -1729,6 +2939,55 @@ </message> </context> <context> + <name>WalletFrame</name> + <message> + <source>No wallet has been loaded.</source> + <translation>Ingen tegnebog er indlæst.</translation> + </message> +</context> +<context> + <name>WalletModel</name> + <message> + <source>Send Coins</source> + <translation>Send bitcoins</translation> + </message> +</context> +<context> + <name>WalletView</name> + <message> + <source>&Export</source> + <translation>&Eksportér</translation> + </message> + <message> + <source>Export the data in the current tab to a file</source> + <translation>Eksportér den aktuelle visning til en fil</translation> + </message> + <message> + <source>Backup Wallet</source> + <translation>Sikkerhedskopiér tegnebog</translation> + </message> + <message> + <source>Wallet Data (*.dat)</source> + <translation>Tegnebogsdata (*.dat)</translation> + </message> + <message> + <source>Backup Failed</source> + <translation>Sikkerhedskopiering mislykkedes</translation> + </message> + <message> + <source>There was an error trying to save the wallet data to %1.</source> + <translation>Der skete en fejl under gemning af tegnebogsdata til %1.</translation> + </message> + <message> + <source>Backup Successful</source> + <translation>Sikkerhedskopiering problemfri</translation> + </message> + <message> + <source>The wallet data was successfully saved to %1.</source> + <translation>Tegnebogsdata blev gemt til %1.</translation> + </message> +</context> +<context> <name>bitcoin-core</name> <message> <source>Options:</source> @@ -1751,6 +3010,18 @@ <translation>Acceptér kommandolinje- og JSON-RPC-kommandoer</translation> </message> <message> + <source>Accept connections from outside (default: 1 if no -proxy or -connect/-noconnect)</source> + <translation>Acceptér forbindelser udefra (standard: 1 hvis ingen -proxy eller -connect/-noconnect)</translation> + </message> + <message> + <source>Connect only to the specified node(s); -noconnect or -connect=0 alone to disable automatic connections</source> + <translation>Forbind kun til de specificerede knuder; -noconnect eller -connect=0 alene for at deaktivere automatiske forbindelser</translation> + </message> + <message> + <source>Distributed under the MIT software license, see the accompanying file %s or %s</source> + <translation>Distribueret under MIT-softwarelicensen; se den vedlagte fil %s eller %s</translation> + </message> + <message> <source>If <category> is not supplied or if <category> = 1, output all debugging information.</source> <translation>Hvis <category> ikke angives eller hvis <category> = 1, udskriv al fejlretningsinformation.</translation> </message> @@ -1763,10 +3034,6 @@ <translation>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)</translation> </message> <message> - <source>Reduce storage requirements by pruning (deleting) old blocks. This mode is incompatible with -txindex and -rescan. Warning: Reverting this setting requires re-downloading the entire blockchain. (default: 0 = disable pruning blocks, >%u = target size in MiB to use for block files)</source> - <translation>Reducér lagringskravene ved at beskære (slette) gamle blokke. Denne tilstand er ikke kompatibel med -txindex og -rescan. Advarsel: Fortrydelse af denne indstilling kræver gendownload af hele blokkæden. (standard: 0 = slå beskæring af blokke fra, >%u = målstørrelse i MiB der skal bruges på blokfiler)</translation> - </message> - <message> <source>Rescans are not possible in pruned mode. You will need to use -reindex which will download the whole blockchain again.</source> <translation>Genindlæsninger er ikke mulige i beskåret tilstand. Du er nødt til at bruge -reindex, hvilket vil downloade hele blokkæden igen.</translation> </message> @@ -1791,10 +3058,6 @@ <translation>Kunne ikke starte HTTP-server. Se fejlretningslog for detaljer.</translation> </message> <message> - <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> - <translation>Acceptér forbindelser udefra (standard: 1 hvis hverken -proxy eller -connect)</translation> - </message> - <message> <source>Bitcoin Core</source> <translation>Bitcoin Core</translation> </message> @@ -1803,10 +3066,6 @@ <translation>Udviklerne af %s</translation> </message> <message> - <source>-fallbackfee is set very high! This is the transaction fee you may pay when fee estimates are not available.</source> - <translation>-fallbackfee er sat meget højt! Dette er transaktionsgebyret, du eventuelt betaler, hvis gebyrestimater ikke er tilgængelige.</translation> - </message> - <message> <source>A fee rate (in %s/kB) that will be used when fee estimation has insufficient data (default: %s)</source> <translation>En gebyrsats (i %s/kB), som vil blive brugt, hvis gebyrestimering har utilstrækkelig data (standard: %s)</translation> </message> @@ -1827,10 +3086,6 @@ <translation>Slet alle transaktioner i tegnebogen og genskab kun disse dele af blokkæden gennem -rescan under opstart</translation> </message> <message> - <source>Distributed under the MIT software license, see the accompanying file COPYING or <http://www.opensource.org/licenses/mit-license.php>.</source> - <translation>Distribueret under MIT-softwarelicensen; se den vedlagte fil COPYING eller <http://www.opensource.org/licenses/mit-license.php>.</translation> - </message> - <message> <source>Error loading %s: You can't enable HD on a already existing non-HD wallet</source> <translation>Fejl under indlæsning af %s: Du kan ikke aktivere HD på en allerede eksisterende ikke-HD-tegnebog</translation> </message> @@ -1843,8 +3098,12 @@ <translation>Udfør kommando, når en transaktion i tegnebogen ændres (%s i kommandoen erstattes med TxID)</translation> </message> <message> - <source>Force relay of transactions from whitelisted peers even they violate local relay policy (default: %d)</source> - <translation>Gennemtving videresendelse af transaktioner fra hvidlistede knuder, selv om de overtræder lokal videresendelsespolitik (standard: %d)</translation> + <source>Extra transactions to keep in memory for compact block reconstructions (default: %u)</source> + <translation>Ekstra transaktioner, der skal beholdes i hukommelsen til kompakte blokgenopbygninger (standard: %u)</translation> + </message> + <message> + <source>If this block is in the chain assume that it and its ancestors are valid and potentially skip their script verification (0 to verify all, default: %s, testnet: %s)</source> + <translation>Hvis denne blok er i kæden, så antag at den og dens forgængere er gyldige, og spring potentielt deres scriptverificering over (0 for at verificere alle, standard: %s, testnet: %s)</translation> </message> <message> <source>Maximum allowed median peer time offset adjustment. Local perspective of time may be influenced by peers forward or backward by this amount. (default: %u seconds)</source> @@ -1863,6 +3122,14 @@ <translation>Overvej venligst at bidrage til udviklingen, hvis du finder %s brugbar. Besøg %s for yderligere information om softwaren.</translation> </message> <message> + <source>Reduce storage requirements by enabling pruning (deleting) of old blocks. This allows the pruneblockchain RPC to be called to delete specific blocks, and enables automatic pruning of old blocks if a target size in MiB is provided. This mode is incompatible with -txindex and -rescan. Warning: Reverting this setting requires re-downloading the entire blockchain. (default: 0 = disable pruning blocks, 1 = allow manual pruning via RPC, >%u = automatically prune block files to stay under the specified target size in MiB)</source> + <translation>Reducér pladskravene ved at beskære (slette, "prune") gamle blokke. Dette tillader pruneblockchain-RPC'en at blive kaldt for at slette specifikke blokke, og det aktiverer automatisk beskæring af gamle blokke, hvis en målstørrelse i MiB er angivet. Denne tilstand er ikke kompatibel med -txindex og -rescan. Advarsel: Fortrydelse af denne indstilling kræver download af hele blokkæden igen. (standard: 0 = slå beskæring af blokke fra, 1 = tillad manuel beskæring via RPC, >%u = beskær automatisk blokfiler for at bliver under den angivne målstørrelse i MiB)</translation> + </message> + <message> + <source>Set lowest fee rate (in %s/kB) for transactions to be included in block creation. (default: %s)</source> + <translation>Sæt den laveste gebyrrate (i %s/kB) for transaktioner, der skal inkluderes i blokoprettelse. (standard: %s)</translation> + </message> + <message> <source>Set the number of script verification threads (%u to %d, 0 = auto, <0 = leave that many cores free, default: %d)</source> <translation>Sæt antallet af scriptverificeringstråde (%u til %d, 0 = auto, <0 = efterlad det antal kernet fri, standard: %d)</translation> </message> @@ -1872,7 +3139,7 @@ </message> <message> <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source> - <translation>Dette er en foreløbig testudgivelse - brug på eget ansvar - brug ikke til udvinding eller handelsprogrammer</translation> + <translation>Dette er en foreløbig testudgivelse – brug på eget ansvar – brug ikke til mining eller handelsprogrammer</translation> </message> <message> <source>Unable to rewind the database to a pre-fork state. You will need to redownload the blockchain</source> @@ -1883,6 +3150,14 @@ <translation>Brug UPnP for at konfigurere den lyttende port (standard: 1 under lytning og ingen -proxy)</translation> </message> <message> + <source>Username and hashed password for JSON-RPC connections. The field <userpw> comes in the format: <USERNAME>:<SALT>$<HASH>. A canonical python script is included in share/rpcuser. The client then connects normally using the rpcuser=<USERNAME>/rpcpassword=<PASSWORD> pair of arguments. This option can be specified multiple times</source> + <translation>Brugernavn og hashet adgangskode for JSON-RPC-forbindelser. Feltet <userpw> er i formatet: <BRUGERNAVN>:<SALT>$<HASH>. Et kanonisk Python-skript er inkluderet i share/rpcuser. Klienten forbinder så normalt ved hjælp af argumentparret rpcuser=<BRUGERNAVN>/rpcpassword=<ADGANGSKODE>. Dette tilvalg kan angives flere gange</translation> + </message> + <message> + <source>Wallet will not create transactions that violate mempool chain limits (default: %u)</source> + <translation>Tegnebogen vil ikke oprette transaktioner, som overtræder begrænsningen for hukommelsespuljekæden (standard: %u)</translation> + </message> + <message> <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source> <translation>Advarsel: Netværket ser ikke ud til at være fuldt ud enige! Enkelte minere ser ud til at opleve problemer.</translation> </message> @@ -1891,10 +3166,6 @@ <translation>Advarsel: Vi ser ikke ud til at være fuldt ud enige med andre knuder! Du kan være nødt til at opgradere, eller andre knuder kan være nødt til at opgradere.</translation> </message> <message> - <source>Whitelist peers connecting from the given netmask or IP address. Can be specified multiple times.</source> - <translation>Sæt andre knuder, der forbinder fra den angivne netmaske eller IP, på hvidliste. Kan angives flere gange.</translation> - </message> - <message> <source>You need to rebuild the database using -reindex-chainstate to change -txindex</source> <translation>Du er nødt til at genopbygge databasen ved hjælp af -reindex-chainstate for at ændre -txindex</translation> </message> @@ -1924,15 +3195,15 @@ </message> <message> <source>Cannot resolve -%s address: '%s'</source> - <translation>Kan ikke finde -%s-adressen: "%s"</translation> + <translation>Kan ikke finde -%s-adressen: “%s”</translation> </message> <message> - <source>Change index out of range</source> - <translation>Ændr indeks uden for interval</translation> + <source>Chain selection options:</source> + <translation>Indstillinger for kædevalg:</translation> </message> <message> - <source>Connect only to the specified node(s)</source> - <translation>Tilslut kun til de(n) angivne knude(r)</translation> + <source>Change index out of range</source> + <translation>Ændr indeks uden for interval</translation> </message> <message> <source>Connection options:</source> @@ -1952,7 +3223,7 @@ </message> <message> <source>Do not load the wallet and disable wallet RPC calls</source> - <translation>Indlæs ikke tegnebogen og slå tegnebogs-RPC-kald fra</translation> + <translation>Indlæs ikke tegnebogen og deaktivér tegnebogs-RPC-kald</translation> </message> <message> <source>Do you want to rebuild the block database now?</source> @@ -2032,15 +3303,15 @@ </message> <message> <source>Invalid -onion address: '%s'</source> - <translation>Ugyldig -onion adresse: "%s"</translation> + <translation>Ugyldig -onion adresse: “%s”</translation> </message> <message> <source>Invalid amount for -%s=<amount>: '%s'</source> - <translation>Ugyldigt beløb for -%s=<beløb>: "%s"</translation> + <translation>Ugyldigt beløb for -%s=<beløb>: “%s”</translation> </message> <message> <source>Invalid amount for -fallbackfee=<amount>: '%s'</source> - <translation>Ugyldigt beløb for -fallbackfee=<beløb>: "%s"</translation> + <translation>Ugyldigt beløb for -fallbackfee=<beløb>: “%s”</translation> </message> <message> <source>Keep the transaction memory pool below <n> megabytes (default: %u)</source> @@ -2055,10 +3326,6 @@ <translation>Placering for autentificerings-cookie (standard: datamappe)</translation> </message> <message> - <source>Minimum bytes per sigop in transactions we relay and mine (default: %u)</source> - <translation>Minimum bytes pr. sigop i transaktioner, vi videresender og miner (standard: %u)</translation> - </message> - <message> <source>Not enough file descriptors available.</source> <translation>For få tilgængelige fildeskriptorer.</translation> </message> @@ -2099,10 +3366,6 @@ <translation>Sæt cache-størrelse for database i megabytes (%d til %d; standard: %d)</translation> </message> <message> - <source>Set maximum block cost (default: %d)</source> - <translation>Sæt maksimal blokudgift (standard: %d)</translation> - </message> - <message> <source>Set maximum block size in bytes (default: %d)</source> <translation>Sæt maksimum blokstørrelse i byte (standard: %d)</translation> </message> @@ -2135,6 +3398,10 @@ <translation>Brug UPnP til at konfigurere den lyttende port (standard: %u)</translation> </message> <message> + <source>Use the test chain</source> + <translation>Brug testkæden</translation> + </message> + <message> <source>User Agent comment (%s) contains unsafe characters.</source> <translation>Brugeragent-kommentar (%s) indeholder usikre tegn.</translation> </message> @@ -2176,7 +3443,7 @@ </message> <message> <source>Create new files with system default permissions, instead of umask 077 (only effective with disabled wallet functionality)</source> - <translation>Opret nye filer med systemstandard for rettigheder i stedet for umask 077 (kun virksomt med tegnebogsfunktionalitet slået fra)</translation> + <translation>Opret nye filer med systemstandard for rettigheder i stedet for umask 077 (kun virksomt med tegnebogsfunktionalitet deaktiveret)</translation> </message> <message> <source>Discover own IP addresses (default: 1 when listening and no -externalip or -proxy)</source> @@ -2200,17 +3467,13 @@ </message> <message> <source>Invalid amount for -maxtxfee=<amount>: '%s' (must be at least the minrelay fee of %s to prevent stuck transactions)</source> - <translation>Ugyldigt beløb for -maxtxfee=<beløb>: "%s" (skal være på mindst minrelay-gebyret på %s for at undgå hængende transaktioner)</translation> + <translation>Ugyldigt beløb for -maxtxfee=<beløb>: “%s” (skal være på mindst minrelay-gebyret på %s for at undgå hængende transaktioner)</translation> </message> <message> <source>Maximum size of data in data carrier transactions we relay and mine (default: %u)</source> <translation>Maksimal størrelse på data i transaktioner til dataoverførsel, som vi videresender og miner (standard: %u)</translation> </message> <message> - <source>Query for peer addresses via DNS lookup, if low on addresses (default: 1 unless -connect)</source> - <translation>Forespørgsel</translation> - </message> - <message> <source>Randomize credentials for every proxy connection. This enables Tor stream isolation (default: %u)</source> <translation>Brug tilfældige akkreditiver for hver proxy-forbindelse. Dette aktiverer strømisolation med Tor (standard: %u)</translation> </message> @@ -2223,10 +3486,6 @@ <translation>Transaktionsbeløbet er for lille til at sende, når gebyret er trukket fra</translation> </message> <message> - <source>This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit <https://www.openssl.org/> and cryptographic software written by Eric Young and UPnP software written by Thomas Bernard.</source> - <translation>Dette produkt indeholder software, der er udviklet af OpenSSL-projektet for brug i OpenSSL-værktøjskassen <https://www.openssl.org/>, samt kryptografisk software, der er skrevet af Eric Young, samt UPnP-software, der er skrevet af Thomas Bernard.</translation> - </message> - <message> <source>Use hierarchical deterministic key generation (HD) after BIP32. Only has effect during wallet creation/first start</source> <translation>Brug hierarkisk deterministisk nøglegenerering (HD) efter BIP32. Har kun effekt ved generering af ny tegnebog og under første opstart</translation> </message> @@ -2268,11 +3527,11 @@ </message> <message> <source>Invalid amount for -paytxfee=<amount>: '%s' (must be at least %s)</source> - <translation>Ugyldigt beløb for -paytxfee=<beløb>: "%s" (skal være mindst %s)</translation> + <translation>Ugyldigt beløb for -paytxfee=<beløb>: “%s” (skal være mindst %s)</translation> </message> <message> <source>Invalid netmask specified in -whitelist: '%s'</source> - <translation>Ugyldig netmaske angivet i -whitelist: "%s"</translation> + <translation>Ugyldig netmaske angivet i -whitelist: “%s”</translation> </message> <message> <source>Keep at most <n> unconnectable transactions in memory (default: %u)</source> @@ -2280,7 +3539,7 @@ </message> <message> <source>Need to specify a port with -whitebind: '%s'</source> - <translation>Nødt til at angive en port med -whitebinde: "%s"</translation> + <translation>Nødt til at angive en port med -whitebinde: “%s”</translation> </message> <message> <source>Node relay options:</source> @@ -2316,7 +3575,7 @@ </message> <message> <source>Signing transaction failed</source> - <translation>Underskrift af transaktion mislykkedes</translation> + <translation>Signering af transaktion mislykkedes</translation> </message> <message> <source>The transaction amount is too small to pay the fee</source> @@ -2339,10 +3598,6 @@ <translation>Transaktionsbeløb er for lavt</translation> </message> <message> - <source>Transaction amounts must be positive</source> - <translation>Transaktionsbeløb skal være positive</translation> - </message> - <message> <source>Transaction too large for fee policy</source> <translation>Transaktion for stor til gebyrretningslinjer</translation> </message> @@ -2407,18 +3662,22 @@ <translation>-maxtxfee er sat meget højt! Gebyrer så store risikeres betalt på en enkelt transaktion.</translation> </message> <message> - <source>-paytxfee is set very high! This is the transaction fee you will pay if you send a transaction.</source> - <translation>-paytxfee er sat meget højt! Dette er transaktionsgebyret, som du betaler, hvis du sender en transaktion.</translation> - </message> - <message> <source>Do not keep transactions in the mempool longer than <n> hours (default: %u)</source> <translation>Behold ikke transaktioner i hukommelsespuljen i mere end <n> timer (default: %u)</translation> </message> <message> + <source>Equivalent bytes per sigop in transactions for relay and mining (default: %u)</source> + <translation>Tilsvarende bytes pr. sigop i transaktioner, som videresendes og mines (standard: %u)</translation> + </message> + <message> <source>Fees (in %s/kB) smaller than this are considered zero fee for transaction creation (default: %s)</source> <translation>Gebyrer (i %s/kB) mindre end dette opfattes som intet gebyr under oprettelse af transaktioner (standard: %s)</translation> </message> <message> + <source>Force relay of transactions from whitelisted peers even if they violate local relay policy (default: %d)</source> + <translation>Gennemtving videresendelse af transaktioner fra hvidlistede knuder, selv om de overtræder lokal videresendelsespolitik (standard: %d)</translation> + </message> + <message> <source>How thorough the block verification of -checkblocks is (0-4, default: %u)</source> <translation>Hvor gennemarbejdet blokverificeringen for -checkblocks er (0-4; standard: %u)</translation> </message> @@ -2435,10 +3694,26 @@ <translation>Udskriv fejlsøgningsinformation (standard: %u, angivelse af <kategori> er valgfri)</translation> </message> <message> + <source>Query for peer addresses via DNS lookup, if low on addresses (default: 1 unless -connect/-noconnect)</source> + <translation>Forespørg knudeadresser via DNS-opslag hvis antallet af adresser er lavt (standard: 1 med mindre -connect/-noconnect)</translation> + </message> + <message> + <source>Sets the serialization of raw transaction or block hex returned in non-verbose mode, non-segwit(0) or segwit(1) (default: %d)</source> + <translation>Indstiller serialiseringen af rå transaktioner eller blok-hex returneret i ikke-verbose tilstand, non-segwit(0) eller sigwit(1) (standard: %d)</translation> + </message> + <message> <source>Support filtering of blocks and transaction with bloom filters (default: %u)</source> <translation>Understøt filtrering af blokke og transaktioner med Bloom-filtre (standard: %u)</translation> </message> <message> + <source>This is the transaction fee you may pay when fee estimates are not available.</source> + <translation>Dette er transaktionsgebyret, du kan betale, når gebyrestimeringer ikke er tilgængelige.</translation> + </message> + <message> + <source>This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit %s and cryptographic software written by Eric Young and UPnP software written by Thomas Bernard.</source> + <translation>Dette produkt indeholder software, der er udviklet af OpenSSL-projektet for brug i OpenSSL-værktøjskassen %s, samt kryptografisk software, der er skrevet af Eric Young, samt UPnP-software, der er skrevet af Thomas Bernard.</translation> + </message> + <message> <source>Total length of network version string (%i) exceeds maximum length (%i). Reduce the number or size of uacomments.</source> <translation>Den totale længde på netværksversionsstrengen (%i) overstiger maksimallængden (%i). Reducér antaller af eller størrelsen på uacomments.</translation> </message> @@ -2459,10 +3734,6 @@ <translation>Brug separat SOCS5-proxy for at nå knuder via skjulte Tor-tjenester (standard: %s)</translation> </message> <message> - <source>Username and hashed password for JSON-RPC connections. The field <userpw> comes in the format: <USERNAME>:<SALT>$<HASH>. A canonical python script is included in share/rpcuser. This option can be specified multiple times</source> - <translation>Brugernavn og hashet adgangskode for JSON-RPC-forbindelser. Feltet <userpw> er i formatet: <BRUGERNAVN>:<SALT>$<HASH>. Et kanonisk Python-skript inkluderes i share/rpcuser. Dette tilvalg kan angives flere gange</translation> - </message> - <message> <source>Warning: Unknown block versions being mined! It's possible unknown rules are in effect</source> <translation>Advarsel: Ukendte blokversioner bliver minet! Det er muligt, at ukendte regler er i brug</translation> </message> @@ -2471,6 +3742,14 @@ <translation>Advarsel: Tegnebogsfil ødelagt, data reddet! Oprindelig %s gemt som %s i %s; hvis din saldo eller dine transaktioner er forkert, bør du genskabe fra en sikkerhedskopi.</translation> </message> <message> + <source>Whitelist peers connecting from the given IP address (e.g. 1.2.3.4) or CIDR notated network (e.g. 1.2.3.0/24). Can be specified multiple times.</source> + <translation>Sæt knuder på hvidliste, som forbinder fra den givne IP-adresse (fx 1.2.3.4) eller CIDR-noteret netværk (fx 1.2.3.0/24). Kan angives flere gange.</translation> + </message> + <message> + <source>%s is set very high!</source> + <translation>%s er meget højt sat!</translation> + </message> + <message> <source>(default: %s)</source> <translation>(standard: %s)</translation> </message> @@ -2488,7 +3767,11 @@ </message> <message> <source>Invalid -proxy address: '%s'</source> - <translation>Ugyldig -proxy adresse: "%s"</translation> + <translation>Ugyldig -proxy adresse: “%s”</translation> + </message> + <message> + <source>Keypool ran out, please call keypoolrefill first</source> + <translation>Nøglepulje løb tør; kald venligst keypoolrefill først</translation> </message> <message> <source>Listen for JSON-RPC connections on <port> (default: %u or testnet: %u)</source> @@ -2527,13 +3810,17 @@ <translation>Videresend ikke-P2SH multisig (standard: %u)</translation> </message> <message> + <source>Send transactions with full-RBF opt-in enabled (default: %u)</source> + <translation>Send transaktioner med fuld-RBF opt-in aktiveret (standard: %u)</translation> + </message> + <message> <source>Set key pool size to <n> (default: %u)</source> <translation>Sæt nøglepuljestørrelse til <n> (standard: %u) </translation> </message> <message> - <source>Set minimum block size in bytes (default: %u)</source> - <translation>Angiv minimumsblokstørrelse i byte (standard: %u)</translation> + <source>Set maximum BIP141 block weight (default: %d)</source> + <translation>Sæt maksimal BIP141-blokvægt (standard: %d)</translation> </message> <message> <source>Set the number of threads to service RPC calls (default: %d)</source> @@ -2556,12 +3843,40 @@ <translation>Brug ubekræftede byttepenge under afsendelse af transaktioner (standard: %u)</translation> </message> <message> + <source>Starting network threads...</source> + <translation>Starter netværkstråde…</translation> + </message> + <message> + <source>The wallet will avoid paying less than the minimum relay fee.</source> + <translation>Tegnebogen vil undgå at betale mindre end minimum-videresendelsesgebyret.</translation> + </message> + <message> + <source>This is the minimum transaction fee you pay on every transaction.</source> + <translation>Dette er det transaktionsgebyr, du minimum betaler for hver transaktion.</translation> + </message> + <message> + <source>This is the transaction fee you will pay if you send a transaction.</source> + <translation>Dette er transaktionsgebyret, som betaler, når du sender en transaktion.</translation> + </message> + <message> <source>Threshold for disconnecting misbehaving peers (default: %u)</source> <translation>Grænse for afbrydelse af forbindelse til knuder, der opfører sig upassende (standard: %u)</translation> </message> <message> + <source>Transaction amounts must not be negative</source> + <translation>Transaktionsbeløb må ikke være negative</translation> + </message> + <message> + <source>Transaction has too long of a mempool chain</source> + <translation>Transaktionen har en for lang hukommelsespuljekæde</translation> + </message> + <message> + <source>Transaction must have at least one recipient</source> + <translation>Transaktionen skal have mindst én modtager</translation> + </message> + <message> <source>Unknown network specified in -onlynet: '%s'</source> - <translation>Ukendt netværk anført i -onlynet: "%s"</translation> + <translation>Ukendt netværk anført i -onlynet: “%s”</translation> </message> <message> <source>Insufficient funds</source> diff --git a/src/qt/locale/bitcoin_de.ts b/src/qt/locale/bitcoin_de.ts index 2708324d17..af79d47736 100644 --- a/src/qt/locale/bitcoin_de.ts +++ b/src/qt/locale/bitcoin_de.ts @@ -41,6 +41,77 @@ <source>&Delete</source> <translation>&Löschen</translation> </message> + <message> + <source>Choose the address to send coins to</source> + <translation>Wählen Sie die Adresse aus, an die Sie Bitcoins überweisen möchten</translation> + </message> + <message> + <source>Choose the address to receive coins with</source> + <translation>Wählen Sie die Adresse aus, über die Sie Bitcoins empfangen wollen</translation> + </message> + <message> + <source>C&hoose</source> + <translation>&Auswählen</translation> + </message> + <message> + <source>Sending addresses</source> + <translation>Zahlungsadressen</translation> + </message> + <message> + <source>Receiving addresses</source> + <translation>Empfangsadressen</translation> + </message> + <message> + <source>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source> + <translation>Dies sind ihre Bitcoin-Adressen zum Tätigen von Überweisungen. Bitte prüfen Sie den Betrag und die Empfangsadresse, bevor Sie Bitcoins überweisen.</translation> + </message> + <message> + <source>These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction.</source> + <translation>Dies sind Ihre Bitcoin-Adressen zum Empfangen von Zahlungen. Es wird empfohlen, für jede Transaktion eine neue Empfangsadresse zu verwenden.</translation> + </message> + <message> + <source>&Copy Address</source> + <translation>Adresse &kopieren</translation> + </message> + <message> + <source>Copy &Label</source> + <translation>&Bezeichnung kopieren</translation> + </message> + <message> + <source>&Edit</source> + <translation>&Editieren</translation> + </message> + <message> + <source>Export Address List</source> + <translation>Addressliste exportieren</translation> + </message> + <message> + <source>Comma separated file (*.csv)</source> + <translation>Kommagetrennte-Datei (*.csv)</translation> + </message> + <message> + <source>Exporting Failed</source> + <translation>Exportieren fehlgeschlagen</translation> + </message> + <message> + <source>There was an error trying to save the address list to %1. Please try again.</source> + <translation>Beim Speichern der Adressliste nach %1 ist ein Fehler aufgetreten. Bitte versuchen Sie es erneut.</translation> + </message> +</context> +<context> + <name>AddressTableModel</name> + <message> + <source>Label</source> + <translation>Bezeichnung</translation> + </message> + <message> + <source>Address</source> + <translation>Adresse</translation> + </message> + <message> + <source>(no label)</source> + <translation>(keine Bezeichnung)</translation> + </message> </context> <context> <name>AskPassphraseDialog</name> @@ -60,6 +131,94 @@ <source>Repeat new passphrase</source> <translation>Neue Passphrase bestätigen</translation> </message> + <message> + <source>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>.</source> + <translation>Geben Sie die neue Passphrase für die Wallet ein.<br>Bitte benutzen Sie eine Passphrase bestehend aus <b>zehn oder mehr zufälligen Zeichen</b> oder <b>acht oder mehr Wörtern</b>.</translation> + </message> + <message> + <source>Encrypt wallet</source> + <translation>Wallet verschlüsseln</translation> + </message> + <message> + <source>This operation needs your wallet passphrase to unlock the wallet.</source> + <translation>Dieser Vorgang benötigt ihre Passphrase, um die Wallet zu entsperren.</translation> + </message> + <message> + <source>Unlock wallet</source> + <translation>Wallet entsperren</translation> + </message> + <message> + <source>This operation needs your wallet passphrase to decrypt the wallet.</source> + <translation>Dieser Vorgang benötigt Ihre Passphrase, um die Wallet zu entschlüsseln.</translation> + </message> + <message> + <source>Decrypt wallet</source> + <translation>Wallet entschlüsseln</translation> + </message> + <message> + <source>Change passphrase</source> + <translation>Passphrase ändern</translation> + </message> + <message> + <source>Enter the old passphrase and new passphrase to the wallet.</source> + <translation>Geben Sie die alte und neue Wallet-Passphrase ein.</translation> + </message> + <message> + <source>Confirm wallet encryption</source> + <translation>Wallet-Verschlüsselung bestätigen</translation> + </message> + <message> + <source>Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR BITCOINS</b>!</source> + <translation>Warnung: Wenn Sie Ihre Wallet verschlüsseln und Ihre Passphrase verlieren, werden Sie <b>alle Ihre Bitcoins verlieren</b>!</translation> + </message> + <message> + <source>Are you sure you wish to encrypt your wallet?</source> + <translation>Sind Sie sich sicher, dass Sie Ihre Wallet verschlüsseln möchten?</translation> + </message> + <message> + <source>Wallet encrypted</source> + <translation>Wallet verschlüsselt</translation> + </message> + <message> + <source>%1 will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your bitcoins from being stolen by malware infecting your computer.</source> + <translation>%1 wird jetzt beendet, um den Verschlüsselungsprozess abzuschließen. Bitte beachten Sie, dass die Wallet-Verschlüsselung nicht vollständig vor Diebstahl Ihrer Bitcoins durch Schadprogramme schützt, die Ihren Computer befällt.</translation> + </message> + <message> + <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source> + <translation>WICHTIG: Alle vorherigen Wallet-Sicherungen sollten durch die neu erzeugte, verschlüsselte Wallet ersetzt werden. Aus Sicherheitsgründen werden vorherige Sicherungen der unverschlüsselten Wallet nutzlos, sobald Sie die neue, verschlüsselte Wallet verwenden.</translation> + </message> + <message> + <source>Wallet encryption failed</source> + <translation>Wallet-Verschlüsselung fehlgeschlagen</translation> + </message> + <message> + <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source> + <translation>Die Wallet-Verschlüsselung ist aufgrund eines internen Fehlers fehlgeschlagen. Ihre Wallet wurde nicht verschlüsselt.</translation> + </message> + <message> + <source>The supplied passphrases do not match.</source> + <translation>Die eingegebenen Passphrasen stimmen nicht überein.</translation> + </message> + <message> + <source>Wallet unlock failed</source> + <translation>Wallet-Entsperrung fehlgeschlagen</translation> + </message> + <message> + <source>The passphrase entered for the wallet decryption was incorrect.</source> + <translation>Die eingegebene Passphrase zur Wallet-Entschlüsselung war nicht korrekt.</translation> + </message> + <message> + <source>Wallet decryption failed</source> + <translation>Wallet-Entschlüsselung fehlgeschlagen</translation> + </message> + <message> + <source>Wallet passphrase was successfully changed.</source> + <translation>Die Wallet-Passphrase wurde erfolgreich geändert.</translation> + </message> + <message> + <source>Warning: The Caps Lock key is on!</source> + <translation>Warnung: Die Feststelltaste ist aktiviert!</translation> + </message> </context> <context> <name>BanTableModel</name> @@ -112,7 +271,7 @@ </message> <message> <source>&About %1</source> - <translation>&Über %1</translation> + <translation>Über %1</translation> </message> <message> <source>Show information about %1</source> @@ -159,6 +318,22 @@ <translation>&URI öffnen...</translation> </message> <message> + <source>Click to disable network activity.</source> + <translation>Klicken zum Deaktivieren der Netzwerkaktivität.</translation> + </message> + <message> + <source>Network activity disabled.</source> + <translation>Netzwerkaktivität deaktiviert.</translation> + </message> + <message> + <source>Click to enable network activity again.</source> + <translation>Klicken zum Aktivieren der Netzwerkaktivität.</translation> + </message> + <message> + <source>Syncing Headers (%1%)...</source> + <translation>Kopfdaten werden synchronisiert (%1%)...</translation> + </message> + <message> <source>Reindexing blocks on disk...</source> <translation>Reindiziere Blöcke auf Datenträger...</translation> </message> @@ -270,34 +445,10 @@ <source>Processing blocks on disk...</source> <translation>Verarbeite Blöcke auf Datenträger...</translation> </message> - <message> - <source>No block source available...</source> - <translation>Keine Blockquelle verfügbar...</translation> - </message> <message numerus="yes"> <source>Processed %n block(s) of transaction history.</source> <translation><numerusform>%n Block des Transaktionsverlaufs verarbeitet.</numerusform><numerusform>%n Blöcke des Transaktionsverlaufs verarbeitet.</numerusform></translation> </message> - <message numerus="yes"> - <source>%n hour(s)</source> - <translation><numerusform>%n Stunde</numerusform><numerusform>%n Stunden</numerusform></translation> - </message> - <message numerus="yes"> - <source>%n day(s)</source> - <translation><numerusform>%n Tag</numerusform><numerusform>%n Tage</numerusform></translation> - </message> - <message numerus="yes"> - <source>%n week(s)</source> - <translation><numerusform>%n Woche</numerusform><numerusform>%n Wochen</numerusform></translation> - </message> - <message> - <source>%1 and %2</source> - <translation>%1 und %2</translation> - </message> - <message numerus="yes"> - <source>%n year(s)</source> - <translation><numerusform>%n Jahr</numerusform><numerusform>%n Jahre</numerusform></translation> - </message> <message> <source>%1 behind</source> <translation>%1 im Rückstand</translation> @@ -335,6 +486,10 @@ <translation>%1 Client</translation> </message> <message> + <source>Connecting to peers...</source> + <translation>Verbinde mit Netzwerk...</translation> + </message> + <message> <source>Catching up...</source> <translation>Hole auf...</translation> </message> @@ -377,6 +532,14 @@ <translation>Eingehende Transaktion</translation> </message> <message> + <source>HD key generation is <b>enabled</b></source> + <translation>HD Schlüssel Generierung ist <b>aktiviert</b></translation> + </message> + <message> + <source>HD key generation is <b>disabled</b></source> + <translation>HD Schlüssel Generierung ist <b>deaktiviert</b></translation> + </message> + <message> <source>Wallet is <b>encrypted</b> and currently <b>unlocked</b></source> <translation>Wallet ist <b>verschlüsselt</b> und aktuell <b>entsperrt</b></translation> </message> @@ -384,6 +547,10 @@ <source>Wallet is <b>encrypted</b> and currently <b>locked</b></source> <translation>Wallet ist <b>verschlüsselt</b> und aktuell <b>gesperrt</b></translation> </message> + <message> + <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> + <translation>Ein schwerer Fehler ist aufgetreten. Bitcoin kann nicht stabil weiter ausgeführt werden und wird beendet.</translation> + </message> </context> <context> <name>CoinControlDialog</name> @@ -404,10 +571,6 @@ <translation>Betrag:</translation> </message> <message> - <source>Priority:</source> - <translation>Priorität:</translation> - </message> - <message> <source>Fee:</source> <translation>Gebühr:</translation> </message> @@ -460,8 +623,84 @@ <translation>Bestätigt</translation> </message> <message> - <source>Priority</source> - <translation>Priorität</translation> + <source>Copy address</source> + <translation>Adresse kopieren</translation> + </message> + <message> + <source>Copy label</source> + <translation>Bezeichnung kopieren</translation> + </message> + <message> + <source>Copy amount</source> + <translation>Betrag kopieren</translation> + </message> + <message> + <source>Copy transaction ID</source> + <translation>Transaktionskennung kopieren</translation> + </message> + <message> + <source>Lock unspent</source> + <translation>Nicht ausgegebenen Betrag sperren</translation> + </message> + <message> + <source>Unlock unspent</source> + <translation>Nicht ausgegebenen Betrag entsperren</translation> + </message> + <message> + <source>Copy quantity</source> + <translation>Anzahl kopieren</translation> + </message> + <message> + <source>Copy fee</source> + <translation>Gebühr kopieren</translation> + </message> + <message> + <source>Copy after fee</source> + <translation>Abzüglich Gebühr kopieren</translation> + </message> + <message> + <source>Copy bytes</source> + <translation>Byte kopieren</translation> + </message> + <message> + <source>Copy dust</source> + <translation>"Staub" kopieren</translation> + </message> + <message> + <source>Copy change</source> + <translation>Wechselgeld kopieren</translation> + </message> + <message> + <source>(%1 locked)</source> + <translation>(%1 gesperrt)</translation> + </message> + <message> + <source>yes</source> + <translation>ja</translation> + </message> + <message> + <source>no</source> + <translation>nein</translation> + </message> + <message> + <source>This label turns red if any recipient receives an amount smaller than the current dust threshold.</source> + <translation>Diese Bezeichnung wird rot, wenn irgendein Empfänger einen Betrag kleiner als die derzeitige "Staubgrenze" erhält.</translation> + </message> + <message> + <source>Can vary +/- %1 satoshi(s) per input.</source> + <translation>Kann pro Eingabe um +/- %1 Satoshi(s) abweichen.</translation> + </message> + <message> + <source>(no label)</source> + <translation>(keine Bezeichnung)</translation> + </message> + <message> + <source>change from %1 (%2)</source> + <translation>Wechselgeld von %1 (%2)</translation> + </message> + <message> + <source>(change)</source> + <translation>(Wechselgeld)</translation> </message> </context> <context> @@ -486,6 +725,38 @@ <source>&Address</source> <translation>&Adresse</translation> </message> + <message> + <source>New receiving address</source> + <translation>Neue Empfangsadresse</translation> + </message> + <message> + <source>New sending address</source> + <translation>Neue Zahlungsadresse</translation> + </message> + <message> + <source>Edit receiving address</source> + <translation>Empfangsadresse bearbeiten</translation> + </message> + <message> + <source>Edit sending address</source> + <translation>Zahlungsadresse bearbeiten</translation> + </message> + <message> + <source>The entered address "%1" is not a valid Bitcoin address.</source> + <translation>Die eingegebene Adresse "%1" ist keine gültige Bitcoin-Adresse.</translation> + </message> + <message> + <source>The entered address "%1" is already in the address book.</source> + <translation>Die eingegebene Adresse "%1" befindet sich bereits im Adressbuch.</translation> + </message> + <message> + <source>Could not unlock wallet.</source> + <translation>Wallet konnte nicht entsperrt werden.</translation> + </message> + <message> + <source>New key generation failed.</source> + <translation>Erzeugung eines neuen Schlüssels fehlgeschlagen.</translation> + </message> </context> <context> <name>FreespaceChecker</name> @@ -609,6 +880,49 @@ </message> </context> <context> + <name>ModalOverlay</name> + <message> + <source>Form</source> + <translation>Formular</translation> + </message> + <message> + <source>Number of blocks left</source> + <translation>Anzahl verbleibender Blöcke</translation> + </message> + <message> + <source>Unknown...</source> + <translation>Unbekannt...</translation> + </message> + <message> + <source>Last block time</source> + <translation>Letzte Blockzeit</translation> + </message> + <message> + <source>Progress</source> + <translation>Fortschritt</translation> + </message> + <message> + <source>Progress increase per hour</source> + <translation>Fortschritt pro Stunde</translation> + </message> + <message> + <source>calculating...</source> + <translation>berechne...</translation> + </message> + <message> + <source>Estimated time left until synced</source> + <translation>Abschätzung der verbleibenden Zeit bis synchronisiert</translation> + </message> + <message> + <source>Hide</source> + <translation>Ausblenden</translation> + </message> + <message> + <source>Unknown. Syncing Headers (%1)...</source> + <translation>Unbekannt. Synchronisiere Headers (%1)...</translation> + </message> +</context> +<context> <name>OpenURIDialog</name> <message> <source>Open URI</source> @@ -626,6 +940,10 @@ <source>Select payment request file</source> <translation>Zahlungsanforderungsdatei auswählen</translation> </message> + <message> + <source>Select payment request file to open</source> + <translation>Zu öffnende Zahlungsanforderungsdatei auswählen</translation> + </message> </context> <context> <name>OptionsDialog</name> @@ -810,6 +1128,10 @@ <translation>&Sprache der Benutzeroberfläche:</translation> </message> <message> + <source>The user interface language can be set here. This setting will take effect after restarting %1.</source> + <translation>Die Benutzeroberflächensprache kann hier festgelegt werden. Diese Einstellung wird nach einem Neustart von %1 wirksam werden.</translation> + </message> + <message> <source>&Unit to show amounts in:</source> <translation>&Einheit der Beträge:</translation> </message> @@ -934,6 +1256,97 @@ </message> </context> <context> + <name>PaymentServer</name> + <message> + <source>Payment request error</source> + <translation>fehlerhafte Zahlungsanforderung</translation> + </message> + <message> + <source>Cannot start bitcoin: click-to-pay handler</source> + <translation>Kann Bitcoin nicht starten: Klicken-zum-Bezahlen-Handler</translation> + </message> + <message> + <source>URI handling</source> + <translation>URI-Verarbeitung</translation> + </message> + <message> + <source>Payment request fetch URL is invalid: %1</source> + <translation>Abruf-URL der Zahlungsanforderung ist ungültig: %1</translation> + </message> + <message> + <source>Invalid payment address %1</source> + <translation>Ungültige Zahlungsadresse %1</translation> + </message> + <message> + <source>URI cannot be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters.</source> + <translation>URI kann nicht analysiert werden! Dies kann durch eine ungültige Bitcoin-Adresse oder fehlerhafte URI-Parameter verursacht werden.</translation> + </message> + <message> + <source>Payment request file handling</source> + <translation>Zahlungsanforderungsdatei-Verarbeitung</translation> + </message> + <message> + <source>Payment request file cannot be read! This can be caused by an invalid payment request file.</source> + <translation>Zahlungsanforderungsdatei kann nicht gelesen werden! Dies kann durch eine ungültige Zahlungsanforderungsdatei verursacht werden.</translation> + </message> + <message> + <source>Payment request rejected</source> + <translation>Zahlungsanforderung abgelehnt</translation> + </message> + <message> + <source>Payment request network doesn't match client network.</source> + <translation>Netzwerk der Zahlungsanforderung stimmt nicht mit dem Client-Netzwerk überein.</translation> + </message> + <message> + <source>Payment request expired.</source> + <translation>Zahlungsanforderung abgelaufen.</translation> + </message> + <message> + <source>Payment request is not initialized.</source> + <translation>Zahlungsanforderung ist nicht initialisiert.</translation> + </message> + <message> + <source>Unverified payment requests to custom payment scripts are unsupported.</source> + <translation>Unverifizierte Zahlungsanforderungen an benutzerdefinierte Zahlungsskripte werden nicht unterstützt.</translation> + </message> + <message> + <source>Invalid payment request.</source> + <translation>Ungültige Zahlungsanforderung.</translation> + </message> + <message> + <source>Requested payment amount of %1 is too small (considered dust).</source> + <translation>Angeforderter Zahlungsbetrag in Höhe von %1 ist zu niedrig und wurde als "Staub" eingestuft.</translation> + </message> + <message> + <source>Refund from %1</source> + <translation>Rücküberweisung von %1</translation> + </message> + <message> + <source>Payment request %1 is too large (%2 bytes, allowed %3 bytes).</source> + <translation>Zahlungsanforderung %1 ist zu groß (%2 Byte, erlaubt sind %3 Byte).</translation> + </message> + <message> + <source>Error communicating with %1: %2</source> + <translation>Kommunikationsfehler mit %1: %2</translation> + </message> + <message> + <source>Payment request cannot be parsed!</source> + <translation>Zahlungsanforderung kann nicht verarbeitet werden!</translation> + </message> + <message> + <source>Bad response from server %1</source> + <translation>Fehlerhafte Antwort vom Server: %1</translation> + </message> + <message> + <source>Network request error</source> + <translation>fehlerhafte Netzwerkanfrage</translation> + </message> + <message> + <source>Payment acknowledged</source> + <translation>Zahlung bestätigt</translation> + </message> +</context> +<context> <name>PeerTableModel</name> <message> <source>User Agent</source> @@ -944,8 +1357,12 @@ <translation>Knoten/Dienst</translation> </message> <message> - <source>Ping Time</source> - <translation>Pingzeit</translation> + <source>NodeId</source> + <translation>Knoten Identität</translation> + </message> + <message> + <source>Ping</source> + <translation>Ping</translation> </message> </context> <context> @@ -986,6 +1403,68 @@ <source>%1 ms</source> <translation>%1 ms</translation> </message> + <message numerus="yes"> + <source>%n second(s)</source> + <translation><numerusform>%n Sekunde</numerusform><numerusform>%n Sekunde(n)</numerusform></translation> + </message> + <message numerus="yes"> + <source>%n minute(s)</source> + <translation><numerusform>%n Minute</numerusform><numerusform>%n Minute(n)</numerusform></translation> + </message> + <message numerus="yes"> + <source>%n hour(s)</source> + <translation><numerusform>%n Stunde</numerusform><numerusform>%n Stunden</numerusform></translation> + </message> + <message numerus="yes"> + <source>%n day(s)</source> + <translation><numerusform>%n Tag</numerusform><numerusform>%n Tage</numerusform></translation> + </message> + <message numerus="yes"> + <source>%n week(s)</source> + <translation><numerusform>%n Woche</numerusform><numerusform>%n Wochen</numerusform></translation> + </message> + <message> + <source>%1 and %2</source> + <translation>%1 und %2</translation> + </message> + <message> + <source>%1 didn't yet exit safely...</source> + <translation>%1 wurde noch nicht sicher beendet...</translation> + </message> +</context> +<context> + <name>QObject::QObject</name> + <message> + <source>Error: Specified data directory "%1" does not exist.</source> + <translation>Fehler: Angegebenes Datenverzeichnis "%1" existiert nicht.</translation> + </message> + <message> + <source>Error: Cannot parse configuration file: %1. Only use key=value syntax.</source> + <translation>Fehler: Konfigurationsdatei kann nicht analysiert werden: %1. Bitte nur "Schlüssel=Wert"-Syntax verwenden.</translation> + </message> + <message> + <source>Error: %1</source> + <translation>Fehler: %1</translation> + </message> +</context> +<context> + <name>QRImageWidget</name> + <message> + <source>&Save Image...</source> + <translation>Grafik &speichern...</translation> + </message> + <message> + <source>&Copy Image</source> + <translation>Grafik &kopieren</translation> + </message> + <message> + <source>Save QR Code</source> + <translation>QR-Code speichern</translation> + </message> + <message> + <source>PNG Image (*.png)</source> + <translation>PNG-Grafik (*.png)</translation> + </message> </context> <context> <name>RPCConsole</name> @@ -1146,6 +1625,10 @@ <translation>Ping Wartezeit</translation> </message> <message> + <source>Min Ping</source> + <translation>Minimaler Ping</translation> + </message> + <message> <source>Time Offset</source> <translation>Zeitversatz</translation> </message> @@ -1190,14 +1673,6 @@ <translation>Konsole zurücksetzen</translation> </message> <message> - <source>&Disconnect Node</source> - <translation>Knoten &trennen</translation> - </message> - <message> - <source>Ban Node for</source> - <translation>Knoten gebannt für</translation> - </message> - <message> <source>1 &hour</source> <translation>1 &Stunde</translation> </message> @@ -1214,7 +1689,15 @@ <translation>1 &Jahr</translation> </message> <message> - <source>&Unban Node</source> + <source>&Disconnect</source> + <translation>&Trennen</translation> + </message> + <message> + <source>Ban for</source> + <translation>Banne für</translation> + </message> + <message> + <source>&Unban</source> <translation>&Node entsperren</translation> </message> <message> @@ -1230,6 +1713,14 @@ <translation>Bitte <b>help</b> eingeben, um eine Übersicht verfügbarer Befehle zu erhalten.</translation> </message> <message> + <source>WARNING: Scammers have been active, telling users to type commands here, stealing their wallet contents. Do not use this console without fully understanding the ramification of a command.</source> + <translation>WARNUNG: Betrüger versuchen aktiv Nutzer dazu zu bringen Kommandos hier auszuführen um die Wallet Inhalte zu stehlen. Diese Konsole sollte nicht benutzt werden ausser man kennt die möglichen Folgen des Kommandos.</translation> + </message> + <message> + <source>Network activity disabled</source> + <translation>Netzwerkaktivität deaktiviert</translation> + </message> + <message> <source>%1 B</source> <translation>%1 B</translation> </message> @@ -1348,6 +1839,22 @@ <source>Remove</source> <translation>Entfernen</translation> </message> + <message> + <source>Copy URI</source> + <translation>&URI kopieren</translation> + </message> + <message> + <source>Copy label</source> + <translation>Bezeichnung kopieren</translation> + </message> + <message> + <source>Copy message</source> + <translation>Nachricht kopieren</translation> + </message> + <message> + <source>Copy amount</source> + <translation>Betrag kopieren</translation> + </message> </context> <context> <name>ReceiveRequestDialog</name> @@ -1367,6 +1874,73 @@ <source>&Save Image...</source> <translation>Grafik &speichern...</translation> </message> + <message> + <source>Request payment to %1</source> + <translation>Zahlung anfordern an %1</translation> + </message> + <message> + <source>Payment information</source> + <translation>Zahlungsinformationen</translation> + </message> + <message> + <source>URI</source> + <translation>URI</translation> + </message> + <message> + <source>Address</source> + <translation>Adresse</translation> + </message> + <message> + <source>Amount</source> + <translation>Betrag</translation> + </message> + <message> + <source>Label</source> + <translation>Bezeichnung</translation> + </message> + <message> + <source>Message</source> + <translation>Nachricht</translation> + </message> + <message> + <source>Resulting URI too long, try to reduce the text for label / message.</source> + <translation>Resultierende URI ist zu lang, bitte den Text für Bezeichnung/Nachricht kürzen.</translation> + </message> + <message> + <source>Error encoding URI into QR Code.</source> + <translation>Beim Enkodieren der URI in den QR-Code ist ein Fehler aufgetreten.</translation> + </message> +</context> +<context> + <name>RecentRequestsTableModel</name> + <message> + <source>Date</source> + <translation>Datum</translation> + </message> + <message> + <source>Label</source> + <translation>Bezeichnung</translation> + </message> + <message> + <source>Message</source> + <translation>Nachricht</translation> + </message> + <message> + <source>(no label)</source> + <translation>(keine Bezeichnung)</translation> + </message> + <message> + <source>(no message)</source> + <translation>(keine Nachricht)</translation> + </message> + <message> + <source>(no amount requested)</source> + <translation>(kein Betrag angefordert)</translation> + </message> + <message> + <source>Requested</source> + <translation>Angefordert</translation> + </message> </context> <context> <name>SendCoinsDialog</name> @@ -1403,10 +1977,6 @@ <translation>Betrag:</translation> </message> <message> - <source>Priority:</source> - <translation>Priorität:</translation> - </message> - <message> <source>Fee:</source> <translation>Gebühr:</translation> </message> @@ -1475,10 +2045,6 @@ <translation>(Intelligente Gebührenlogik ist noch nicht verfügbar. Normalerweise dauert dies einige Blöcke lang...)</translation> </message> <message> - <source>Confirmation time:</source> - <translation>Bestätigungszeit:</translation> - </message> - <message> <source>normal</source> <translation>normal</translation> </message> @@ -1503,6 +2069,10 @@ <translation>"Dust":</translation> </message> <message> + <source>Confirmation time target:</source> + <translation>Gewünschte Bestätigungszeit:</translation> + </message> + <message> <source>Clear &All</source> <translation>&Zurücksetzen</translation> </message> @@ -1518,6 +2088,122 @@ <source>S&end</source> <translation>&Überweisen</translation> </message> + <message> + <source>Copy quantity</source> + <translation>Anzahl kopieren</translation> + </message> + <message> + <source>Copy amount</source> + <translation>Betrag kopieren</translation> + </message> + <message> + <source>Copy fee</source> + <translation>Gebühr kopieren</translation> + </message> + <message> + <source>Copy after fee</source> + <translation>Abzüglich Gebühr kopieren</translation> + </message> + <message> + <source>Copy bytes</source> + <translation>Byte kopieren</translation> + </message> + <message> + <source>Copy dust</source> + <translation>"Staub" kopieren</translation> + </message> + <message> + <source>Copy change</source> + <translation>Wechselgeld kopieren</translation> + </message> + <message> + <source>%1 to %2</source> + <translation>%1 an %2</translation> + </message> + <message> + <source>Are you sure you want to send?</source> + <translation>Wollen Sie die Überweisung ausführen?</translation> + </message> + <message> + <source>added as transaction fee</source> + <translation>als Transaktionsgebühr hinzugefügt</translation> + </message> + <message> + <source>Total Amount %1</source> + <translation>Gesamtbetrag %1</translation> + </message> + <message> + <source>or</source> + <translation>oder</translation> + </message> + <message> + <source>Confirm send coins</source> + <translation>Überweisung bestätigen</translation> + </message> + <message> + <source>The recipient address is not valid. Please recheck.</source> + <translation>Die Zahlungsadresse ist ungültig, bitte nochmals überprüfen.</translation> + </message> + <message> + <source>The amount to pay must be larger than 0.</source> + <translation>Der zu zahlende Betrag muss größer als 0 sein.</translation> + </message> + <message> + <source>The amount exceeds your balance.</source> + <translation>Der angegebene Betrag übersteigt Ihren Kontostand.</translation> + </message> + <message> + <source>The total exceeds your balance when the %1 transaction fee is included.</source> + <translation>Der angegebene Betrag übersteigt aufgrund der Transaktionsgebühr in Höhe von %1 Ihren Kontostand.</translation> + </message> + <message> + <source>Duplicate address found: addresses should only be used once each.</source> + <translation>Doppelte Adresse entdeckt: Adressen dürfen jeweils nur einmal vorkommen.</translation> + </message> + <message> + <source>Transaction creation failed!</source> + <translation>Transaktionserstellung fehlgeschlagen!</translation> + </message> + <message> + <source>The transaction was rejected with the following reason: %1</source> + <translation>Die Transaktion wurde aus folgendem Grund abgelehnt: %1</translation> + </message> + <message> + <source>A fee higher than %1 is considered an absurdly high fee.</source> + <translation>Eine höhere Gebühr als %1 wird als unsinnig hohe Gebühr angesehen.</translation> + </message> + <message> + <source>Payment request expired.</source> + <translation>Zahlungsanforderung abgelaufen.</translation> + </message> + <message numerus="yes"> + <source>%n block(s)</source> + <translation><numerusform>%n Block</numerusform><numerusform>%n Blöcke</numerusform></translation> + </message> + <message> + <source>Pay only the required fee of %1</source> + <translation>Nur die notwendige Gebühr in Höhe von %1 zahlen</translation> + </message> + <message numerus="yes"> + <source>Estimated to begin confirmation within %n block(s).</source> + <translation><numerusform>Voraussichtlicher Beginn der Bestätigung innerhalb von %n Block.</numerusform><numerusform>Voraussichtlicher Beginn der Bestätigung innerhalb von %n Blöcken.</numerusform></translation> + </message> + <message> + <source>Warning: Invalid Bitcoin address</source> + <translation>Warnung: Ungültige Bitcoin-Adresse</translation> + </message> + <message> + <source>Warning: Unknown change address</source> + <translation>Warnung: Unbekannte Wechselgeld-Adresse</translation> + </message> + <message> + <source>Confirm custom change address</source> + <translation>Bestätige benutzerdefinierte Wechselgeld-Adresse</translation> + </message> + <message> + <source>(no label)</source> + <translation>(keine Bezeichnung)</translation> + </message> </context> <context> <name>SendCoinsEntry</name> @@ -1597,6 +2283,17 @@ <source>Memo:</source> <translation>Memo:</translation> </message> + <message> + <source>Enter a label for this address to add it to your address book</source> + <translation>Geben Sie eine Bezeichnung für diese Adresse ein, um sie zu Ihrem Adressbuch hinzuzufügen</translation> + </message> +</context> +<context> + <name>SendConfirmationDialog</name> + <message> + <source>Yes</source> + <translation>Ja</translation> + </message> </context> <context> <name>ShutdownWindow</name> @@ -1695,6 +2392,58 @@ <source>Reset all verify message fields</source> <translation>Alle "Nachricht verifizieren"-Felder zurücksetzen</translation> </message> + <message> + <source>Click "Sign Message" to generate signature</source> + <translation>Auf "Nachricht signieren" klicken, um die Signatur zu erzeugen</translation> + </message> + <message> + <source>The entered address is invalid.</source> + <translation>Die eingegebene Adresse ist ungültig.</translation> + </message> + <message> + <source>Please check the address and try again.</source> + <translation>Bitte überprüfen Sie die Adresse und versuchen Sie es erneut.</translation> + </message> + <message> + <source>The entered address does not refer to a key.</source> + <translation>Die eingegebene Adresse verweist nicht auf einen Schlüssel.</translation> + </message> + <message> + <source>Wallet unlock was cancelled.</source> + <translation>Wallet-Entsperrung wurde abgebrochen.</translation> + </message> + <message> + <source>Private key for the entered address is not available.</source> + <translation>Privater Schlüssel zur eingegebenen Adresse ist nicht verfügbar.</translation> + </message> + <message> + <source>Message signing failed.</source> + <translation>Signierung der Nachricht fehlgeschlagen.</translation> + </message> + <message> + <source>Message signed.</source> + <translation>Nachricht signiert.</translation> + </message> + <message> + <source>The signature could not be decoded.</source> + <translation>Die Signatur konnte nicht dekodiert werden.</translation> + </message> + <message> + <source>Please check the signature and try again.</source> + <translation>Bitte überprüfen Sie die Signatur und versuchen Sie es erneut.</translation> + </message> + <message> + <source>The signature did not match the message digest.</source> + <translation>Die Signatur entspricht nicht dem "Message Digest".</translation> + </message> + <message> + <source>Message verification failed.</source> + <translation>Verifikation der Nachricht fehlgeschlagen.</translation> + </message> + <message> + <source>Message verified.</source> + <translation>Nachricht verifiziert.</translation> + </message> </context> <context> <name>SplashScreen</name> @@ -1711,11 +2460,460 @@ </message> </context> <context> + <name>TransactionDesc</name> + <message numerus="yes"> + <source>Open for %n more block(s)</source> + <translation><numerusform>Offen für %n weiteren Block</numerusform><numerusform>Offen für %n weitere Blöcke</numerusform></translation> + </message> + <message> + <source>Open until %1</source> + <translation>Offen bis %1</translation> + </message> + <message> + <source>conflicted with a transaction with %1 confirmations</source> + <translation>steht im Konflikt mit einer Transaktion mit %1 Bestätigungen</translation> + </message> + <message> + <source>%1/offline</source> + <translation>%1/offline</translation> + </message> + <message> + <source>0/unconfirmed, %1</source> + <translation>%1/unbestätigt</translation> + </message> + <message> + <source>in memory pool</source> + <translation>im Speicherpool</translation> + </message> + <message> + <source>not in memory pool</source> + <translation>nicht im Speicherpool</translation> + </message> + <message> + <source>abandoned</source> + <translation>eingestellt</translation> + </message> + <message> + <source>%1/unconfirmed</source> + <translation>%1/unbestätigt</translation> + </message> + <message> + <source>%1 confirmations</source> + <translation>%1 Bestätigungen</translation> + </message> + <message> + <source>Status</source> + <translation>Status</translation> + </message> + <message> + <source>, has not been successfully broadcast yet</source> + <translation>, wurde noch nicht erfolgreich übertragen</translation> + </message> + <message numerus="yes"> + <source>, broadcast through %n node(s)</source> + <translation><numerusform>, über %n Knoten übertragen</numerusform><numerusform>, über %n Knoten übertragen</numerusform></translation> + </message> + <message> + <source>Date</source> + <translation>Datum</translation> + </message> + <message> + <source>Source</source> + <translation>Quelle</translation> + </message> + <message> + <source>Generated</source> + <translation>Erzeugt</translation> + </message> + <message> + <source>From</source> + <translation>Von</translation> + </message> + <message> + <source>unknown</source> + <translation>unbekannt</translation> + </message> + <message> + <source>To</source> + <translation>An</translation> + </message> + <message> + <source>own address</source> + <translation>eigene Adresse</translation> + </message> + <message> + <source>watch-only</source> + <translation>beobachtet</translation> + </message> + <message> + <source>label</source> + <translation>Bezeichnung</translation> + </message> + <message> + <source>Credit</source> + <translation>Gutschrift</translation> + </message> + <message numerus="yes"> + <source>matures in %n more block(s)</source> + <translation><numerusform>reift noch %n weiteren Block</numerusform><numerusform>reift noch %n weitere Blöcke</numerusform></translation> + </message> + <message> + <source>not accepted</source> + <translation>nicht angenommen</translation> + </message> + <message> + <source>Debit</source> + <translation>Belastung</translation> + </message> + <message> + <source>Total debit</source> + <translation>Gesamtbelastung</translation> + </message> + <message> + <source>Total credit</source> + <translation>Gesamtgutschrift</translation> + </message> + <message> + <source>Transaction fee</source> + <translation>Transaktionsgebühr</translation> + </message> + <message> + <source>Net amount</source> + <translation>Nettobetrag</translation> + </message> + <message> + <source>Message</source> + <translation>Nachricht</translation> + </message> + <message> + <source>Comment</source> + <translation>Kommentar</translation> + </message> + <message> + <source>Transaction ID</source> + <translation>Transaktionskennung</translation> + </message> + <message> + <source>Transaction total size</source> + <translation>Gesamte Transaktionsgröße</translation> + </message> + <message> + <source>Output index</source> + <translation>Ausgabeindex</translation> + </message> + <message> + <source>Merchant</source> + <translation>Händler</translation> + </message> + <message> + <source>Generated coins must mature %1 blocks before they can be spent. When you generated this block, it was broadcast to the network to be added to the block chain. If it fails to get into the chain, its state will change to "not accepted" and it won't be spendable. This may occasionally happen if another node generates a block within a few seconds of yours.</source> + <translation>Erzeugte Bitcoins müssen %1 Blöcke lang reifen, bevor sie ausgegeben werden können. Als Sie diesen Block erzeugten, wurde er an das Netzwerk übertragen, um ihn der Blockkette hinzuzufügen. Falls dies fehlschlägt wird der Status in "nicht angenommen" geändert und Sie werden keine Bitcoins gutgeschrieben bekommen. Das kann gelegentlich passieren, wenn ein anderer Knoten einen Block fast zeitgleich erzeugt.</translation> + </message> + <message> + <source>Debug information</source> + <translation>Debuginformationen</translation> + </message> + <message> + <source>Transaction</source> + <translation>Transaktion</translation> + </message> + <message> + <source>Inputs</source> + <translation>Eingaben</translation> + </message> + <message> + <source>Amount</source> + <translation>Betrag</translation> + </message> + <message> + <source>true</source> + <translation>wahr</translation> + </message> + <message> + <source>false</source> + <translation>falsch</translation> + </message> +</context> +<context> <name>TransactionDescDialog</name> <message> <source>This pane shows a detailed description of the transaction</source> <translation>Dieser Bereich zeigt eine detaillierte Beschreibung der Transaktion an</translation> </message> + <message> + <source>Details for %1</source> + <translation>Details für %1</translation> + </message> +</context> +<context> + <name>TransactionTableModel</name> + <message> + <source>Date</source> + <translation>Datum</translation> + </message> + <message> + <source>Type</source> + <translation>Typ</translation> + </message> + <message> + <source>Label</source> + <translation>Bezeichnung</translation> + </message> + <message numerus="yes"> + <source>Open for %n more block(s)</source> + <translation><numerusform>Offen für %n weiteren Block</numerusform><numerusform>Offen für %n weitere Blöcke</numerusform></translation> + </message> + <message> + <source>Open until %1</source> + <translation>Offen bis %1</translation> + </message> + <message> + <source>Offline</source> + <translation>Offline</translation> + </message> + <message> + <source>Unconfirmed</source> + <translation>Unbestätigt</translation> + </message> + <message> + <source>Abandoned</source> + <translation>Eingestellt</translation> + </message> + <message> + <source>Confirming (%1 of %2 recommended confirmations)</source> + <translation>Wird bestätigt (%1 von %2 empfohlenen Bestätigungen)</translation> + </message> + <message> + <source>Confirmed (%1 confirmations)</source> + <translation>Bestätigt (%1 Bestätigungen)</translation> + </message> + <message> + <source>Conflicted</source> + <translation>in Konflikt stehend</translation> + </message> + <message> + <source>Immature (%1 confirmations, will be available after %2)</source> + <translation>Unreif (%1 Bestätigungen, wird verfügbar sein nach %2)</translation> + </message> + <message> + <source>This block was not received by any other nodes and will probably not be accepted!</source> + <translation>Dieser Block wurde vom Netzwerk nicht angenommen und wird wahrscheinlich nicht bestätigt werden!</translation> + </message> + <message> + <source>Generated but not accepted</source> + <translation>Generiert, aber nicht akzeptiert</translation> + </message> + <message> + <source>Received with</source> + <translation>Empfangen über</translation> + </message> + <message> + <source>Received from</source> + <translation>Empfangen von</translation> + </message> + <message> + <source>Sent to</source> + <translation>Überwiesen an</translation> + </message> + <message> + <source>Payment to yourself</source> + <translation>Eigenüberweisung</translation> + </message> + <message> + <source>Mined</source> + <translation>Erarbeitet</translation> + </message> + <message> + <source>watch-only</source> + <translation>beobachtet</translation> + </message> + <message> + <source>(n/a)</source> + <translation>(k.A.)</translation> + </message> + <message> + <source>(no label)</source> + <translation>(keine Bezeichnung)</translation> + </message> + <message> + <source>Transaction status. Hover over this field to show number of confirmations.</source> + <translation>Transaktionsstatus. Fahren Sie mit der Maus über dieses Feld, um die Anzahl der Bestätigungen zu sehen.</translation> + </message> + <message> + <source>Date and time that the transaction was received.</source> + <translation>Datum und Zeit als die Transaktion empfangen wurde.</translation> + </message> + <message> + <source>Type of transaction.</source> + <translation>Art der Transaktion</translation> + </message> + <message> + <source>Whether or not a watch-only address is involved in this transaction.</source> + <translation>Zeigt an, ob eine beobachtete Adresse in diese Transaktion involviert ist.</translation> + </message> + <message> + <source>User-defined intent/purpose of the transaction.</source> + <translation>Benutzerdefinierte Absicht bzw. Verwendungszweck der Transaktion</translation> + </message> + <message> + <source>Amount removed from or added to balance.</source> + <translation>Der Betrag, der dem Kontostand abgezogen oder hinzugefügt wurde.</translation> + </message> +</context> +<context> + <name>TransactionView</name> + <message> + <source>All</source> + <translation>Alle</translation> + </message> + <message> + <source>Today</source> + <translation>Heute</translation> + </message> + <message> + <source>This week</source> + <translation>Diese Woche</translation> + </message> + <message> + <source>This month</source> + <translation>Diesen Monat</translation> + </message> + <message> + <source>Last month</source> + <translation>Letzten Monat</translation> + </message> + <message> + <source>This year</source> + <translation>Dieses Jahr</translation> + </message> + <message> + <source>Range...</source> + <translation>Zeitraum...</translation> + </message> + <message> + <source>Received with</source> + <translation>Empfangen über</translation> + </message> + <message> + <source>Sent to</source> + <translation>Überwiesen an</translation> + </message> + <message> + <source>To yourself</source> + <translation>Eigenüberweisung</translation> + </message> + <message> + <source>Mined</source> + <translation>Erarbeitet</translation> + </message> + <message> + <source>Other</source> + <translation>Andere</translation> + </message> + <message> + <source>Enter address or label to search</source> + <translation>Zu suchende Adresse oder Bezeichnung eingeben</translation> + </message> + <message> + <source>Min amount</source> + <translation>Mindestbetrag</translation> + </message> + <message> + <source>Abandon transaction</source> + <translation>Transaktion einstellen</translation> + </message> + <message> + <source>Copy address</source> + <translation>Adresse kopieren</translation> + </message> + <message> + <source>Copy label</source> + <translation>Bezeichnung kopieren</translation> + </message> + <message> + <source>Copy amount</source> + <translation>Betrag kopieren</translation> + </message> + <message> + <source>Copy transaction ID</source> + <translation>Transaktionskennung kopieren</translation> + </message> + <message> + <source>Copy raw transaction</source> + <translation>Rohe Transaktion kopieren</translation> + </message> + <message> + <source>Copy full transaction details</source> + <translation>Vollständige Transaktionsdetails kopieren</translation> + </message> + <message> + <source>Edit label</source> + <translation>Bezeichnung bearbeiten</translation> + </message> + <message> + <source>Show transaction details</source> + <translation>Transaktionsdetails anzeigen</translation> + </message> + <message> + <source>Export Transaction History</source> + <translation>Transaktionsverlauf exportieren</translation> + </message> + <message> + <source>Comma separated file (*.csv)</source> + <translation>Kommagetrennte-Datei (*.csv)</translation> + </message> + <message> + <source>Confirmed</source> + <translation>Bestätigt</translation> + </message> + <message> + <source>Watch-only</source> + <translation>Nur beobachten</translation> + </message> + <message> + <source>Date</source> + <translation>Datum</translation> + </message> + <message> + <source>Type</source> + <translation>Typ</translation> + </message> + <message> + <source>Label</source> + <translation>Bezeichnung</translation> + </message> + <message> + <source>Address</source> + <translation>Adresse</translation> + </message> + <message> + <source>ID</source> + <translation>ID</translation> + </message> + <message> + <source>Exporting Failed</source> + <translation>Exportieren fehlgeschlagen</translation> + </message> + <message> + <source>There was an error trying to save the transaction history to %1.</source> + <translation>Beim Speichern des Transaktionsverlaufs nach %1 ist ein Fehler aufgetreten.</translation> + </message> + <message> + <source>Exporting Successful</source> + <translation>Exportieren erfolgreich</translation> + </message> + <message> + <source>The transaction history was successfully saved to %1.</source> + <translation>Speichern des Transaktionsverlaufs nach %1 war erfolgreich.</translation> + </message> + <message> + <source>Range:</source> + <translation>Zeitraum:</translation> + </message> + <message> + <source>to</source> + <translation>bis</translation> + </message> </context> <context> <name>UnitDisplayStatusBarControl</name> @@ -1725,6 +2923,55 @@ </message> </context> <context> + <name>WalletFrame</name> + <message> + <source>No wallet has been loaded.</source> + <translation>Es wurde keine Wallet geladen.</translation> + </message> +</context> +<context> + <name>WalletModel</name> + <message> + <source>Send Coins</source> + <translation>Bitcoins überweisen</translation> + </message> +</context> +<context> + <name>WalletView</name> + <message> + <source>&Export</source> + <translation>E&xportieren</translation> + </message> + <message> + <source>Export the data in the current tab to a file</source> + <translation>Daten der aktuellen Ansicht in eine Datei exportieren</translation> + </message> + <message> + <source>Backup Wallet</source> + <translation>Wallet sichern</translation> + </message> + <message> + <source>Wallet Data (*.dat)</source> + <translation>Wallet-Daten (*.dat)</translation> + </message> + <message> + <source>Backup Failed</source> + <translation>Sicherung fehlgeschlagen</translation> + </message> + <message> + <source>There was an error trying to save the wallet data to %1.</source> + <translation>Beim Speichern der Wallet-Daten nach %1 ist ein Fehler aufgetreten.</translation> + </message> + <message> + <source>Backup Successful</source> + <translation>Sicherung erfolgreich</translation> + </message> + <message> + <source>The wallet data was successfully saved to %1.</source> + <translation>Speichern der Wallet-Daten nach %1 war erfolgreich.</translation> + </message> +</context> +<context> <name>bitcoin-core</name> <message> <source>Options:</source> @@ -1747,6 +2994,14 @@ <translation>Kommandozeilen- und JSON-RPC-Befehle annehmen</translation> </message> <message> + <source>Accept connections from outside (default: 1 if no -proxy or -connect/-noconnect)</source> + <translation>Eingehende Verbindungen annehmen (Standard: 1, wenn nicht -proxy oder -connect/-noconnect)</translation> + </message> + <message> + <source>Distributed under the MIT software license, see the accompanying file %s or %s</source> + <translation>Veröffentlicht unter der MIT-Softwarelizenz, siehe beiligende Datei %s oder %s.</translation> + </message> + <message> <source>If <category> is not supplied or if <category> = 1, output all debugging information.</source> <translation>Wenn <category> nicht angegeben wird oder <category>=1, jegliche Debugginginformationen ausgeben.</translation> </message> @@ -1755,8 +3010,12 @@ <translation>Kürzungsmodus wurde kleiner als das Minimum in Höhe von %d MiB konfiguriert. Bitte verwenden Sie einen größeren Wert.</translation> </message> <message> - <source>Reduce storage requirements by pruning (deleting) old blocks. This mode is incompatible with -txindex and -rescan. Warning: Reverting this setting requires re-downloading the entire blockchain. (default: 0 = disable pruning blocks, >%u = target size in MiB to use for block files)</source> - <translation>Speicherplatzanforderung durch kürzen (löschen) alter Blöcke reduzieren. Dieser Modus ist nicht mit -txindex und -rescan kompatibel. Warnung: Die Umkehr dieser Einstellung erfordert das erneute Herunterladen der gesamten Blockkette. (Standard: 0 = deaktiviert das Kürzen von Blöcken, >%u = Zielgröße in MiB, die für Blockdateien verwendet werden darf)</translation> + <source>Prune: last wallet synchronisation goes beyond pruned data. You need to -reindex (download the whole blockchain again in case of pruned node)</source> + <translation>Prune (Kürzung): Die letzte Syncronisation der Wallet liegt vor gekürzten (gelöschten) Blöcken. Es ist ein -reindex (download der gesamten Blockkette) notwendig.</translation> + </message> + <message> + <source>Rescans are not possible in pruned mode. You will need to use -reindex which will download the whole blockchain again.</source> + <translation>Rescans sind im pruned mode nicht möglich. Ein -reindex ist notwendig, welcher die gesmate Blockkette erneut herunterlädt.</translation> </message> <message> <source>Error: A fatal internal error occurred, see debug.log for details</source> @@ -1779,22 +3038,22 @@ <translation>Kann HTTP Server nicht starten. Siehe debug log für Details.</translation> </message> <message> - <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> - <translation>Eingehende Verbindungen annehmen (Standard: 1, wenn nicht -proxy oder -connect)</translation> - </message> - <message> <source>Bitcoin Core</source> <translation>Bitcoin Core</translation> </message> <message> - <source>-fallbackfee is set very high! This is the transaction fee you may pay when fee estimates are not available.</source> - <translation>-fallbackfee ist sehr hoch eingestellt! Das ist die Transaktionsgebühr, welche du zahlen müsstest, wenn die Gebührenschätzungen nicht verfügbar sind.</translation> + <source>The %s developers</source> + <translation>Die %s-Entwickler</translation> </message> <message> <source>A fee rate (in %s/kB) that will be used when fee estimation has insufficient data (default: %s)</source> <translation>Eine Transaktionsgebühr (in %s/kB) wird genutzt, wenn für die Gebührenschützung zu wenig Daten vorliegen (Standardwert: %s)</translation> </message> <message> + <source>Accept relayed transactions received from whitelisted peers even when not relaying transactions (default: %d)</source> + <translation>Geben Sie immer die Transaktionen, die Sie von freigegebenen Peers erhalten haben, weiter (Voreinstellung: %d)</translation> + </message> + <message> <source>Bind to given address and always listen on it. Use [host]:port notation for IPv6</source> <translation>An die angegebene Adresse binden und immer abhören. Für IPv6 "[Host]:Port"-Notation verwenden</translation> </message> @@ -1807,16 +3066,20 @@ <translation>Alle Wallet-Transaktionen löschen und nur diese Teilbereiche der Blockkette durch -rescan beim Starten wiederherstellen</translation> </message> <message> - <source>Distributed under the MIT software license, see the accompanying file COPYING or <http://www.opensource.org/licenses/mit-license.php>.</source> - <translation>Veröffentlicht unter der MIT-Softwarelizenz, siehe beiligende Datei COPYING oder <http://www.opensource.org/licenses/mit-license.php>.</translation> + <source>Error reading %s! All keys read correctly, but transaction data or address book entries might be missing or incorrect.</source> + <translation>Lesen von %s fehlgeschlagen! Alle Schlüssel wurden korrekt gelesen, Transaktionsdaten bzw. Adressbucheinträge fehlen aber möglicherweise oder sind inkorrekt.</translation> </message> <message> <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source> <translation>Befehl ausführen wenn sich eine Wallet-Transaktion verändert (%s im Befehl wird durch die Transaktions-ID ersetzt)</translation> </message> <message> - <source>Force relay of transactions from whitelisted peers even they violate local relay policy (default: %d)</source> - <translation>Leite Transaktionen von Peers auf der Positivliste auf jeden Fall weiter, auch wenn sie die lokale Weiterleitungsregeln verletzen (Standardeinstellung: %d)</translation> + <source>Maximum allowed median peer time offset adjustment. Local perspective of time may be influenced by peers forward or backward by this amount. (default: %u seconds)</source> + <translation>Maximum allowed median peer time offset adjustment. Local perspective of time may be influenced by peers forward or backward by this amount. (default: %u seconds)</translation> + </message> + <message> + <source>Maximum total fees (in %s) to use in a single wallet transaction or raw transaction; setting this too low may abort large transactions (default: %s)</source> + <translation>Maximale Gesamtgebühr (in %s) in einer Börsentransaktion; wird dies zu niedrig gesetzten können große Transaktionen abgebrochen werden (Standard: %s)</translation> </message> <message> <source>Please check that your computer's date and time are correct! If your clock is wrong, %s will not work properly.</source> @@ -1839,10 +3102,18 @@ <translation>Dies ist eine Vorab-Testversion - Verwendung auf eigene Gefahr - nicht für Mining- oder Handelsanwendungen nutzen!</translation> </message> <message> + <source>Unable to rewind the database to a pre-fork state. You will need to redownload the blockchain</source> + <translation>Sie müssen die Datenbank mit Hilfe von -reindex neu aufbauen, um zum ungekürzten Modus zurückzukehren. Dies erfordert, dass die gesamte Blockkette erneut heruntergeladen wird.</translation> + </message> + <message> <source>Use UPnP to map the listening port (default: 1 when listening and no -proxy)</source> <translation>UPnP verwenden, um eine Portweiterleitung einzurichten (Standard: 1, wenn abgehört wird und -proxy nicht gesetzt ist)</translation> </message> <message> + <source>Username and hashed password for JSON-RPC connections. The field <userpw> comes in the format: <USERNAME>:<SALT>$<HASH>. A canonical python script is included in share/rpcuser. The client then connects normally using the rpcuser=<USERNAME>/rpcpassword=<PASSWORD> pair of arguments. This option can be specified multiple times</source> + <translation>Benutzername und gehashtes Passwort für JSON-RPC Verbindungen. Das Feld <userpw> kommt im Format: <USERNAME>:<SALT>$<HASH>. Ein kanonisches Pythonskript ist in share/rpcuser inbegriffen. Der client benutzt wie gehabt, die rpcuser/rpcpassword Parameter. Diese Option kann mehrere Male spezifiziert werden</translation> + </message> + <message> <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source> <translation>Warnung: Das Netzwerk scheint nicht vollständig übereinzustimmen! Einige Miner scheinen Probleme zu haben.</translation> </message> @@ -1851,10 +3122,6 @@ <translation>Warnung: Wir scheinen nicht vollständig mit unseren Gegenstellen übereinzustimmen! Sie oder die anderen Knoten müssen unter Umständen Ihre Client-Software aktualisieren.</translation> </message> <message> - <source>Whitelist peers connecting from the given netmask or IP address. Can be specified multiple times.</source> - <translation>Gegenstellen die sich von der angegebenen Netzmaske oder IP-Adresse aus verbinden immer zulassen. Kann mehrmals angegeben werden.</translation> - </message> - <message> <source>You need to rebuild the database using -reindex-chainstate to change -txindex</source> <translation>Sie müssen die Datenbank mit Hilfe von -reindex-chainstate neu aufbauen, um -txindex zu verändern</translation> </message> @@ -1887,8 +3154,8 @@ <translation>Kann Adresse in -%s nicht auflösen: '%s'</translation> </message> <message> - <source>Connect only to the specified node(s)</source> - <translation>Mit nur dem oder den angegebenen Knoten verbinden</translation> + <source>Change index out of range</source> + <translation>Position des Wechselgelds außerhalb des Bereichs</translation> </message> <message> <source>Connection options:</source> @@ -1931,6 +3198,10 @@ <translation>Aktiviere das Veröffentlichen der Roh-Transaktion in <address></translation> </message> <message> + <source>Enable transaction replacement in the memory pool (default: %u)</source> + <translation>Maximal <n> nicht-verbindbare Transaktionen im Speicher halten (Standard: %u)</translation> + </message> + <message> <source>Error initializing block database</source> <translation>Fehler beim Initialisieren der Blockdatenbank</translation> </message> @@ -1975,6 +3246,10 @@ <translation>Fehlerhafter oder kein Genesis-Block gefunden. Falsches Datenverzeichnis für das Netzwerk?</translation> </message> <message> + <source>Initialization sanity check failed. %s is shutting down.</source> + <translation>Initialisierungsplausibilitätsprüfung fehlgeschlagen. %s wird beendet.</translation> + </message> + <message> <source>Invalid -onion address: '%s'</source> <translation>Ungültige "-onion"-Adresse: '%s'</translation> </message> @@ -2023,6 +3298,18 @@ <translation>Kürzungsmodus ist nicht mit -txindex kompatibel.</translation> </message> <message> + <source>Rebuild chain state and block index from the blk*.dat files on disk</source> + <translation>Blockkettenindex aus aktuellen Dateien blk000??.dat beim Starten wiederaufbauen</translation> + </message> + <message> + <source>Rebuild chain state from the currently indexed blocks</source> + <translation>Blockkettenindex aus aktuellen Dateien blk000??.dat wiederaufbauen</translation> + </message> + <message> + <source>Rewinding blocks...</source> + <translation>Verifiziere Blöcke...</translation> + </message> + <message> <source>Set database cache size in megabytes (%d to %d, default: %d)</source> <translation>Größe des Datenbankcaches in Megabyte festlegen (%d bis %d, Standard: %d)</translation> </message> @@ -2059,6 +3346,10 @@ <translation>UPnP verwenden, um eine Portweiterleitung einzurichten (Standard: %u)</translation> </message> <message> + <source>Use the test chain</source> + <translation>Die Testchain verwenden</translation> + </message> + <message> <source>User Agent comment (%s) contains unsafe characters.</source> <translation>Der User Agent Kommentar (%s) enthält unsichere Zeichen.</translation> </message> @@ -2075,6 +3366,14 @@ <translation>Wallet %s liegt außerhalb des Datenverzeichnisses %s</translation> </message> <message> + <source>Wallet debugging/testing options:</source> + <translation>Wallet Debugging-/Testoptionen:</translation> + </message> + <message> + <source>Wallet needed to be rewritten: restart %s to complete</source> + <translation>Wallet musste neu geschrieben werden: starten Sie %s zur Fertigstellung neu</translation> + </message> + <message> <source>Wallet options:</source> <translation>Wallet-Optionen:</translation> </message> @@ -2123,10 +3422,6 @@ <translation>Maximale Datengröße in "Data Carrier"-Transaktionen die weitergeleitet und erarbeitet werden (Standard: %u)</translation> </message> <message> - <source>Query for peer addresses via DNS lookup, if low on addresses (default: 1 unless -connect)</source> - <translation>Adressen von Gegenstellen via DNS-Namensauflösung finden, falls zu wenige Adressen verfügbar sind (Standard: 1, außer bei -connect)</translation> - </message> - <message> <source>Randomize credentials for every proxy connection. This enables Tor stream isolation (default: %u)</source> <translation>Zufällige Anmeldedaten für jede Proxyverbindung verwenden. Dies aktiviert Tor-Datenflussisolation (Standard: %u)</translation> </message> @@ -2139,8 +3434,8 @@ <translation>Der Transaktionsbetrag ist zum senden zu niedrig, nachdem die Gebühr abgezogen wurde.</translation> </message> <message> - <source>This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit <https://www.openssl.org/> and cryptographic software written by Eric Young and UPnP software written by Thomas Bernard.</source> - <translation>Dieses Produkt enthält Software, die vom OpenSSL-Projekt zur Verwendung im OpenSSL-Toolkit <https://www.openssl.org/> entwickelt wird, sowie von Eric Young geschriebene kryptographische Software und von Thomas Bernard geschriebene UPnP-Software.</translation> + <source>Use hierarchical deterministic key generation (HD) after BIP32. Only has effect during wallet creation/first start</source> + <translation>Use hierarchical deterministic key generation (HD) after BIP32. Only has effect during wallet creation/first start</translation> </message> <message> <source>Whitelisted peers cannot be DoS banned and their transactions are always relayed, even if they are already in the mempool, useful e.g. for a gateway</source> @@ -2251,10 +3546,6 @@ <translation>Transaktionsbetrag zu niedrig</translation> </message> <message> - <source>Transaction amounts must be positive</source> - <translation>Transaktionsbeträge müssen positiv sein</translation> - </message> - <message> <source>Transaction too large for fee policy</source> <translation>Transaktion ist für die Gebührenrichtlinie zu groß</translation> </message> @@ -2319,18 +3610,22 @@ <translation>-maxtxfee ist auf einen sehr hohen Wert festgelegt! Gebühren dieser Höhe könnten für eine einzelne Transaktion bezahlt werden.</translation> </message> <message> - <source>-paytxfee is set very high! This is the transaction fee you will pay if you send a transaction.</source> - <translation>-paytxfee ist auf einen sehr hohen Wert festgelegt! Dies ist die Gebühr die beim Senden einer Transaktion fällig wird.</translation> - </message> - <message> <source>Do not keep transactions in the mempool longer than <n> hours (default: %u)</source> <translation>Die Transaktion nicht länger im Speicherpool behalten als <n> Stunden (Standard: %u)</translation> </message> <message> + <source>Equivalent bytes per sigop in transactions for relay and mining (default: %u)</source> + <translation>Maximale Datengröße in "Data Carrier"-Transaktionen die weitergeleitet und erarbeitet werden (Standard: %u)</translation> + </message> + <message> <source>Fees (in %s/kB) smaller than this are considered zero fee for transaction creation (default: %s)</source> <translation>Niedrigere Gebühren (in %s/Kb) als diese werden bei der Transaktionserstellung als gebührenfrei angesehen (Standard: %s)</translation> </message> <message> + <source>Force relay of transactions from whitelisted peers even if they violate local relay policy (default: %d)</source> + <translation>Leite Transaktionen von Peers auf der Positivliste auf jeden Fall weiter, auch wenn sie die lokale Weiterleitungsregeln verletzen (Standardeinstellung: %d)</translation> + </message> + <message> <source>How thorough the block verification of -checkblocks is (0-4, default: %u)</source> <translation>Legt fest, wie gründlich die Blockverifikation von -checkblocks ist (0-4, Standard: %u)</translation> </message> @@ -2347,6 +3642,18 @@ <translation>Debugginginformationen ausgeben (Standard: %u, <category> anzugeben ist optional)</translation> </message> <message> + <source>Query for peer addresses via DNS lookup, if low on addresses (default: 1 unless -connect/-noconnect)</source> + <translation>Adressen von Gegenstellen via DNS-Namensauflösung finden, falls zu wenige Adressen verfügbar sind (Standard: 1, außer bei -connect/-noconnect)</translation> + </message> + <message> + <source>Support filtering of blocks and transaction with bloom filters (default: %u)</source> + <translation>Unterstütze Blöcke und Transaktionen mit Bloomfiltern zu filtern (default: %u)</translation> + </message> + <message> + <source>This is the transaction fee you may pay when fee estimates are not available.</source> + <translation>Das ist die Transaktionsgebühr, welche du zahlen müsstest, wenn die Gebührenschätzungen nicht verfügbar sind.</translation> + </message> + <message> <source>Total length of network version string (%i) exceeds maximum length (%i). Reduce the number or size of uacomments.</source> <translation>Gesamtlänge des Netzwerkversionstrings (%i) erreicht die maximale Länge (%i). Reduzieren Sie die Nummer oder die Größe von uacomments.</translation> </message> @@ -2367,14 +3674,18 @@ <translation>Separaten SOCKS5-Proxy verwenden, um Gegenstellen über versteckte Tor-Dienste zu erreichen (Standard: %s)</translation> </message> <message> - <source>Username and hashed password for JSON-RPC connections. The field <userpw> comes in the format: <USERNAME>:<SALT>$<HASH>. A canonical python script is included in share/rpcuser. This option can be specified multiple times</source> - <translation>Benutzername und gehashtes Passwort für JSON-RPC Verbindungen. Das Feld <userpw> kommt im Format: <USERNAME>:<SALT>$<HASH>. Ein kanonisches Pythonskript ist in share/rpcuser inbegriffen. Diese Option kann mehrere Male spezifiziert werden</translation> - </message> - <message> <source>Warning: Unknown block versions being mined! It's possible unknown rules are in effect</source> <translation>Warnung: Unbekannte Blockversion wird durch Mining erzeugt! Es ist möglich, dass unbekannte Regeln in Kraft sind.</translation> </message> <message> + <source>Whitelist peers connecting from the given IP address (e.g. 1.2.3.4) or CIDR notated network (e.g. 1.2.3.0/24). Can be specified multiple times.</source> + <translation>Gegenstellen die sich von der angegebenen IP-Adresse (e.g. 1.2.3.4) oder CIDR Notation (eg. 1.2.3.0/24) aus verbinden immer zulassen. Kann mehrmals angegeben werden.</translation> + </message> + <message> + <source>%s is set very high!</source> + <translation>%s wurde sehr hoch Eingestellt!</translation> + </message> + <message> <source>(default: %s)</source> <translation>(Standard: %s)</translation> </message> @@ -2431,12 +3742,16 @@ <translation>Nicht-"P2SH-Multisig" weiterleiten (Standard: %u)</translation> </message> <message> + <source>Send transactions with full-RBF opt-in enabled (default: %u)</source> + <translation>Wähle alle zu sendenden Transaktionen als full-RBF (Standard: %u)</translation> + </message> + <message> <source>Set key pool size to <n> (default: %u)</source> <translation>Größe des Schlüsselpools festlegen auf <n> (Standard: %u)</translation> </message> <message> - <source>Set minimum block size in bytes (default: %u)</source> - <translation>Minimale Blockgröße in Byte festlegen (Standard: %u)</translation> + <source>Set maximum BIP141 block weight (default: %d)</source> + <translation>Maximales BIP141 Blockgewicht festlegen (Standard: %d)</translation> </message> <message> <source>Set the number of threads to service RPC calls (default: %d)</source> @@ -2459,10 +3774,22 @@ <translation>Unbestätigtes Wechselgeld darf beim Senden von Transaktionen ausgegeben werden (Standard: %u)</translation> </message> <message> + <source>This is the minimum transaction fee you pay on every transaction.</source> + <translation>Dies ist die minimale Gebühr die beim Senden einer Transaktion fällig wird.</translation> + </message> + <message> + <source>This is the transaction fee you will pay if you send a transaction.</source> + <translation>Dies ist die Gebühr die beim Senden einer Transaktion fällig wird.</translation> + </message> + <message> <source>Threshold for disconnecting misbehaving peers (default: %u)</source> <translation>Schwellenwert, um Verbindungen zu sich nicht konform verhaltenden Gegenstellen zu beenden (Standard: %u)</translation> </message> <message> + <source>Transaction amounts must not be negative</source> + <translation>Transaktionsbeträge dürfen nicht negativ sein.</translation> + </message> + <message> <source>Unknown network specified in -onlynet: '%s'</source> <translation>Unbekannter Netztyp in -onlynet angegeben: '%s'</translation> </message> diff --git a/src/qt/locale/bitcoin_el.ts b/src/qt/locale/bitcoin_el.ts index de76a110cf..61e5a1cec8 100644 --- a/src/qt/locale/bitcoin_el.ts +++ b/src/qt/locale/bitcoin_el.ts @@ -7,6 +7,9 @@ </message> </context> <context> + <name>AddressTableModel</name> + </context> +<context> <name>AskPassphraseDialog</name> <message> <source>Enter passphrase</source> @@ -20,7 +23,7 @@ <source>Repeat new passphrase</source> <translation>Επαναλάβετε νέο συνθηματικό</translation> </message> -</context> + </context> <context> <name>BanTableModel</name> </context> @@ -56,7 +59,7 @@ <source>&Address</source> <translation>Διεύθυνση</translation> </message> -</context> + </context> <context> <name>FreespaceChecker</name> </context> @@ -79,6 +82,9 @@ </message> </context> <context> + <name>ModalOverlay</name> + </context> +<context> <name>OpenURIDialog</name> </context> <context> @@ -92,12 +98,21 @@ <name>OverviewPage</name> </context> <context> + <name>PaymentServer</name> + </context> +<context> <name>PeerTableModel</name> </context> <context> <name>QObject</name> </context> <context> + <name>QObject::QObject</name> + </context> +<context> + <name>QRImageWidget</name> + </context> +<context> <name>RPCConsole</name> <message> <source>Services</source> @@ -110,11 +125,14 @@ <source>Remove</source> <translation>Αφαίρεση</translation> </message> -</context> + </context> <context> <name>ReceiveRequestDialog</name> </context> <context> + <name>RecentRequestsTableModel</name> + </context> +<context> <name>SendCoinsDialog</name> <message> <source>Insufficient funds!</source> @@ -133,6 +151,9 @@ </message> </context> <context> + <name>SendConfirmationDialog</name> + </context> +<context> <name>ShutdownWindow</name> </context> <context> @@ -145,12 +166,30 @@ <name>TrafficGraphWidget</name> </context> <context> + <name>TransactionDesc</name> + </context> +<context> <name>TransactionDescDialog</name> </context> <context> + <name>TransactionTableModel</name> + </context> +<context> + <name>TransactionView</name> + </context> +<context> <name>UnitDisplayStatusBarControl</name> </context> <context> + <name>WalletFrame</name> + </context> +<context> + <name>WalletModel</name> + </context> +<context> + <name>WalletView</name> + </context> +<context> <name>bitcoin-core</name> <message> <source>Insufficient funds</source> diff --git a/src/qt/locale/bitcoin_el_GR.ts b/src/qt/locale/bitcoin_el_GR.ts index 2814e4f6e7..0390a378e7 100644 --- a/src/qt/locale/bitcoin_el_GR.ts +++ b/src/qt/locale/bitcoin_el_GR.ts @@ -41,7 +41,10 @@ <source>&Delete</source> <translation>&Διαγραφή</translation> </message> -</context> + </context> +<context> + <name>AddressTableModel</name> + </context> <context> <name>AskPassphraseDialog</name> <message> @@ -60,7 +63,7 @@ <source>Repeat new passphrase</source> <translation>Επανέλαβε τον νέο κωδικό πρόσβασης</translation> </message> -</context> + </context> <context> <name>BanTableModel</name> </context> @@ -243,14 +246,6 @@ <translation>&Επιλογές γραμμής εντολών</translation> </message> <message> - <source>No block source available...</source> - <translation>Η πηγή του μπλοκ δεν ειναι διαθέσιμη... </translation> - </message> - <message> - <source>%1 and %2</source> - <translation>%1 και %2</translation> - </message> - <message> <source>%1 behind</source> <translation>%1 πίσω</translation> </message> @@ -328,7 +323,7 @@ <source>Wallet is <b>encrypted</b> and currently <b>locked</b></source> <translation>Το πορτοφόλι είναι <b>κρυπτογραφημένο</b> και <b>κλειδωμένο</b></translation> </message> -</context> + </context> <context> <name>CoinControlDialog</name> <message> @@ -348,10 +343,6 @@ <translation>Ποσό:</translation> </message> <message> - <source>Priority:</source> - <translation>Προτεραιότητα:</translation> - </message> - <message> <source>Fee:</source> <translation>Ταρίφα</translation> </message> @@ -403,11 +394,7 @@ <source>Confirmed</source> <translation>Επικυρωμένες</translation> </message> - <message> - <source>Priority</source> - <translation>Προτεραιότητα</translation> - </message> -</context> + </context> <context> <name>EditAddressDialog</name> <message> @@ -430,7 +417,7 @@ <source>&Address</source> <translation>&Διεύθυνση</translation> </message> -</context> + </context> <context> <name>FreespaceChecker</name> <message> @@ -509,6 +496,21 @@ </message> </context> <context> + <name>ModalOverlay</name> + <message> + <source>Form</source> + <translation>Φόρμα</translation> + </message> + <message> + <source>Last block time</source> + <translation>Χρόνος τελευταίου μπλοκ</translation> + </message> + <message> + <source>Hide</source> + <translation>Απόκρυψη</translation> + </message> + </context> +<context> <name>OpenURIDialog</name> <message> <source>Open URI</source> @@ -526,7 +528,7 @@ <source>Select payment request file</source> <translation>Επιλέξτε πληρωμή αρχείου αίτησης</translation> </message> -</context> + </context> <context> <name>OptionsDialog</name> <message> @@ -787,12 +789,11 @@ </message> </context> <context> + <name>PaymentServer</name> + </context> +<context> <name>PeerTableModel</name> - <message> - <source>Ping Time</source> - <translation>Χρόνος καθυστέρησης</translation> - </message> -</context> + </context> <context> <name>QObject</name> <message> @@ -831,7 +832,17 @@ <source>%1 ms</source> <translation>%1 ms</translation> </message> -</context> + <message> + <source>%1 and %2</source> + <translation>%1 και %2</translation> + </message> + </context> +<context> + <name>QObject::QObject</name> + </context> +<context> + <name>QRImageWidget</name> + </context> <context> <name>RPCConsole</name> <message> @@ -1053,7 +1064,7 @@ <source>Remove</source> <translation>Αφαίρεση</translation> </message> -</context> + </context> <context> <name>ReceiveRequestDialog</name> <message> @@ -1072,7 +1083,10 @@ <source>&Save Image...</source> <translation>&Αποθήκευση εικόνας...</translation> </message> -</context> + </context> +<context> + <name>RecentRequestsTableModel</name> + </context> <context> <name>SendCoinsDialog</name> <message> @@ -1108,10 +1122,6 @@ <translation>Ποσό:</translation> </message> <message> - <source>Priority:</source> - <translation>Προτεραιότητα:</translation> - </message> - <message> <source>Fee:</source> <translation>Ταρίφα</translation> </message> @@ -1160,10 +1170,6 @@ <translation>Προσαρμογή:</translation> </message> <message> - <source>Confirmation time:</source> - <translation>Χρόνος επικύρωσης:</translation> - </message> - <message> <source>normal</source> <translation>κανονικό</translation> </message> @@ -1203,7 +1209,7 @@ <source>S&end</source> <translation>Αποστολη</translation> </message> -</context> + </context> <context> <name>SendCoinsEntry</name> <message> @@ -1262,7 +1268,10 @@ <source>Memo:</source> <translation>Σημείωση:</translation> </message> -</context> + </context> +<context> + <name>SendConfirmationDialog</name> + </context> <context> <name>ShutdownWindow</name> <message> @@ -1348,7 +1357,7 @@ <source>Reset all verify message fields</source> <translation>Επαναφορά όλων επαλήθευμενων πεδίων μήνυματος </translation> </message> -</context> + </context> <context> <name>SplashScreen</name> <message> @@ -1364,12 +1373,21 @@ </message> </context> <context> + <name>TransactionDesc</name> + </context> +<context> <name>TransactionDescDialog</name> <message> <source>This pane shows a detailed description of the transaction</source> <translation>Αυτό το παράθυρο δείχνει μια λεπτομερή περιγραφή της συναλλαγής</translation> </message> -</context> + </context> +<context> + <name>TransactionTableModel</name> + </context> +<context> + <name>TransactionView</name> + </context> <context> <name>UnitDisplayStatusBarControl</name> <message> @@ -1378,6 +1396,15 @@ </message> </context> <context> + <name>WalletFrame</name> + </context> +<context> + <name>WalletModel</name> + </context> +<context> + <name>WalletView</name> + </context> +<context> <name>bitcoin-core</name> <message> <source>Options:</source> @@ -1404,10 +1431,6 @@ <translation>Εκτέλεση στο παρασκήνιο κι αποδοχή εντολών</translation> </message> <message> - <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> - <translation>Να δέχεσαι συνδέσεις από έξω(προεπιλογή:1)</translation> - </message> - <message> <source>Bitcoin Core</source> <translation>Bitcoin Core</translation> </message> @@ -1420,18 +1443,10 @@ <translation>Εκτέλεσε την εντολή όταν το καλύτερο μπλοκ αλλάξει(%s στην εντολή αντικαθίσταται από το hash του μπλοκ)</translation> </message> <message> - <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source> - <translation>Αυτό είναι ένα προ-τεστ κυκλοφορίας - χρησιμοποιήστε το με δική σας ευθύνη - δεν χρησιμοποιείτε για εξόρυξη ή για αλλες εφαρμογές</translation> - </message> - <message> <source>Block creation options:</source> <translation>Αποκλεισμός επιλογων δημιουργίας: </translation> </message> <message> - <source>Connect only to the specified node(s)</source> - <translation>Σύνδεση μόνο με ορισμένους κόμβους</translation> - </message> - <message> <source>Connection options:</source> <translation>Επιλογές σύνδεσης:</translation> </message> @@ -1552,10 +1567,6 @@ <translation>Το ποσό της συναλλαγής είναι πολύ μικρο </translation> </message> <message> - <source>Transaction amounts must be positive</source> - <translation>Τα ποσά των συναλλαγών πρέπει να είναι θετικα</translation> - </message> - <message> <source>Transaction too large</source> <translation>Η συναλλαγή ειναι πολύ μεγάλη </translation> </message> diff --git a/src/qt/locale/bitcoin_en.ts b/src/qt/locale/bitcoin_en.ts index 78eaf51002..f62f1e4a73 100644 --- a/src/qt/locale/bitcoin_en.ts +++ b/src/qt/locale/bitcoin_en.ts @@ -299,17 +299,17 @@ <context> <name>BitcoinGUI</name> <message> - <location filename="../bitcoingui.cpp" line="+356"/> + <location filename="../bitcoingui.cpp" line="+357"/> <source>Sign &message...</source> <translation>Sign &message...</translation> </message> <message> - <location line="+417"/> + <location line="+427"/> <source>Synchronizing with network...</source> <translation>Synchronizing with network...</translation> </message> <message> - <location line="-495"/> + <location line="-505"/> <source>&Overview</source> <translation>&Overview</translation> </message> @@ -419,12 +419,17 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+53"/> + <location line="+27"/> + <source>Syncing Headers (%1%)...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+37"/> <source>Reindexing blocks on disk...</source> <translation>Reindexing blocks on disk...</translation> </message> <message> - <location line="-497"/> + <location line="-508"/> <source>Send coins to a Bitcoin address</source> <translation>Send coins to a Bitcoin address</translation> </message> @@ -454,12 +459,12 @@ <translation>&Verify message...</translation> </message> <message> - <location line="+504"/> + <location line="+514"/> <source>Bitcoin</source> <translation>Bitcoin</translation> </message> <message> - <location line="-729"/> + <location line="-739"/> <source>Wallet</source> <translation>Wallet</translation> </message> @@ -552,7 +557,7 @@ </translation> </message> <message> - <location line="+49"/> + <location line="+60"/> <source>Indexing blocks on disk...</source> <translation type="unfinished"></translation> </message> @@ -561,13 +566,8 @@ <source>Processing blocks on disk...</source> <translation type="unfinished"></translation> </message> - <message> - <location line="+11"/> - <source>No block source available...</source> - <translation>No block source available...</translation> - </message> <message numerus="yes"> - <location line="+9"/> + <location line="+19"/> <source>Processed %n block(s) of transaction history.</source> <translation> <numerusform>Processed %n block of transaction history.</numerusform> @@ -610,7 +610,7 @@ <translation>Up to date</translation> </message> <message> - <location line="-428"/> + <location line="-438"/> <source>Show the %1 help message to get a list with possible Bitcoin command-line options</source> <translation type="unfinished"></translation> </message> @@ -620,7 +620,12 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+255"/> + <location line="+227"/> + <source>Connecting to peers...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+38"/> <source>Catching up...</source> <translation>Catching up...</translation> </message> @@ -685,7 +690,7 @@ <translation>Wallet is <b>encrypted</b> and currently <b>locked</b></translation> </message> <message> - <location filename="../bitcoin.cpp" line="+516"/> + <location filename="../bitcoin.cpp" line="+518"/> <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> <translation type="unfinished"></translation> </message> @@ -778,7 +783,7 @@ <translation type="unfinished">Confirmed</translation> </message> <message> - <location filename="../coincontroldialog.cpp" line="+54"/> + <location filename="../coincontroldialog.cpp" line="+55"/> <source>Copy address</source> <translation type="unfinished"></translation> </message> @@ -1078,7 +1083,7 @@ <translation>Use a custom data directory:</translation> </message> <message> - <location filename="../intro.cpp" line="+89"/> + <location filename="../intro.cpp" line="+94"/> <source>Error: Specified data directory "%1" cannot be created.</source> <translation type="unfinished"></translation> </message> @@ -1129,7 +1134,7 @@ <message> <location line="+7"/> <location line="+26"/> - <location filename="../modaloverlay.cpp" line="+136"/> + <location filename="../modaloverlay.cpp" line="+138"/> <source>Unknown...</source> <translation type="unfinished"></translation> </message> @@ -2528,7 +2533,7 @@ <name>SendCoinsDialog</name> <message> <location filename="../forms/sendcoinsdialog.ui" line="+14"/> - <location filename="../sendcoinsdialog.cpp" line="+553"/> + <location filename="../sendcoinsdialog.cpp" line="+554"/> <source>Send Coins</source> <translation>Send Coins</translation> </message> @@ -2854,7 +2859,17 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+11"/> + <location line="+3"/> + <source>Confirm custom change address</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+0"/> + <source>The address you selected for change is not part of this wallet. Any or all funds in your wallet may be sent to this address. Are you sure?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+21"/> <source>(no label)</source> <translation type="unfinished"></translation> </message> @@ -3852,7 +3867,7 @@ <context> <name>bitcoin-core</name> <message> - <location filename="../bitcoinstrings.cpp" line="+302"/> + <location filename="../bitcoinstrings.cpp" line="+318"/> <source>Options:</source> <translation>Options:</translation> </message> @@ -3877,7 +3892,7 @@ <translation>Accept command line and JSON-RPC commands</translation> </message> <message> - <location line="-205"/> + <location line="-221"/> <source>Accept connections from outside (default: 1 if no -proxy or -connect/-noconnect)</source> <translation type="unfinished"></translation> </message> @@ -3892,12 +3907,12 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+34"/> + <location line="+37"/> <source>If <category> is not supplied or if <category> = 1, output all debugging information.</source> <translation type="unfinished"></translation> </message> <message> - <location line="+32"/> + <location line="+36"/> <source>Prune configured below the minimum of %d MiB. Please use a higher number.</source> <translation type="unfinished"></translation> </message> @@ -3907,17 +3922,12 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+9"/> - <source>Reduce storage requirements by pruning (deleting) old blocks. This mode is incompatible with -txindex and -rescan. Warning: Reverting this setting requires re-downloading the entire blockchain. (default: 0 = disable pruning blocks, >%u = target size in MiB to use for block files)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+5"/> + <location line="+18"/> <source>Rescans are not possible in pruned mode. You will need to use -reindex which will download the whole blockchain again.</source> <translation type="unfinished"></translation> </message> <message> - <location line="+127"/> + <location line="+132"/> <source>Error: A fatal internal error occurred, see debug.log for details</source> <translation type="unfinished"></translation> </message> @@ -3942,7 +3952,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="-344"/> + <location line="-360"/> <source>Bitcoin Core</source> <translation type="unfinished">Bitcoin Core</translation> </message> @@ -3992,7 +4002,17 @@ <translation>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</translation> </message> <message> - <location line="+29"/> + <location line="+6"/> + <source>Extra transactions to keep in memory for compact block reconstructions (default: %u)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+20"/> + <source>If this block is in the chain assume that it and its ancestors are valid and potentially skip their script verification (0 to verify all, default: %s, testnet: %s)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+10"/> <source>Maximum allowed median peer time offset adjustment. Local perspective of time may be influenced by peers forward or backward by this amount. (default: %u seconds)</source> <translation type="unfinished"></translation> </message> @@ -4012,7 +4032,17 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+24"/> + <location line="+14"/> + <source>Reduce storage requirements by enabling pruning (deleting) of old blocks. This allows the pruneblockchain RPC to be called to delete specific blocks, and enables automatic pruning of old blocks if a target size in MiB is provided. This mode is incompatible with -txindex and -rescan. Warning: Reverting this setting requires re-downloading the entire blockchain. (default: 0 = disable pruning blocks, 1 = allow manual pruning via RPC, >%u = automatically prune block files to stay under the specified target size in MiB)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+12"/> + <source>Set lowest fee rate (in %s/kB) for transactions to be included in block creation. (default: %s)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+5"/> <source>Set the number of script verification threads (%u to %d, 0 = auto, <0 = leave that many cores free, default: %d)</source> <translation type="unfinished"></translation> </message> @@ -4037,7 +4067,12 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+12"/> + <location line="+8"/> + <source>Username and hashed password for JSON-RPC connections. The field <userpw> comes in the format: <USERNAME>:<SALT>$<HASH>. A canonical python script is included in share/rpcuser. The client then connects normally using the rpcuser=<USERNAME>/rpcpassword=<PASSWORD> pair of arguments. This option can be specified multiple times</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+6"/> <source>Wallet will not create transactions that violate mempool chain limits (default: %u)</source> <translation type="unfinished"></translation> </message> @@ -4382,7 +4417,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="-342"/> + <location line="-358"/> <source>Allow JSON-RPC connections from specified source. Valid for <ip> are a single IP (e.g. 1.2.3.4), a network/netmask (e.g. 1.2.3.4/255.255.255.0) or a network/CIDR (e.g. 1.2.3.4/24). This option can be specified multiple times</source> <translation type="unfinished"></translation> </message> @@ -4417,7 +4452,7 @@ <translation>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</translation> </message> <message> - <location line="+9"/> + <location line="+12"/> <source>Fees (in %s/kB) smaller than this are considered zero fee for relaying, mining and transaction creation (default: %s)</source> <translation type="unfinished"></translation> </message> @@ -4427,7 +4462,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+3"/> + <location line="+7"/> <source>Invalid amount for -maxtxfee=<amount>: '%s' (must be at least the minrelay fee of %s to prevent stuck transactions)</source> <translation type="unfinished"></translation> </message> @@ -4442,7 +4477,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+11"/> + <location line="+18"/> <source>Set maximum size of high-priority/low-fee transactions in bytes (default: %d)</source> <translation type="unfinished"></translation> </message> @@ -4457,7 +4492,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+29"/> + <location line="+31"/> <source>Whitelisted peers cannot be DoS banned and their transactions are always relayed, even if they are already in the mempool, useful e.g. for a gateway</source> <translation type="unfinished"></translation> </message> @@ -4647,12 +4682,12 @@ <translation>Password for JSON-RPC connections</translation> </message> <message> - <location line="-226"/> + <location line="-242"/> <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> <translation>Execute command when the best block changes (%s in cmd is replaced by block hash)</translation> </message> <message> - <location line="+154"/> + <location line="+170"/> <source>Allow DNS lookups for -addnode, -seednode and -connect</source> <translation>Allow DNS lookups for -addnode, -seednode and -connect</translation> </message> @@ -4662,7 +4697,7 @@ <translation>Loading addresses...</translation> </message> <message> - <location line="-275"/> + <location line="-291"/> <source>(1 = keep tx meta data e.g. account owner and payment request information, 2 = drop tx meta data)</source> <translation type="unfinished"></translation> </message> @@ -4682,7 +4717,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+21"/> + <location line="+24"/> <source>Fees (in %s/kB) smaller than this are considered zero fee for transaction creation (default: %s)</source> <translation type="unfinished"></translation> </message> @@ -4697,7 +4732,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+11"/> + <location line="+15"/> <source>Maintain a full transaction index, used by the getrawtransaction rpc call (default: %u)</source> <translation type="unfinished"></translation> </message> @@ -4717,7 +4752,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+19"/> + <location line="+26"/> <source>Sets the serialization of raw transaction or block hex returned in non-verbose mode, non-segwit(0) or segwit(1) (default: %d)</source> <translation type="unfinished"></translation> </message> @@ -4762,12 +4797,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+3"/> - <source>Username and hashed password for JSON-RPC connections. The field <userpw> comes in the format: <USERNAME>:<SALT>$<HASH>. A canonical python script is included in share/rpcuser. This option can be specified multiple times</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+10"/> + <location line="+15"/> <source>Warning: Unknown block versions being mined! It's possible unknown rules are in effect</source> <translation type="unfinished"></translation> </message> diff --git a/src/qt/locale/bitcoin_en_GB.ts b/src/qt/locale/bitcoin_en_GB.ts index 1893aaca09..8af5db3e64 100644 --- a/src/qt/locale/bitcoin_en_GB.ts +++ b/src/qt/locale/bitcoin_en_GB.ts @@ -41,6 +41,65 @@ <source>&Delete</source> <translation>&Delete</translation> </message> + <message> + <source>Choose the address to send coins to</source> + <translation>Choose the address to send coins to</translation> + </message> + <message> + <source>Choose the address to receive coins with</source> + <translation>Choose the address to receive coins with</translation> + </message> + <message> + <source>C&hoose</source> + <translation>C&hoose</translation> + </message> + <message> + <source>Sending addresses</source> + <translation>Sending addresses</translation> + </message> + <message> + <source>Receiving addresses</source> + <translation>Receiving addresses</translation> + </message> + <message> + <source>&Copy Address</source> + <translation>&Copy Address</translation> + </message> + <message> + <source>Copy &Label</source> + <translation>Copy &Label</translation> + </message> + <message> + <source>&Edit</source> + <translation>&Edit</translation> + </message> + <message> + <source>Export Address List</source> + <translation>Export Address List</translation> + </message> + <message> + <source>Comma separated file (*.csv)</source> + <translation>Comma separated file (*.csv)</translation> + </message> + <message> + <source>Exporting Failed</source> + <translation>Exporting Failed</translation> + </message> + </context> +<context> + <name>AddressTableModel</name> + <message> + <source>Label</source> + <translation>Label</translation> + </message> + <message> + <source>Address</source> + <translation>Address</translation> + </message> + <message> + <source>(no label)</source> + <translation>(no label)</translation> + </message> </context> <context> <name>AskPassphraseDialog</name> @@ -60,7 +119,11 @@ <source>Repeat new passphrase</source> <translation>Repeat new passphrase</translation> </message> -</context> + <message> + <source>Encrypt wallet</source> + <translation>Encrypt wallet</translation> + </message> + </context> <context> <name>BanTableModel</name> <message> @@ -270,34 +333,10 @@ <source>Processing blocks on disk...</source> <translation>Processing blocks on disk...</translation> </message> - <message> - <source>No block source available...</source> - <translation>No block source available...</translation> - </message> <message numerus="yes"> <source>Processed %n block(s) of transaction history.</source> <translation><numerusform>Processed %n block of transaction history.</numerusform><numerusform>Processed %n blocks of transaction history.</numerusform></translation> </message> - <message numerus="yes"> - <source>%n hour(s)</source> - <translation><numerusform>%n hour</numerusform><numerusform>%n hours</numerusform></translation> - </message> - <message numerus="yes"> - <source>%n day(s)</source> - <translation><numerusform>%n day</numerusform><numerusform>%n days</numerusform></translation> - </message> - <message numerus="yes"> - <source>%n week(s)</source> - <translation><numerusform>%n week</numerusform><numerusform>%n weeks</numerusform></translation> - </message> - <message> - <source>%1 and %2</source> - <translation>%1 and %2</translation> - </message> - <message numerus="yes"> - <source>%n year(s)</source> - <translation><numerusform>%n year</numerusform><numerusform>%n years</numerusform></translation> - </message> <message> <source>%1 behind</source> <translation>%1 behind</translation> @@ -384,7 +423,7 @@ <source>Wallet is <b>encrypted</b> and currently <b>locked</b></source> <translation>Wallet is <b>encrypted</b> and currently <b>locked</b></translation> </message> -</context> + </context> <context> <name>CoinControlDialog</name> <message> @@ -404,10 +443,6 @@ <translation>Amount:</translation> </message> <message> - <source>Priority:</source> - <translation>Priority:</translation> - </message> - <message> <source>Fee:</source> <translation>Fee:</translation> </message> @@ -460,10 +495,10 @@ <translation>Confirmed</translation> </message> <message> - <source>Priority</source> - <translation>Priority</translation> + <source>(no label)</source> + <translation>(no label)</translation> </message> -</context> + </context> <context> <name>EditAddressDialog</name> <message> @@ -486,7 +521,7 @@ <source>&Address</source> <translation>&Address</translation> </message> -</context> + </context> <context> <name>FreespaceChecker</name> <message> @@ -609,6 +644,21 @@ </message> </context> <context> + <name>ModalOverlay</name> + <message> + <source>Form</source> + <translation>Form</translation> + </message> + <message> + <source>Last block time</source> + <translation>Last block time</translation> + </message> + <message> + <source>Hide</source> + <translation>Hide</translation> + </message> + </context> +<context> <name>OpenURIDialog</name> <message> <source>Open URI</source> @@ -626,7 +676,7 @@ <source>Select payment request file</source> <translation>Select payment request file</translation> </message> -</context> + </context> <context> <name>OptionsDialog</name> <message> @@ -938,6 +988,9 @@ </message> </context> <context> + <name>PaymentServer</name> + </context> +<context> <name>PeerTableModel</name> <message> <source>User Agent</source> @@ -947,11 +1000,7 @@ <source>Node/Service</source> <translation>Node/Service</translation> </message> - <message> - <source>Ping Time</source> - <translation>Ping Time</translation> - </message> -</context> + </context> <context> <name>QObject</name> <message> @@ -990,7 +1039,17 @@ <source>%1 ms</source> <translation>%1 ms</translation> </message> -</context> + <message> + <source>%1 and %2</source> + <translation>%1 and %2</translation> + </message> + </context> +<context> + <name>QObject::QObject</name> + </context> +<context> + <name>QRImageWidget</name> + </context> <context> <name>RPCConsole</name> <message> @@ -1194,14 +1253,6 @@ <translation>Clear console</translation> </message> <message> - <source>&Disconnect Node</source> - <translation>&Disconnect Node</translation> - </message> - <message> - <source>Ban Node for</source> - <translation>Ban Node for</translation> - </message> - <message> <source>1 &hour</source> <translation>1 &hour</translation> </message> @@ -1218,10 +1269,6 @@ <translation>1 &year</translation> </message> <message> - <source>&Unban Node</source> - <translation>&Unban Node</translation> - </message> - <message> <source>Welcome to the %1 RPC console.</source> <translation>Welcome to the %1 RPC console.</translation> </message> @@ -1352,7 +1399,7 @@ <source>Remove</source> <translation>Remove</translation> </message> -</context> + </context> <context> <name>ReceiveRequestDialog</name> <message> @@ -1371,7 +1418,26 @@ <source>&Save Image...</source> <translation>&Save Image...</translation> </message> -</context> + <message> + <source>Address</source> + <translation>Address</translation> + </message> + <message> + <source>Label</source> + <translation>Label</translation> + </message> + </context> +<context> + <name>RecentRequestsTableModel</name> + <message> + <source>Label</source> + <translation>Label</translation> + </message> + <message> + <source>(no label)</source> + <translation>(no label)</translation> + </message> + </context> <context> <name>SendCoinsDialog</name> <message> @@ -1407,10 +1473,6 @@ <translation>Amount:</translation> </message> <message> - <source>Priority:</source> - <translation>Priority:</translation> - </message> - <message> <source>Fee:</source> <translation>Fee:</translation> </message> @@ -1479,10 +1541,6 @@ <translation>(Smart fee not initialised yet. This usually takes a few blocks...)</translation> </message> <message> - <source>Confirmation time:</source> - <translation>Confirmation time:</translation> - </message> - <message> <source>normal</source> <translation>normal</translation> </message> @@ -1522,6 +1580,10 @@ <source>S&end</source> <translation>S&end</translation> </message> + <message> + <source>(no label)</source> + <translation>(no label)</translation> + </message> </context> <context> <name>SendCoinsEntry</name> @@ -1601,7 +1663,10 @@ <source>Memo:</source> <translation>Memo:</translation> </message> -</context> + </context> +<context> + <name>SendConfirmationDialog</name> + </context> <context> <name>ShutdownWindow</name> <message> @@ -1699,7 +1764,7 @@ <source>Reset all verify message fields</source> <translation>Reset all verify message fields</translation> </message> -</context> + </context> <context> <name>SplashScreen</name> <message> @@ -1715,12 +1780,45 @@ </message> </context> <context> + <name>TransactionDesc</name> + </context> +<context> <name>TransactionDescDialog</name> <message> <source>This pane shows a detailed description of the transaction</source> <translation>This pane shows a detailed description of the transaction</translation> </message> -</context> + </context> +<context> + <name>TransactionTableModel</name> + <message> + <source>Label</source> + <translation>Label</translation> + </message> + <message> + <source>(no label)</source> + <translation>(no label)</translation> + </message> + </context> +<context> + <name>TransactionView</name> + <message> + <source>Comma separated file (*.csv)</source> + <translation>Comma separated file (*.csv)</translation> + </message> + <message> + <source>Label</source> + <translation>Label</translation> + </message> + <message> + <source>Address</source> + <translation>Address</translation> + </message> + <message> + <source>Exporting Failed</source> + <translation>Exporting Failed</translation> + </message> + </context> <context> <name>UnitDisplayStatusBarControl</name> <message> @@ -1729,6 +1827,15 @@ </message> </context> <context> + <name>WalletFrame</name> + </context> +<context> + <name>WalletModel</name> + </context> +<context> + <name>WalletView</name> + </context> +<context> <name>bitcoin-core</name> <message> <source>Options:</source> @@ -1763,10 +1870,6 @@ <translation>Prune: last wallet synchronisation goes beyond pruned data. You need to -reindex (download the whole blockchain again in case of pruned node)</translation> </message> <message> - <source>Reduce storage requirements by pruning (deleting) old blocks. This mode is incompatible with -txindex and -rescan. Warning: Reverting this setting requires re-downloading the entire blockchain. (default: 0 = disable pruning blocks, >%u = target size in MiB to use for block files)</source> - <translation>Reduce storage requirements by pruning (deleting) old blocks. This mode is incompatible with -txindex and -rescan. Warning: Reverting this setting requires re-downloading the entire blockchain. (default: 0 = disable pruning blocks, >%u = target size in MiB to use for block files)</translation> - </message> - <message> <source>Rescans are not possible in pruned mode. You will need to use -reindex which will download the whole blockchain again.</source> <translation>Rescans are not possible in pruned mode. You will need to use -reindex which will download the whole blockchain again.</translation> </message> @@ -1791,10 +1894,6 @@ <translation>Unable to start HTTP server. See debug log for details.</translation> </message> <message> - <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> - <translation>Accept connections from outside (default: 1 if no -proxy or -connect)</translation> - </message> - <message> <source>Bitcoin Core</source> <translation>Bitcoin Core</translation> </message> @@ -1803,10 +1902,6 @@ <translation>The %s developers</translation> </message> <message> - <source>-fallbackfee is set very high! This is the transaction fee you may pay when fee estimates are not available.</source> - <translation>-fallbackfee is set very high! This is the transaction fee you may pay when fee estimates are not available.</translation> - </message> - <message> <source>A fee rate (in %s/kB) that will be used when fee estimation has insufficient data (default: %s)</source> <translation>A fee rate (in %s/kB) that will be used when fee estimation has insufficient data (default: %s)</translation> </message> @@ -1827,10 +1922,6 @@ <translation>Delete all wallet transactions and only recover those parts of the blockchain through -rescan on startup</translation> </message> <message> - <source>Distributed under the MIT software license, see the accompanying file COPYING or <http://www.opensource.org/licenses/mit-license.php>.</source> - <translation>Distributed under the MIT software license, see the accompanying file COPYING or <http://www.opensource.org/licenses/mit-license.php>.</translation> - </message> - <message> <source>Error loading %s: You can't enable HD on a already existing non-HD wallet</source> <translation>Error loading %s: You can't enable HD on a already existing non-HD wallet</translation> </message> @@ -1843,10 +1934,6 @@ <translation>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</translation> </message> <message> - <source>Force relay of transactions from whitelisted peers even they violate local relay policy (default: %d)</source> - <translation>Force relay of transactions from whitelisted peers even they violate local relay policy (default: %d)</translation> - </message> - <message> <source>Maximum allowed median peer time offset adjustment. Local perspective of time may be influenced by peers forward or backward by this amount. (default: %u seconds)</source> <translation>Maximum allowed median peer time offset adjustment. Local perspective of time may be influenced by peers forward or backward by this amount. (default: %u seconds)</translation> </message> @@ -1871,10 +1958,6 @@ <translation>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</translation> </message> <message> - <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source> - <translation>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</translation> - </message> - <message> <source>Unable to rewind the database to a pre-fork state. You will need to redownload the blockchain</source> <translation>Unable to rewind the database to a pre-fork state. You will need to re-download the blockchain</translation> </message> @@ -1883,18 +1966,6 @@ <translation>Use UPnP to map the listening port (default: 1 when listening and no -proxy)</translation> </message> <message> - <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source> - <translation>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</translation> - </message> - <message> - <source>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</source> - <translation>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</translation> - </message> - <message> - <source>Whitelist peers connecting from the given netmask or IP address. Can be specified multiple times.</source> - <translation>Whitelist peers connecting from the given netmask or IP address. Can be specified multiple times.</translation> - </message> - <message> <source>You need to rebuild the database using -reindex-chainstate to change -txindex</source> <translation>You need to rebuild the database using -reindex-chainstate to change -txindex</translation> </message> @@ -1931,10 +2002,6 @@ <translation>Change index out of range</translation> </message> <message> - <source>Connect only to the specified node(s)</source> - <translation>Connect only to the specified node(s)</translation> - </message> - <message> <source>Connection options:</source> <translation>Connection options:</translation> </message> @@ -2055,10 +2122,6 @@ <translation>Location of the auth cookie (default: data dir)</translation> </message> <message> - <source>Minimum bytes per sigop in transactions we relay and mine (default: %u)</source> - <translation>Minimum bytes per sigop in transactions we relay and mine (default: %u)</translation> - </message> - <message> <source>Not enough file descriptors available.</source> <translation>Not enough file descriptors available.</translation> </message> @@ -2099,10 +2162,6 @@ <translation>Set database cache size in megabytes (%d to %d, default: %d)</translation> </message> <message> - <source>Set maximum block cost (default: %d)</source> - <translation>Set maximum block cost (default: %d)</translation> - </message> - <message> <source>Set maximum block size in bytes (default: %d)</source> <translation>Set maximum block size in bytes (default: %d)</translation> </message> @@ -2207,10 +2266,6 @@ <translation>Maximum size of data in data carrier transactions we relay and mine (default: %u)</translation> </message> <message> - <source>Query for peer addresses via DNS lookup, if low on addresses (default: 1 unless -connect)</source> - <translation>Query for peer addresses via DNS lookup, if low on addresses (default: 1 unless -connect)</translation> - </message> - <message> <source>Randomize credentials for every proxy connection. This enables Tor stream isolation (default: %u)</source> <translation>Randomise credentials for every proxy connection. This enables Tor stream isolation (default: %u)</translation> </message> @@ -2223,10 +2278,6 @@ <translation>The transaction amount is too small to send after the fee has been deducted</translation> </message> <message> - <source>This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit <https://www.openssl.org/> and cryptographic software written by Eric Young and UPnP software written by Thomas Bernard.</source> - <translation>This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit <https://www.openssl.org/> and cryptographic software written by Eric Young and UPnP software written by Thomas Bernard.</translation> - </message> - <message> <source>Use hierarchical deterministic key generation (HD) after BIP32. Only has effect during wallet creation/first start</source> <translation>Use hierarchical deterministic key generation (HD) after BIP32. Only has effect during wallet creation/first start</translation> </message> @@ -2339,10 +2390,6 @@ <translation>Transaction amount too small</translation> </message> <message> - <source>Transaction amounts must be positive</source> - <translation>Transaction amounts must be positive</translation> - </message> - <message> <source>Transaction too large for fee policy</source> <translation>Transaction too large for fee policy</translation> </message> @@ -2407,14 +2454,14 @@ <translation>-maxtxfee is set very high! Fees this large could be paid on a single transaction.</translation> </message> <message> - <source>-paytxfee is set very high! This is the transaction fee you will pay if you send a transaction.</source> - <translation>-paytxfee is set very high! This is the transaction fee you will pay if you send a transaction.</translation> - </message> - <message> <source>Do not keep transactions in the mempool longer than <n> hours (default: %u)</source> <translation>Do not keep transactions in the mempool longer than <n> hours (default: %u)</translation> </message> <message> + <source>Equivalent bytes per sigop in transactions for relay and mining (default: %u)</source> + <translation>Equivalent bytes per sigop in transactions for relay and mining (default: %u)</translation> + </message> + <message> <source>Fees (in %s/kB) smaller than this are considered zero fee for transaction creation (default: %s)</source> <translation>Fees (in %s/kB) smaller than this are considered zero fee for transaction creation (default: %s)</translation> </message> @@ -2459,10 +2506,6 @@ <translation>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: %s)</translation> </message> <message> - <source>Username and hashed password for JSON-RPC connections. The field <userpw> comes in the format: <USERNAME>:<SALT>$<HASH>. A canonical python script is included in share/rpcuser. This option can be specified multiple times</source> - <translation>Username and hashed password for JSON-RPC connections. The field <userpw> comes in the format: <USERNAME>:<SALT>$<HASH>. A canonical python script is included in share/rpcuser. This option can be specified multiple times</translation> - </message> - <message> <source>Warning: Unknown block versions being mined! It's possible unknown rules are in effect</source> <translation>Warning: Unknown block versions being mined! It's possible unknown rules are in effect</translation> </message> @@ -2531,8 +2574,8 @@ <translation>Set key pool size to <n> (default: %u)</translation> </message> <message> - <source>Set minimum block size in bytes (default: %u)</source> - <translation>Set minimum block size in bytes (default: %u)</translation> + <source>Set maximum BIP141 block weight (default: %d)</source> + <translation>Set maximum BIP141 block weight (default: %d)</translation> </message> <message> <source>Set the number of threads to service RPC calls (default: %d)</source> diff --git a/src/qt/locale/bitcoin_eo.ts b/src/qt/locale/bitcoin_eo.ts index 4471aeb72e..b4ed5e7fd5 100644 --- a/src/qt/locale/bitcoin_eo.ts +++ b/src/qt/locale/bitcoin_eo.ts @@ -41,7 +41,10 @@ <source>&Delete</source> <translation>&Forigi</translation> </message> -</context> + </context> +<context> + <name>AddressTableModel</name> + </context> <context> <name>AskPassphraseDialog</name> <message> @@ -60,7 +63,7 @@ <source>Repeat new passphrase</source> <translation>Ripetu la novan pasfrazon</translation> </message> -</context> + </context> <context> <name>BanTableModel</name> </context> @@ -239,30 +242,6 @@ <translation>&Komandliniaj agordaĵoj</translation> </message> <message> - <source>No block source available...</source> - <translation>Neniu fonto de blokoj trovebla...</translation> - </message> - <message numerus="yes"> - <source>%n hour(s)</source> - <translation><numerusform>%n horo</numerusform><numerusform>%n horoj</numerusform></translation> - </message> - <message numerus="yes"> - <source>%n day(s)</source> - <translation><numerusform>%n tago</numerusform><numerusform>%n tagoj</numerusform></translation> - </message> - <message numerus="yes"> - <source>%n week(s)</source> - <translation><numerusform>%n semajno</numerusform><numerusform>%n semajnoj</numerusform></translation> - </message> - <message> - <source>%1 and %2</source> - <translation>%1 kaj %2</translation> - </message> - <message numerus="yes"> - <source>%n year(s)</source> - <translation><numerusform>%n jaro</numerusform><numerusform>%n jaroj</numerusform></translation> - </message> - <message> <source>%1 behind</source> <translation>mankas %1</translation> </message> @@ -340,7 +319,7 @@ <source>Wallet is <b>encrypted</b> and currently <b>locked</b></source> <translation>Monujo estas <b>ĉifrita</b> kaj aktuale <b>ŝlosita</b></translation> </message> -</context> + </context> <context> <name>CoinControlDialog</name> <message> @@ -356,10 +335,6 @@ <translation>Sumo:</translation> </message> <message> - <source>Priority:</source> - <translation>Prioritato:</translation> - </message> - <message> <source>Fee:</source> <translation>Krompago:</translation> </message> @@ -411,11 +386,7 @@ <source>Confirmed</source> <translation>Konfirmita</translation> </message> - <message> - <source>Priority</source> - <translation>Prioritato</translation> - </message> -</context> + </context> <context> <name>EditAddressDialog</name> <message> @@ -438,7 +409,7 @@ <source>&Address</source> <translation>&Adreso</translation> </message> -</context> + </context> <context> <name>FreespaceChecker</name> <message> @@ -509,6 +480,17 @@ </message> </context> <context> + <name>ModalOverlay</name> + <message> + <source>Form</source> + <translation>Formularo</translation> + </message> + <message> + <source>Last block time</source> + <translation>Horo de la lasta bloko</translation> + </message> + </context> +<context> <name>OpenURIDialog</name> <message> <source>Open URI</source> @@ -526,7 +508,7 @@ <source>Select payment request file</source> <translation>Elektu la dosieron de la pagpeto</translation> </message> -</context> + </context> <context> <name>OptionsDialog</name> <message> @@ -710,6 +692,9 @@ </message> </context> <context> + <name>PaymentServer</name> + </context> +<context> <name>PeerTableModel</name> <message> <source>User Agent</source> @@ -738,6 +723,16 @@ <source>N/A</source> <translation>neaplikebla</translation> </message> + <message> + <source>%1 and %2</source> + <translation>%1 kaj %2</translation> + </message> + </context> +<context> + <name>QObject::QObject</name> + </context> +<context> + <name>QRImageWidget</name> </context> <context> <name>RPCConsole</name> @@ -920,7 +915,7 @@ <source>Remove</source> <translation>Forigi</translation> </message> -</context> + </context> <context> <name>ReceiveRequestDialog</name> <message> @@ -939,7 +934,10 @@ <source>&Save Image...</source> <translation>&Konservi Bildon...</translation> </message> -</context> + </context> +<context> + <name>RecentRequestsTableModel</name> + </context> <context> <name>SendCoinsDialog</name> <message> @@ -971,10 +969,6 @@ <translation>Sumo:</translation> </message> <message> - <source>Priority:</source> - <translation>Prioritato:</translation> - </message> - <message> <source>Fee:</source> <translation>Krompago:</translation> </message> @@ -1022,7 +1016,7 @@ <source>S&end</source> <translation>Ŝendi</translation> </message> -</context> + </context> <context> <name>SendCoinsEntry</name> <message> @@ -1077,7 +1071,10 @@ <source>Memo:</source> <translation>Memorando:</translation> </message> -</context> + </context> +<context> + <name>SendConfirmationDialog</name> + </context> <context> <name>ShutdownWindow</name> <message> @@ -1155,7 +1152,7 @@ <source>Reset all verify message fields</source> <translation>Reagordigi ĉiujn prikontrolajn kampojn</translation> </message> -</context> + </context> <context> <name>SplashScreen</name> <message> @@ -1171,16 +1168,34 @@ </message> </context> <context> + <name>TransactionDesc</name> + </context> +<context> <name>TransactionDescDialog</name> <message> <source>This pane shows a detailed description of the transaction</source> <translation>Tiu ĉi panelo montras detalan priskribon de la transakcio</translation> </message> -</context> + </context> +<context> + <name>TransactionTableModel</name> + </context> +<context> + <name>TransactionView</name> + </context> <context> <name>UnitDisplayStatusBarControl</name> </context> <context> + <name>WalletFrame</name> + </context> +<context> + <name>WalletModel</name> + </context> +<context> + <name>WalletView</name> + </context> +<context> <name>bitcoin-core</name> <message> <source>Options:</source> @@ -1207,10 +1222,6 @@ <translation>Ruli fone kiel demono kaj akcepti komandojn</translation> </message> <message> - <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> - <translation>Akcepti konektojn el ekstere (defaŭlte: 1 se ne estas -proxy nek -connect)</translation> - </message> - <message> <source>Bitcoin Core</source> <translation>Kerno de Bitmono</translation> </message> @@ -1223,18 +1234,6 @@ <translation>Plenumi komandon kiam monuja transakcio ŝanĝiĝas (%s en cmd anstataŭiĝas per TxID)</translation> </message> <message> - <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source> - <translation>Tiu ĉi estas antaŭeldona testa versio - uzu laŭ via propra risko - ne uzu por minado aŭ por aplikaĵoj por vendistoj</translation> - </message> - <message> - <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source> - <translation>Averto: La reto ne tute konsentas! Kelkaj minantoj ŝajne spertas problemojn aktuale.</translation> - </message> - <message> - <source>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</source> - <translation>Averto: ŝajne ni ne tute konsentas kun niaj samtavolanoj! Eble vi devas ĝisdatigi vian klienton, aŭ eble aliaj nodoj faru same.</translation> - </message> - <message> <source><category> can be:</source> <translation><category> povas esti:</translation> </message> @@ -1243,10 +1242,6 @@ <translation>Blok-kreaj agordaĵoj:</translation> </message> <message> - <source>Connect only to the specified node(s)</source> - <translation>Konekti nur al specifita(j) nodo(j)</translation> - </message> - <message> <source>Corrupted block database detected</source> <translation>Difektita blokdatumbazo trovita</translation> </message> @@ -1339,10 +1334,6 @@ <translation>Transakcia sumo tro malgranda</translation> </message> <message> - <source>Transaction amounts must be positive</source> - <translation>Transakcia sumo devas esti pozitiva</translation> - </message> - <message> <source>Transaction too large</source> <translation>Transakcio estas tro granda</translation> </message> diff --git a/src/qt/locale/bitcoin_es.ts b/src/qt/locale/bitcoin_es.ts index c67016637b..fc71bf841b 100644 --- a/src/qt/locale/bitcoin_es.ts +++ b/src/qt/locale/bitcoin_es.ts @@ -41,6 +41,77 @@ <source>&Delete</source> <translation>&Eliminar</translation> </message> + <message> + <source>Choose the address to send coins to</source> + <translation>Seleccione la dirección a la que enviar monedas</translation> + </message> + <message> + <source>Choose the address to receive coins with</source> + <translation>Seleccione la dirección de la que recibir monedas</translation> + </message> + <message> + <source>C&hoose</source> + <translation>E&scoger</translation> + </message> + <message> + <source>Sending addresses</source> + <translation>Direcciones de envío</translation> + </message> + <message> + <source>Receiving addresses</source> + <translation>Direcciones de recepción</translation> + </message> + <message> + <source>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source> + <translation>Estas son sus direcciones Bitcoin para enviar pagos. Verifique siempre la cantidad y la dirección de recepción antes de enviar bitcoins.</translation> + </message> + <message> + <source>These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction.</source> + <translation>Estas son sus direcciones Bitcoin para recibir pagos. Se recomienda utilizar una nueva dirección de recepción para cada transacción</translation> + </message> + <message> + <source>&Copy Address</source> + <translation>&Copiar Dirección</translation> + </message> + <message> + <source>Copy &Label</source> + <translation>Copiar &Etiqueta</translation> + </message> + <message> + <source>&Edit</source> + <translation>&Editar</translation> + </message> + <message> + <source>Export Address List</source> + <translation>Exportar lista de direcciones</translation> + </message> + <message> + <source>Comma separated file (*.csv)</source> + <translation>Archivo separado de coma (*.csv)</translation> + </message> + <message> + <source>Exporting Failed</source> + <translation>Falló la exportación</translation> + </message> + <message> + <source>There was an error trying to save the address list to %1. Please try again.</source> + <translation>Había un error intentando guardar la lista de direcciones en %1. Por favor inténtelo de nuevo.</translation> + </message> +</context> +<context> + <name>AddressTableModel</name> + <message> + <source>Label</source> + <translation>Etiqueta</translation> + </message> + <message> + <source>Address</source> + <translation>Dirección</translation> + </message> + <message> + <source>(no label)</source> + <translation>(sin etiqueta)</translation> + </message> </context> <context> <name>AskPassphraseDialog</name> @@ -60,6 +131,94 @@ <source>Repeat new passphrase</source> <translation>Repita la nueva contraseña</translation> </message> + <message> + <source>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>.</source> + <translation>Introduzca la nueva contraseña del monedero. <br/>Por favor utilice una contraseña de <b>diez o más carácteres aleatorios</b>, o <b>ocho o más palabras</b>.</translation> + </message> + <message> + <source>Encrypt wallet</source> + <translation>Cifrar monedero</translation> + </message> + <message> + <source>This operation needs your wallet passphrase to unlock the wallet.</source> + <translation>Esta operación necesita su contraseña de monedero para desbloquear el monedero.</translation> + </message> + <message> + <source>Unlock wallet</source> + <translation>Desbloquear monedero</translation> + </message> + <message> + <source>This operation needs your wallet passphrase to decrypt the wallet.</source> + <translation>Esta operación necesita su contraseña para descifrar el monedero.</translation> + </message> + <message> + <source>Decrypt wallet</source> + <translation>Descifrar monedero</translation> + </message> + <message> + <source>Change passphrase</source> + <translation>Cambiar contraseña</translation> + </message> + <message> + <source>Enter the old passphrase and new passphrase to the wallet.</source> + <translation>Introduzca la contraseña antigua y la nueva para el monedero.</translation> + </message> + <message> + <source>Confirm wallet encryption</source> + <translation>Confirmar cifrado del monedero</translation> + </message> + <message> + <source>Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR BITCOINS</b>!</source> + <translation>Advertencia: Si cifra su monedero y pierde su contraseña<b>¡PERDERÁ TODOS SUS BITCOINS!</b></translation> + </message> + <message> + <source>Are you sure you wish to encrypt your wallet?</source> + <translation>¿Seguro que desea cifrar su monedero?</translation> + </message> + <message> + <source>Wallet encrypted</source> + <translation>Monedero cifrado</translation> + </message> + <message> + <source>%1 will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your bitcoins from being stolen by malware infecting your computer.</source> + <translation>%1 se cerrará ahora para terminar el proceso de cifrado. Recuerde que cifrar su monedero no puede proteger completamente su monedero de ser robado por malware que infecte su ordenador.</translation> + </message> + <message> + <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source> + <translation>IMPORTANTE: Cualquier copia de seguridad anterior que haya hecho en su archivo de monedero debería ser reemplazada con el archivo de monedero cifrado generado recientemente. Por razones de seguridad, las copias de seguridad anteriores del archivo de monedero descifrado serán inútiles en cuanto empiece a utilizar el nuevo monedero cifrado.</translation> + </message> + <message> + <source>Wallet encryption failed</source> + <translation>Fracasó el cifrado del monedero</translation> + </message> + <message> + <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source> + <translation>Falló el cifrado del monedero debido a un error interno. Su monedero no fue cifrado.</translation> + </message> + <message> + <source>The supplied passphrases do not match.</source> + <translation>La contraseña introducida no coincide.</translation> + </message> + <message> + <source>Wallet unlock failed</source> + <translation>Fracasó el desbloqueo del monedero</translation> + </message> + <message> + <source>The passphrase entered for the wallet decryption was incorrect.</source> + <translation>La contraseña introducida para el cifrado del monedero es incorrecta.</translation> + </message> + <message> + <source>Wallet decryption failed</source> + <translation>Fracasó el cifrado del monedero</translation> + </message> + <message> + <source>Wallet passphrase was successfully changed.</source> + <translation>La contraseña del monedero se ha cambiado con éxito.</translation> + </message> + <message> + <source>Warning: The Caps Lock key is on!</source> + <translation>Alerta: ¡La clave de bloqueo Caps está activa!</translation> + </message> </context> <context> <name>BanTableModel</name> @@ -159,6 +318,22 @@ <translation>Abrir &URI...</translation> </message> <message> + <source>Click to disable network activity.</source> + <translation>Pulsar para deshabilitar la actividad de red.</translation> + </message> + <message> + <source>Network activity disabled.</source> + <translation>Actividad de red deshabilitada.</translation> + </message> + <message> + <source>Click to enable network activity again.</source> + <translation>Pulsar para volver a habilitar la actividad de red.</translation> + </message> + <message> + <source>Syncing Headers (%1%)...</source> + <translation>Sincronizando cabeceras (%1%)</translation> + </message> + <message> <source>Reindexing blocks on disk...</source> <translation>Reindexando bloques en disco...</translation> </message> @@ -270,34 +445,10 @@ <source>Processing blocks on disk...</source> <translation>Procesando bloques en disco...</translation> </message> - <message> - <source>No block source available...</source> - <translation>Ninguna fuente de bloques disponible ...</translation> - </message> <message numerus="yes"> <source>Processed %n block(s) of transaction history.</source> <translation><numerusform>%n bloque procesado del historial de transacciones.</numerusform><numerusform>%n bloques procesados del historial de transacciones.</numerusform></translation> </message> - <message numerus="yes"> - <source>%n hour(s)</source> - <translation><numerusform>%n hora</numerusform><numerusform>%n horas</numerusform></translation> - </message> - <message numerus="yes"> - <source>%n day(s)</source> - <translation><numerusform>%n día</numerusform><numerusform>%n días</numerusform></translation> - </message> - <message numerus="yes"> - <source>%n week(s)</source> - <translation><numerusform>%n semana</numerusform><numerusform>%n semanas</numerusform></translation> - </message> - <message> - <source>%1 and %2</source> - <translation>%1 y %2</translation> - </message> - <message numerus="yes"> - <source>%n year(s)</source> - <translation><numerusform>%n año</numerusform><numerusform>%n años</numerusform></translation> - </message> <message> <source>%1 behind</source> <translation>%1 atrás</translation> @@ -377,6 +528,14 @@ <translation>Transacción entrante</translation> </message> <message> + <source>HD key generation is <b>enabled</b></source> + <translation>La generación de clave HD está <b>habilitada</b></translation> + </message> + <message> + <source>HD key generation is <b>disabled</b></source> + <translation>La generación de clave HD está <b>deshabilitada</b></translation> + </message> + <message> <source>Wallet is <b>encrypted</b> and currently <b>unlocked</b></source> <translation>El monedero está <b>cifrado</b> y actualmente <b>desbloqueado</b></translation> </message> @@ -384,6 +543,10 @@ <source>Wallet is <b>encrypted</b> and currently <b>locked</b></source> <translation>El monedero está <b>cifrado</b> y actualmente <b>bloqueado</b></translation> </message> + <message> + <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> + <translation>Ha ocurrido un error fatal. Bitcoin no puede seguir seguro y se cerrará.</translation> + </message> </context> <context> <name>CoinControlDialog</name> @@ -404,10 +567,6 @@ <translation>Cuantía:</translation> </message> <message> - <source>Priority:</source> - <translation>Prioridad:</translation> - </message> - <message> <source>Fee:</source> <translation>Tasa:</translation> </message> @@ -460,8 +619,84 @@ <translation>Confirmado</translation> </message> <message> - <source>Priority</source> - <translation>Prioridad</translation> + <source>Copy address</source> + <translation>Copiar ubicación</translation> + </message> + <message> + <source>Copy label</source> + <translation>Copiar etiqueta</translation> + </message> + <message> + <source>Copy amount</source> + <translation>Copiar cantidad</translation> + </message> + <message> + <source>Copy transaction ID</source> + <translation>Copiar ID de transacción</translation> + </message> + <message> + <source>Lock unspent</source> + <translation>Bloquear lo no gastado</translation> + </message> + <message> + <source>Unlock unspent</source> + <translation>Desbloquear lo no gastado</translation> + </message> + <message> + <source>Copy quantity</source> + <translation>Copiar cantidad</translation> + </message> + <message> + <source>Copy fee</source> + <translation>Copiar comisión</translation> + </message> + <message> + <source>Copy after fee</source> + <translation>Copiar después de couta</translation> + </message> + <message> + <source>Copy bytes</source> + <translation>Copiar bytes</translation> + </message> + <message> + <source>Copy dust</source> + <translation>Copiar polvo</translation> + </message> + <message> + <source>Copy change</source> + <translation>Copiar cambio</translation> + </message> + <message> + <source>(%1 locked)</source> + <translation>(%1 bloqueado)</translation> + </message> + <message> + <source>yes</source> + <translation>sí</translation> + </message> + <message> + <source>no</source> + <translation>no</translation> + </message> + <message> + <source>This label turns red if any recipient receives an amount smaller than the current dust threshold.</source> + <translation>Esta etiqueta se vuelve roja si algún destinatario recibe una cantidad inferior a la actual puerta polvorienta.</translation> + </message> + <message> + <source>Can vary +/- %1 satoshi(s) per input.</source> + <translation>Puede variar +/- %1 satoshi(s) por entrada.</translation> + </message> + <message> + <source>(no label)</source> + <translation>(sin etiqueta)</translation> + </message> + <message> + <source>change from %1 (%2)</source> + <translation>cambia desde %1 (%2)</translation> + </message> + <message> + <source>(change)</source> + <translation>(cambio)</translation> </message> </context> <context> @@ -486,6 +721,38 @@ <source>&Address</source> <translation>&Dirección</translation> </message> + <message> + <source>New receiving address</source> + <translation>Nueva dirección de recivimiento</translation> + </message> + <message> + <source>New sending address</source> + <translation>Nueva dirección de envío</translation> + </message> + <message> + <source>Edit receiving address</source> + <translation>Editar dirección de recivimiento</translation> + </message> + <message> + <source>Edit sending address</source> + <translation>Editar dirección de envío</translation> + </message> + <message> + <source>The entered address "%1" is not a valid Bitcoin address.</source> + <translation>La dirección introducida "%1" no es una dirección Bitcoin válida.</translation> + </message> + <message> + <source>The entered address "%1" is already in the address book.</source> + <translation>La dirección introducida "%1" está ya en la agenda.</translation> + </message> + <message> + <source>Could not unlock wallet.</source> + <translation>Podría no desbloquear el monedero.</translation> + </message> + <message> + <source>New key generation failed.</source> + <translation>Falló la generación de la nueva clave.</translation> + </message> </context> <context> <name>FreespaceChecker</name> @@ -499,7 +766,7 @@ </message> <message> <source>Directory already exists. Add %1 if you intend to create a new directory here.</source> - <translation>El directorio ya existe. Añada %1 si pretende crear aquí un directorio nuevo.</translation> + <translation>El directorio ya existe. Añada %1 si pretende crear un directorio nuevo.</translation> </message> <message> <source>Path already exists, and is not a directory.</source> @@ -557,6 +824,10 @@ <translation>Establecer los certificados raíz SSL para solicitudes de pago (predeterminado: -system-)</translation> </message> <message> + <source>Show splash screen on startup (default: %u)</source> + <translation>Mostrar pantalla de bienvenida en el inicio (predeterminado: %u)</translation> + </message> + <message> <source>Reset all settings changed in the GUI</source> <translation>Reiniciar todos los ajustes modificados en el GUI</translation> </message> @@ -573,7 +844,7 @@ </message> <message> <source>As this is the first time the program is launched, you can choose where %1 will store its data.</source> - <translation>Al ser la primera vez que se ejecuta el programa, puede elegir donde %1 almacenara sus datos</translation> + <translation>Al ser la primera vez que se ejecuta el programa, puede elegir donde %1 almacenará sus datos.</translation> </message> <message> <source>%1 will download and store a copy of the Bitcoin block chain. At least %2GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source> @@ -605,6 +876,57 @@ </message> </context> <context> + <name>ModalOverlay</name> + <message> + <source>Form</source> + <translation>Formulario</translation> + </message> + <message> + <source>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 bitcoin network, as detailed below.</source> + <translation>Las transacciones recientes aún no pueden ser visibles, y por lo tanto el saldo de su monedero podría ser incorrecto. Esta información será correcta cuando su monedero haya terminado de sincronizarse con la red de bitcoin, como se detalla abajo.</translation> + </message> + <message> + <source>Attempting to spend bitcoins that are affected by not-yet-displayed transactions will not be accepted by the network.</source> + <translation>La red no aceptará el intentar gastar bitcoins que están afectados por transacciones aún no mostradas.</translation> + </message> + <message> + <source>Number of blocks left</source> + <translation>Número de bloques dejados</translation> + </message> + <message> + <source>Unknown...</source> + <translation>Desconocido...</translation> + </message> + <message> + <source>Last block time</source> + <translation>Hora del último bloque</translation> + </message> + <message> + <source>Progress</source> + <translation>Progreso</translation> + </message> + <message> + <source>Progress increase per hour</source> + <translation>Avance del progreso por hora</translation> + </message> + <message> + <source>calculating...</source> + <translation>calculando...</translation> + </message> + <message> + <source>Estimated time left until synced</source> + <translation>Tiempo estimado restante hasta la sincronización</translation> + </message> + <message> + <source>Hide</source> + <translation>Ocultar</translation> + </message> + <message> + <source>Unknown. Syncing Headers (%1)...</source> + <translation>Desconocido. Sincronizando cabeceras (%1)...</translation> + </message> +</context> +<context> <name>OpenURIDialog</name> <message> <source>Open URI</source> @@ -622,6 +944,10 @@ <source>Select payment request file</source> <translation>Seleccionar archivo de sulicitud de pago</translation> </message> + <message> + <source>Select payment request file to open</source> + <translation>Seleccionar el archivo de solicitud de pago para abrir</translation> + </message> </context> <context> <name>OptionsDialog</name> @@ -643,7 +969,7 @@ </message> <message> <source>Size of &database cache</source> - <translation>Tamaño de cache de la &base de datos</translation> + <translation>Tamaño del cache de la &base de datos</translation> </message> <message> <source>MB</source> @@ -707,7 +1033,7 @@ </message> <message> <source>Enable coin &control features</source> - <translation>Habilitar funcionalidad de &coin control</translation> + <translation>Habilitar funcionalidad de &Coin Control</translation> </message> <message> <source>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.</source> @@ -811,7 +1137,7 @@ </message> <message> <source>&Unit to show amounts in:</source> - <translation>Mostrar las cantidades en la &unidad:</translation> + <translation>&Unidad en la cual mostrar las cantidades:</translation> </message> <message> <source>Choose the default subdivision unit to show in the interface and when sending coins.</source> @@ -835,7 +1161,7 @@ </message> <message> <source>none</source> - <translation>ninguna</translation> + <translation>Ninguna</translation> </message> <message> <source>Confirm options reset</source> @@ -934,6 +1260,97 @@ </message> </context> <context> + <name>PaymentServer</name> + <message> + <source>Payment request error</source> + <translation>Fallo en la solicitud de pago</translation> + </message> + <message> + <source>Cannot start bitcoin: click-to-pay handler</source> + <translation>No se puede iniciar bitcoin: encargado click-para-pagar</translation> + </message> + <message> + <source>URI handling</source> + <translation>Manejo de URI</translation> + </message> + <message> + <source>Payment request fetch URL is invalid: %1</source> + <translation>La búsqueda de solicitud de pago URL es válida: %1</translation> + </message> + <message> + <source>Invalid payment address %1</source> + <translation>Dirección de pago inválida %1</translation> + </message> + <message> + <source>URI cannot be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters.</source> + <translation>URI no puede ser analizado! Esto puede ser causado por una dirección Bitcoin inválida o parametros URI mal formados.</translation> + </message> + <message> + <source>Payment request file handling</source> + <translation>Manejo del archivo de solicitud de pago</translation> + </message> + <message> + <source>Payment request file cannot be read! This can be caused by an invalid payment request file.</source> + <translation>¡El archivo de solicitud de pago no puede ser leído! Esto puede ser causado por un archivo de solicitud de pago inválido.</translation> + </message> + <message> + <source>Payment request rejected</source> + <translation>Solicitud de pago rechazada</translation> + </message> + <message> + <source>Payment request network doesn't match client network.</source> + <translation>La red de solicitud de pago no cimbina la red cliente.</translation> + </message> + <message> + <source>Payment request expired.</source> + <translation>Solicitud de pago caducada.</translation> + </message> + <message> + <source>Payment request is not initialized.</source> + <translation>La solicitud de pago no se ha iniciado.</translation> + </message> + <message> + <source>Unverified payment requests to custom payment scripts are unsupported.</source> + <translation>Solicitudes de pago sin verificar a scripts de pago habitual no se soportan.</translation> + </message> + <message> + <source>Invalid payment request.</source> + <translation>Solicitud de pago inválida.</translation> + </message> + <message> + <source>Requested payment amount of %1 is too small (considered dust).</source> + <translation>Cantidad de pago solicitada de %1 es demasiado pequeña (considerado polvo).</translation> + </message> + <message> + <source>Refund from %1</source> + <translation>Reembolsar desde %1</translation> + </message> + <message> + <source>Payment request %1 is too large (%2 bytes, allowed %3 bytes).</source> + <translation>Solicitud de pago de %1 es demasiado grande (%2 bytes, permitidos %3 bytes).</translation> + </message> + <message> + <source>Error communicating with %1: %2</source> + <translation>Fallo al comunicar con %1: %2</translation> + </message> + <message> + <source>Payment request cannot be parsed!</source> + <translation>¡La solicitud de pago no puede ser analizada!</translation> + </message> + <message> + <source>Bad response from server %1</source> + <translation>Mala respuesta desde el servidor %1</translation> + </message> + <message> + <source>Network request error</source> + <translation>Fallo de solicitud de red</translation> + </message> + <message> + <source>Payment acknowledged</source> + <translation>Pago declarado</translation> + </message> +</context> +<context> <name>PeerTableModel</name> <message> <source>User Agent</source> @@ -944,8 +1361,12 @@ <translation>Nodo/Servicio</translation> </message> <message> - <source>Ping Time</source> - <translation>Ping</translation> + <source>NodeId</source> + <translation>ID de nodo</translation> + </message> + <message> + <source>Ping</source> + <translation>Sonido</translation> </message> </context> <context> @@ -986,6 +1407,72 @@ <source>%1 ms</source> <translation>%1 ms</translation> </message> + <message numerus="yes"> + <source>%n second(s)</source> + <translation><numerusform>%n segundo</numerusform><numerusform>%n segundos</numerusform></translation> + </message> + <message numerus="yes"> + <source>%n minute(s)</source> + <translation><numerusform>%n minuto</numerusform><numerusform>%n minutos</numerusform></translation> + </message> + <message numerus="yes"> + <source>%n hour(s)</source> + <translation><numerusform>%n hora</numerusform><numerusform>%n horas</numerusform></translation> + </message> + <message numerus="yes"> + <source>%n day(s)</source> + <translation><numerusform>%n dia</numerusform><numerusform>%n dias</numerusform></translation> + </message> + <message numerus="yes"> + <source>%n week(s)</source> + <translation><numerusform>%n semana</numerusform><numerusform>%n semanas</numerusform></translation> + </message> + <message> + <source>%1 and %2</source> + <translation>%1 y %2</translation> + </message> + <message numerus="yes"> + <source>%n year(s)</source> + <translation><numerusform>%n año</numerusform><numerusform>%n años</numerusform></translation> + </message> + <message> + <source>%1 didn't yet exit safely...</source> + <translation>%1 no se ha cerrado de forma segura todavía...</translation> + </message> +</context> +<context> + <name>QObject::QObject</name> + <message> + <source>Error: Specified data directory "%1" does not exist.</source> + <translation>Error: El directorio de datos «%1» especificado no existe.</translation> + </message> + <message> + <source>Error: Cannot parse configuration file: %1. Only use key=value syntax.</source> + <translation>Error: No se puede analizar el archivo de configuración: %1. Utilice únicamente la sintaxis clave=valor.</translation> + </message> + <message> + <source>Error: %1</source> + <translation>Error: %1</translation> + </message> +</context> +<context> + <name>QRImageWidget</name> + <message> + <source>&Save Image...</source> + <translation>&Guardar imagen...</translation> + </message> + <message> + <source>&Copy Image</source> + <translation>&Copiar imagen</translation> + </message> + <message> + <source>Save QR Code</source> + <translation>Guardar código QR</translation> + </message> + <message> + <source>PNG Image (*.png)</source> + <translation>Imagen PNG (*.png)</translation> + </message> </context> <context> <name>RPCConsole</name> @@ -1146,6 +1633,10 @@ <translation>Espera de Ping</translation> </message> <message> + <source>Min Ping</source> + <translation>Sonido Mínimo</translation> + </message> + <message> <source>Time Offset</source> <translation>Desplazamiento de tiempo</translation> </message> @@ -1190,14 +1681,6 @@ <translation>Borrar consola</translation> </message> <message> - <source>&Disconnect Node</source> - <translation>Nodo &Desconectado</translation> - </message> - <message> - <source>Ban Node for</source> - <translation>Prohibir Nodo para</translation> - </message> - <message> <source>1 &hour</source> <translation>1 &hora</translation> </message> @@ -1214,8 +1697,16 @@ <translation>1 &año</translation> </message> <message> - <source>&Unban Node</source> - <translation>&Desbanear Nodo</translation> + <source>&Disconnect</source> + <translation>&Desconectar</translation> + </message> + <message> + <source>Ban for</source> + <translation>Prohibir para</translation> + </message> + <message> + <source>&Unban</source> + <translation>&Unbano</translation> </message> <message> <source>Welcome to the %1 RPC console.</source> @@ -1230,6 +1721,14 @@ <translation>Escriba <b>help</b> para ver un resumen de los comandos disponibles.</translation> </message> <message> + <source>WARNING: Scammers have been active, telling users to type commands here, stealing their wallet contents. Do not use this console without fully understanding the ramification of a command.</source> + <translation>ADVERTENCIA: Los estafadores han sido activados, diciéndoles a los usuarios que escriban comandos aquí, robando el contenido de sus monederos. No utilice esta consola sin entender completamente la repercusión de un comando.</translation> + </message> + <message> + <source>Network activity disabled</source> + <translation>Actividad de red deshabilitada</translation> + </message> + <message> <source>%1 B</source> <translation>%1 B</translation> </message> @@ -1348,6 +1847,22 @@ <source>Remove</source> <translation>Eliminar</translation> </message> + <message> + <source>Copy URI</source> + <translation>Copiar URI</translation> + </message> + <message> + <source>Copy label</source> + <translation>Copiar capa</translation> + </message> + <message> + <source>Copy message</source> + <translation>Copiar imagen</translation> + </message> + <message> + <source>Copy amount</source> + <translation>Copiar cantidad</translation> + </message> </context> <context> <name>ReceiveRequestDialog</name> @@ -1367,6 +1882,73 @@ <source>&Save Image...</source> <translation>Guardar Imagen...</translation> </message> + <message> + <source>Request payment to %1</source> + <translation>Solicitar pago a %1</translation> + </message> + <message> + <source>Payment information</source> + <translation>Información de pago</translation> + </message> + <message> + <source>URI</source> + <translation>URI</translation> + </message> + <message> + <source>Address</source> + <translation>Dirección</translation> + </message> + <message> + <source>Amount</source> + <translation>Cantidad</translation> + </message> + <message> + <source>Label</source> + <translation>Etiqueta</translation> + </message> + <message> + <source>Message</source> + <translation>Mensaje</translation> + </message> + <message> + <source>Resulting URI too long, try to reduce the text for label / message.</source> + <translation>URI resultante demasiado grande, trate de reducir el texto de etiqueta / mensaje.</translation> + </message> + <message> + <source>Error encoding URI into QR Code.</source> + <translation>Fallo al codificar URI en código QR.</translation> + </message> +</context> +<context> + <name>RecentRequestsTableModel</name> + <message> + <source>Date</source> + <translation>Fecha</translation> + </message> + <message> + <source>Label</source> + <translation>Etiqueta</translation> + </message> + <message> + <source>Message</source> + <translation>Mensaje</translation> + </message> + <message> + <source>(no label)</source> + <translation>(sin etiqueta)</translation> + </message> + <message> + <source>(no message)</source> + <translation>(no hay mensaje)</translation> + </message> + <message> + <source>(no amount requested)</source> + <translation>(no hay solicitud de cantidad)</translation> + </message> + <message> + <source>Requested</source> + <translation>Solicitado</translation> + </message> </context> <context> <name>SendCoinsDialog</name> @@ -1403,10 +1985,6 @@ <translation>Cuantía:</translation> </message> <message> - <source>Priority:</source> - <translation>Prioridad:</translation> - </message> - <message> <source>Fee:</source> <translation>Tasa:</translation> </message> @@ -1436,7 +2014,7 @@ </message> <message> <source>collapse fee-settings</source> - <translation>Colapsar ajustes de cuota</translation> + <translation>Colapsar ajustes de comisión.</translation> </message> <message> <source>per kilobyte</source> @@ -1444,7 +2022,7 @@ </message> <message> <source>If the custom fee is set to 1000 satoshis and the transaction is only 250 bytes, then "per kilobyte" only pays 250 satoshis in fee, while "total at least" pays 1000 satoshis. For transactions bigger than a kilobyte both pay by kilobyte.</source> - <translation>Si la tarifa de aduana se establece en 1000 satoshis y la transacción está a sólo 250 bytes, entonces "por kilobyte" sólo paga 250 satoshis de cuota, mientras que "el mínimo total" pagaría 1.000 satoshis. Para las transacciones más grandes que un kilobyte ambos pagan por kilobyte</translation> + <translation>Si la comisión se establece en 1000 satoshis y la transacción está a sólo 250 bytes, entonces "por kilobyte" sólo paga 250 satoshis de cuota, mientras que "el mínimo total" pagaría 1.000 satoshis. Para las transacciones más grandes que un kilobyte ambos pagan por kilobyte</translation> </message> <message> <source>Hide</source> @@ -1456,7 +2034,7 @@ </message> <message> <source>Paying only the minimum fee is just fine as long as there is less transaction volume than space in the blocks. But be aware that this can end up in a never confirming transaction once there is more demand for bitcoin transactions than the network can process.</source> - <translation>Pagando solamente la cuota mínima es correcto, siempre y cuando haya menos volumen de transacciones que el espacio en los bloques. Pero tenga en cuenta que esto puede terminar en una transacción nunca confirmada, una vez que haya más demanda para transacciones Bitcoin que la red pueda procesar.</translation> + <translation>Pagar solamente la comisión mínima es correcto, siempre y cuando haya menos volumen de transacciones que el espacio en los bloques. Pero tenga en cuenta que esto puede terminar en una transacción nunca confirmada, una vez que haya más demanda para transacciones Bitcoin que la red pueda procesar.</translation> </message> <message> <source>(read the tooltip)</source> @@ -1464,19 +2042,15 @@ </message> <message> <source>Recommended:</source> - <translation>Recomendado:</translation> + <translation>Recomendada:</translation> </message> <message> <source>Custom:</source> - <translation>Personalizado:</translation> + <translation>Personalizada:</translation> </message> <message> <source>(Smart fee not initialized yet. This usually takes a few blocks...)</source> - <translation>(Tarifa inteligente no inicializado aún. Esto generalmente lleva a pocos bloques...)</translation> - </message> - <message> - <source>Confirmation time:</source> - <translation>Tiempo de confirmación:</translation> + <translation>(Aún no se ha inicializado la Comisión Inteligente. Esto generalmente tarda pocos bloques...)</translation> </message> <message> <source>normal</source> @@ -1503,6 +2077,10 @@ <translation>Polvo:</translation> </message> <message> + <source>Confirmation time target:</source> + <translation>Objetivo de tiempo de confirmación</translation> + </message> + <message> <source>Clear &All</source> <translation>Vaciar &todo</translation> </message> @@ -1518,6 +2096,126 @@ <source>S&end</source> <translation>&Enviar</translation> </message> + <message> + <source>Copy quantity</source> + <translation>Copiar cantidad</translation> + </message> + <message> + <source>Copy amount</source> + <translation>Copiar cantidad</translation> + </message> + <message> + <source>Copy fee</source> + <translation>Copiar comisión</translation> + </message> + <message> + <source>Copy after fee</source> + <translation>Copiar después de couta</translation> + </message> + <message> + <source>Copy bytes</source> + <translation>Copiar bytes</translation> + </message> + <message> + <source>Copy dust</source> + <translation>Copiar polvo</translation> + </message> + <message> + <source>Copy change</source> + <translation>Copiar cambio</translation> + </message> + <message> + <source>%1 to %2</source> + <translation>%1 a %2</translation> + </message> + <message> + <source>Are you sure you want to send?</source> + <translation>¿Seguro que quiere enviar?</translation> + </message> + <message> + <source>added as transaction fee</source> + <translation>añadido como comisión de transacción</translation> + </message> + <message> + <source>Total Amount %1</source> + <translation>Cantidad total %1</translation> + </message> + <message> + <source>or</source> + <translation>o</translation> + </message> + <message> + <source>Confirm send coins</source> + <translation>Confirmar enviar monedas</translation> + </message> + <message> + <source>The recipient address is not valid. Please recheck.</source> + <translation>La dirección de destinatario no es válida. Por favor revísela.</translation> + </message> + <message> + <source>The amount to pay must be larger than 0.</source> + <translation>La cantidad a pagar debe de ser mayor que 0.</translation> + </message> + <message> + <source>The amount exceeds your balance.</source> + <translation>La cantidad excede su saldo.</translation> + </message> + <message> + <source>The total exceeds your balance when the %1 transaction fee is included.</source> + <translation>El total excede su saldo cuando la comisión de transacción de %1 es incluida.</translation> + </message> + <message> + <source>Duplicate address found: addresses should only be used once each.</source> + <translation>Dirección duplicada encontrada: la dirección sólo debería ser utilizada una vez por cada uso.</translation> + </message> + <message> + <source>Transaction creation failed!</source> + <translation>¡Falló la creación de transacción!</translation> + </message> + <message> + <source>The transaction was rejected with the following reason: %1</source> + <translation>Se ha rechazado la transacción por la siguiente razón: %1</translation> + </message> + <message> + <source>A fee higher than %1 is considered an absurdly high fee.</source> + <translation>Una comisión mayor que %1 se considera una cuota irracionalmente alta.</translation> + </message> + <message> + <source>Payment request expired.</source> + <translation>Solicitud de pago caducada.</translation> + </message> + <message numerus="yes"> + <source>%n block(s)</source> + <translation><numerusform>%n bloque</numerusform><numerusform>%n bloques</numerusform></translation> + </message> + <message> + <source>Pay only the required fee of %1</source> + <translation>Pagar únicamente la comisión solicitada de %1</translation> + </message> + <message numerus="yes"> + <source>Estimated to begin confirmation within %n block(s).</source> + <translation><numerusform>Estimado para empezar la confirmación dentro de %n bloque.</numerusform><numerusform>Estimado para empezar la confirmación dentro de %n bloques.</numerusform></translation> + </message> + <message> + <source>Warning: Invalid Bitcoin address</source> + <translation>Alerta: dirección Bitcoin inválida</translation> + </message> + <message> + <source>Warning: Unknown change address</source> + <translation>Alerta: dirección cambiada desconocida</translation> + </message> + <message> + <source>Confirm custom change address</source> + <translation>Confirmar dirección de cambio personalizada</translation> + </message> + <message> + <source>The address you selected for change is not part of this wallet. Any or all funds in your wallet may be sent to this address. Are you sure?</source> + <translation>La dirección que ha seleccionado para cambiar no es parte de este monedero. ninguno o todos los fondos de su monedero pueden ser enviados a esta dirección. ¿Está seguro?</translation> + </message> + <message> + <source>(no label)</source> + <translation>(sin etiqueta)</translation> + </message> </context> <context> <name>SendCoinsEntry</name> @@ -1563,11 +2261,11 @@ </message> <message> <source>The fee will be deducted from the amount being sent. The recipient will receive less bitcoins than you enter in the amount field. If multiple recipients are selected, the fee is split equally.</source> - <translation>La cuota será deducida de la cantidad que sea mandada. El destinatario recibirá menos bitcoins de los que entres en el </translation> + <translation>La comisión será deducida de la cantidad que sea mandada. El destinatario recibirá menos bitcoins de la cantidad introducida en el campo Cantidad. Si hay varios destinatarios, la comisión será distribuida a partes iguales.</translation> </message> <message> <source>S&ubtract fee from amount</source> - <translation>Restar comisiones a la cantidad</translation> + <translation>Restar comisiones de la cantidad.</translation> </message> <message> <source>Message:</source> @@ -1597,6 +2295,17 @@ <source>Memo:</source> <translation>Memo:</translation> </message> + <message> + <source>Enter a label for this address to add it to your address book</source> + <translation>Introduzca una etiqueta para esta dirección para añadirla a su lista de direcciones.</translation> + </message> +</context> +<context> + <name>SendConfirmationDialog</name> + <message> + <source>Yes</source> + <translation>Sí</translation> + </message> </context> <context> <name>ShutdownWindow</name> @@ -1695,6 +2404,58 @@ <source>Reset all verify message fields</source> <translation>Vaciar todos los campos de la verificación de mensaje</translation> </message> + <message> + <source>Click "Sign Message" to generate signature</source> + <translation>Click en "Fírmar mensaje" para generar una firma</translation> + </message> + <message> + <source>The entered address is invalid.</source> + <translation>La dirección introducida no es válida.</translation> + </message> + <message> + <source>Please check the address and try again.</source> + <translation>Por favor revise la dirección e inténtelo de nuevo.</translation> + </message> + <message> + <source>The entered address does not refer to a key.</source> + <translation>La dirección introducida no remite a una clave.</translation> + </message> + <message> + <source>Wallet unlock was cancelled.</source> + <translation>El desbloqueo del monedero fue cancelado.</translation> + </message> + <message> + <source>Private key for the entered address is not available.</source> + <translation>La clave privada de la dirección introducida no está disponible.</translation> + </message> + <message> + <source>Message signing failed.</source> + <translation>Falló la firma del mensaje.</translation> + </message> + <message> + <source>Message signed.</source> + <translation>Mensaje firmado.</translation> + </message> + <message> + <source>The signature could not be decoded.</source> + <translation>La firma no pudo descodificarse.</translation> + </message> + <message> + <source>Please check the signature and try again.</source> + <translation>Por favor compruebe la firma y pruebe de nuevo.</translation> + </message> + <message> + <source>The signature did not match the message digest.</source> + <translation>La firma no se combinó con el mensaje.</translation> + </message> + <message> + <source>Message verification failed.</source> + <translation>Falló la verificación del mensaje.</translation> + </message> + <message> + <source>Message verified.</source> + <translation>Mensaje verificado.</translation> + </message> </context> <context> <name>SplashScreen</name> @@ -1711,11 +2472,440 @@ </message> </context> <context> + <name>TransactionDesc</name> + <message> + <source>Open until %1</source> + <translation>Abierto hasta %1</translation> + </message> + <message> + <source>conflicted with a transaction with %1 confirmations</source> + <translation>Hay un conflicto con la traducción de las confirmaciones %1</translation> + </message> + <message> + <source>%1/offline</source> + <translation>%1/sin conexión</translation> + </message> + <message> + <source>0/unconfirmed, %1</source> + <translation>0/no confirmado, %1</translation> + </message> + <message> + <source>in memory pool</source> + <translation>en el equipo de memoria</translation> + </message> + <message> + <source>not in memory pool</source> + <translation>no en el equipo de memoria</translation> + </message> + <message> + <source>abandoned</source> + <translation>abandonado</translation> + </message> + <message> + <source>%1/unconfirmed</source> + <translation>%1/no confirmado</translation> + </message> + <message> + <source>%1 confirmations</source> + <translation>confirmaciones %1</translation> + </message> + <message> + <source>Status</source> + <translation>Estado</translation> + </message> + <message> + <source>, has not been successfully broadcast yet</source> + <translation>, no ha sido emitido con éxito aún</translation> + </message> + <message> + <source>Date</source> + <translation>Fecha</translation> + </message> + <message> + <source>Source</source> + <translation>Fuente</translation> + </message> + <message> + <source>Generated</source> + <translation>Generado</translation> + </message> + <message> + <source>From</source> + <translation>Desde</translation> + </message> + <message> + <source>unknown</source> + <translation>desconocido</translation> + </message> + <message> + <source>To</source> + <translation>Para</translation> + </message> + <message> + <source>own address</source> + <translation>dirección propia</translation> + </message> + <message> + <source>watch-only</source> + <translation>de observación</translation> + </message> + <message> + <source>label</source> + <translation>etiqueta</translation> + </message> + <message> + <source>Credit</source> + <translation>Credito</translation> + </message> + <message> + <source>not accepted</source> + <translation>no aceptada</translation> + </message> + <message> + <source>Debit</source> + <translation>Enviado</translation> + </message> + <message> + <source>Total debit</source> + <translation>Total enviado</translation> + </message> + <message> + <source>Total credit</source> + <translation>Total recibido</translation> + </message> + <message> + <source>Transaction fee</source> + <translation>Comisión de transacción</translation> + </message> + <message> + <source>Net amount</source> + <translation>Cantidad neta</translation> + </message> + <message> + <source>Message</source> + <translation>Mensaje</translation> + </message> + <message> + <source>Comment</source> + <translation>Comentario</translation> + </message> + <message> + <source>Transaction ID</source> + <translation>Identificador de transacción (ID)</translation> + </message> + <message> + <source>Output index</source> + <translation>Indice de salida</translation> + </message> + <message> + <source>Merchant</source> + <translation>Vendedor</translation> + </message> + <message> + <source>Generated coins must mature %1 blocks before they can be spent. When you generated this block, it was broadcast to the network to be added to the block chain. If it fails to get into the chain, its state will change to "not accepted" and it won't be spendable. This may occasionally happen if another node generates a block within a few seconds of yours.</source> + <translation>Los bitcoins generados deben madurar %1 bloques antes de que puedan gastarse. Cuando generó este bloque, se transmitió a la red para que se añadiera a la cadena de bloques. Si no consigue entrar en la cadena, su estado cambiará a "no aceptado" y ya no se podrá gastar. Esto puede ocurrir ocasionalmente si otro nodo genera un bloque a pocos segundos del suyo.</translation> + </message> + <message> + <source>Debug information</source> + <translation>Información de depuración</translation> + </message> + <message> + <source>Transaction</source> + <translation>Transacción</translation> + </message> + <message> + <source>Inputs</source> + <translation>entradas</translation> + </message> + <message> + <source>Amount</source> + <translation>Cantidad</translation> + </message> + <message> + <source>true</source> + <translation>verdadero</translation> + </message> + <message> + <source>false</source> + <translation>falso</translation> + </message> +</context> +<context> <name>TransactionDescDialog</name> <message> <source>This pane shows a detailed description of the transaction</source> <translation>Esta ventana muestra información detallada sobre la transacción</translation> </message> + <message> + <source>Details for %1</source> + <translation>Detalles para %1</translation> + </message> +</context> +<context> + <name>TransactionTableModel</name> + <message> + <source>Date</source> + <translation>Fecha</translation> + </message> + <message> + <source>Type</source> + <translation>Tipo</translation> + </message> + <message> + <source>Label</source> + <translation>Etiqueta</translation> + </message> + <message> + <source>Open until %1</source> + <translation>Abierto hasta %1</translation> + </message> + <message> + <source>Offline</source> + <translation>Sin conexion</translation> + </message> + <message> + <source>Unconfirmed</source> + <translation>Sin confirmar</translation> + </message> + <message> + <source>Abandoned</source> + <translation>Abandonado</translation> + </message> + <message> + <source>Confirming (%1 of %2 recommended confirmations)</source> + <translation>Confirmando (%1 de %2 confirmaciones recomendadas)</translation> + </message> + <message> + <source>Confirmed (%1 confirmations)</source> + <translation>Confirmado (%1 confirmaciones)</translation> + </message> + <message> + <source>Conflicted</source> + <translation>En conflicto</translation> + </message> + <message> + <source>Immature (%1 confirmations, will be available after %2)</source> + <translation>No disponible (%1 confirmaciones. Estarán disponibles al cabo de %2)</translation> + </message> + <message> + <source>This block was not received by any other nodes and will probably not be accepted!</source> + <translation>Este bloque no ha sido recibido por otros nodos y probablemente no sea aceptado!</translation> + </message> + <message> + <source>Generated but not accepted</source> + <translation>Generado pero no aceptado</translation> + </message> + <message> + <source>Received with</source> + <translation>Recibido con</translation> + </message> + <message> + <source>Received from</source> + <translation>Recibidos de</translation> + </message> + <message> + <source>Sent to</source> + <translation>Enviado a</translation> + </message> + <message> + <source>Payment to yourself</source> + <translation>Pago proprio</translation> + </message> + <message> + <source>Mined</source> + <translation>Minado</translation> + </message> + <message> + <source>watch-only</source> + <translation>de observación</translation> + </message> + <message> + <source>(n/a)</source> + <translation>(nd)</translation> + </message> + <message> + <source>(no label)</source> + <translation>(sin etiqueta)</translation> + </message> + <message> + <source>Transaction status. Hover over this field to show number of confirmations.</source> + <translation>Estado de transacción. Pasa el ratón sobre este campo para ver el número de confirmaciones.</translation> + </message> + <message> + <source>Date and time that the transaction was received.</source> + <translation>Fecha y hora en que se recibió la transacción.</translation> + </message> + <message> + <source>Type of transaction.</source> + <translation>Tipo de transacción.</translation> + </message> + <message> + <source>Whether or not a watch-only address is involved in this transaction.</source> + <translation>Si una dirección watch-only está involucrada en esta transacción o no.</translation> + </message> + <message> + <source>User-defined intent/purpose of the transaction.</source> + <translation>Descripción de la transacción definido por el usuario.</translation> + </message> + <message> + <source>Amount removed from or added to balance.</source> + <translation>Cantidad retirada o añadida al saldo.</translation> + </message> +</context> +<context> + <name>TransactionView</name> + <message> + <source>All</source> + <translation>Todo</translation> + </message> + <message> + <source>Today</source> + <translation>Hoy</translation> + </message> + <message> + <source>This week</source> + <translation>Esta semana</translation> + </message> + <message> + <source>This month</source> + <translation>Este mes</translation> + </message> + <message> + <source>Last month</source> + <translation>Mes pasado</translation> + </message> + <message> + <source>This year</source> + <translation>Este año</translation> + </message> + <message> + <source>Range...</source> + <translation>Rango...</translation> + </message> + <message> + <source>Received with</source> + <translation>Recibido con</translation> + </message> + <message> + <source>Sent to</source> + <translation>Enviado a</translation> + </message> + <message> + <source>To yourself</source> + <translation>A usted mismo</translation> + </message> + <message> + <source>Mined</source> + <translation>Minado</translation> + </message> + <message> + <source>Other</source> + <translation>Otra</translation> + </message> + <message> + <source>Enter address or label to search</source> + <translation>Introduzca una dirección o etiqueta que buscar</translation> + </message> + <message> + <source>Min amount</source> + <translation>Cantidad mínima</translation> + </message> + <message> + <source>Abandon transaction</source> + <translation>Transacción abandonada</translation> + </message> + <message> + <source>Copy address</source> + <translation>Copiar ubicación</translation> + </message> + <message> + <source>Copy label</source> + <translation>Copiar capa</translation> + </message> + <message> + <source>Copy amount</source> + <translation>Copiar cantidad</translation> + </message> + <message> + <source>Copy transaction ID</source> + <translation>Copiar ID de transacción</translation> + </message> + <message> + <source>Copy raw transaction</source> + <translation>Copiar transacción raw</translation> + </message> + <message> + <source>Copy full transaction details</source> + <translation>Copiar todos los detalles de la transacción</translation> + </message> + <message> + <source>Edit label</source> + <translation>Editar etiqueta</translation> + </message> + <message> + <source>Show transaction details</source> + <translation>Mostrar detalles de la transacción</translation> + </message> + <message> + <source>Export Transaction History</source> + <translation>Exportar historial de transacciones</translation> + </message> + <message> + <source>Comma separated file (*.csv)</source> + <translation>Archivo separado de coma (*.csv)</translation> + </message> + <message> + <source>Confirmed</source> + <translation>Confirmado</translation> + </message> + <message> + <source>Watch-only</source> + <translation>De observación</translation> + </message> + <message> + <source>Date</source> + <translation>Fecha</translation> + </message> + <message> + <source>Type</source> + <translation>Tipo</translation> + </message> + <message> + <source>Label</source> + <translation>Etiqueta</translation> + </message> + <message> + <source>Address</source> + <translation>Dirección</translation> + </message> + <message> + <source>ID</source> + <translation>ID</translation> + </message> + <message> + <source>Exporting Failed</source> + <translation>Falló la exportación</translation> + </message> + <message> + <source>There was an error trying to save the transaction history to %1.</source> + <translation>Ha habido un error al intentar guardar la transacción con %1.</translation> + </message> + <message> + <source>Exporting Successful</source> + <translation>Exportación finalizada</translation> + </message> + <message> + <source>The transaction history was successfully saved to %1.</source> + <translation>La transacción ha sido guardada en %1.</translation> + </message> + <message> + <source>Range:</source> + <translation>Rango:</translation> + </message> + <message> + <source>to</source> + <translation>para</translation> + </message> </context> <context> <name>UnitDisplayStatusBarControl</name> @@ -1725,6 +2915,55 @@ </message> </context> <context> + <name>WalletFrame</name> + <message> + <source>No wallet has been loaded.</source> + <translation>No se ha cargado ningún monedero</translation> + </message> +</context> +<context> + <name>WalletModel</name> + <message> + <source>Send Coins</source> + <translation>Enviar</translation> + </message> +</context> +<context> + <name>WalletView</name> + <message> + <source>&Export</source> + <translation>&Exportar</translation> + </message> + <message> + <source>Export the data in the current tab to a file</source> + <translation>Exportar a un archivo los datos de esta pestaña</translation> + </message> + <message> + <source>Backup Wallet</source> + <translation>Copia de seguridad del monedero</translation> + </message> + <message> + <source>Wallet Data (*.dat)</source> + <translation>Datos de monedero (*.dat)</translation> + </message> + <message> + <source>Backup Failed</source> + <translation>La copia de seguridad ha fallado</translation> + </message> + <message> + <source>There was an error trying to save the wallet data to %1.</source> + <translation>Ha habido un error al intentar guardar los datos del monedero en %1.</translation> + </message> + <message> + <source>Backup Successful</source> + <translation>Se ha completado con éxito la copia de respaldo</translation> + </message> + <message> + <source>The wallet data was successfully saved to %1.</source> + <translation>Los datos del monedero se han guardado con éxito en %1.</translation> + </message> +</context> +<context> <name>bitcoin-core</name> <message> <source>Options:</source> @@ -1758,11 +2997,7 @@ </message> <message> <source>Prune: last wallet synchronisation goes beyond pruned data. You need to -reindex (download the whole blockchain again in case of pruned node)</source> - <translation>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)</translation> - </message> - <message> - <source>Reduce storage requirements by pruning (deleting) old blocks. This mode is incompatible with -txindex and -rescan. Warning: Reverting this setting requires re-downloading the entire blockchain. (default: 0 = disable pruning blocks, >%u = target size in MiB to use for block files)</source> - <translation>Reduce los requisitos de almacenaje podando (eliminando) los bloques viejos. Este modo es incompatible con -txindex y -rescan. Advertencia: Revertir este ajuste requiere volver a descargar la cadena de bloques al completo. (predeterminado: 0 = deshabilitar la poda de bloques, >%u = objetivo de tamaño en MiB para usar para los archivos de bloques)</translation> + <translation>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)</translation> </message> <message> <source>Rescans are not possible in pruned mode. You will need to use -reindex which will download the whole blockchain again.</source> @@ -1790,20 +3025,12 @@ <translation>No se ha podido comenzar el servidor HTTP. Ver debug log para detalles.</translation> </message> <message> - <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> - <translation>Aceptar conexiones desde el exterior (predeterminado: 1 si no -proxy o -connect)</translation> - </message> - <message> <source>Bitcoin Core</source> <translation>Bitcoin Core</translation> </message> <message> <source>The %s developers</source> - <translation>Los %s desarrolladores</translation> - </message> - <message> - <source>-fallbackfee is set very high! This is the transaction fee you may pay when fee estimates are not available.</source> - <translation>-fallbackfee tiene un ajuste muy alto! Esta es la comisión de transacción que pagarás cuando las estimaciones de comisiones no estén disponibles.</translation> + <translation>Los desarrolladores de %s</translation> </message> <message> <source>A fee rate (in %s/kB) that will be used when fee estimation has insufficient data (default: %s)</source> @@ -1826,10 +3053,6 @@ <translation>Borrar todas las transacciones del monedero y sólo recuperar aquellas partes de la cadena de bloques por medio de -rescan on startup.</translation> </message> <message> - <source>Distributed under the MIT software license, see the accompanying file COPYING or <http://www.opensource.org/licenses/mit-license.php>.</source> - <translation>Distribuido bajo la licencia de software MIT, vea la copia del archivo adjunto o <http://www.opensource.org/licenses/mit-license.php>.</translation> - </message> - <message> <source>Error loading %s: You can't enable HD on a already existing non-HD wallet</source> <translation>Error cargando %s: No puede habilitar HD en un monedero existente que no es HD</translation> </message> @@ -1842,16 +3065,12 @@ <translation>Ejecutar comando cuando una transacción del monedero cambia (%s en cmd se remplazará por TxID)</translation> </message> <message> - <source>Force relay of transactions from whitelisted peers even they violate local relay policy (default: %d)</source> - <translation>Fuerza la retransmisión de transacciones desde nodos en la lista blanca incluso si violan la política de retransmisiones local (predeterminado: %d)</translation> - </message> - <message> <source>Maximum allowed median peer time offset adjustment. Local perspective of time may be influenced by peers forward or backward by this amount. (default: %u seconds)</source> <translation>Ajuste máximo permitido del tiempo offset medio de pares. La perspectiva local de tiempo se verá influenciada por los pares anteriores y posteriores a esta cantidad. (Por defecto: %u segundos)</translation> </message> <message> <source>Maximum total fees (in %s) to use in a single wallet transaction or raw transaction; setting this too low may abort large transactions (default: %s)</source> - <translation>Máximas comisiones totales (en %s) para utilizar en una sola transacción de la cartera; establecer esto demasiado bajo puede abortar grandes transacciones (predeterminado: %s)</translation> + <translation>Máximas comisiones totales (en %s) para utilizar en una sola transacción del monedero; establecer esto demasiado bajo puede abortar grandes transacciones (predeterminado: %s)</translation> </message> <message> <source>Please check that your computer's date and time are correct! If your clock is wrong, %s will not work properly.</source> @@ -1870,10 +3089,6 @@ <translation>La base de datos de bloques contiene un bloque que parece ser del futuro. Esto puede ser porque la fecha y hora de tu ordenador están mal ajustados. Reconstruye la base de datos de bloques solo si estas seguro de que la fecha y hora de tu ordenador estan ajustados correctamente.</translation> </message> <message> - <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source> - <translation>Esta es una versión de pre-prueba - utilícela bajo su propio riesgo. No la utilice para usos comerciales o de minería.</translation> - </message> - <message> <source>Unable to rewind the database to a pre-fork state. You will need to redownload the blockchain</source> <translation>No es posible reconstruir la base de datos a un estado anterior. Debe descargar de nuevo la cadena de bloques.</translation> </message> @@ -1882,18 +3097,6 @@ <translation>Utiliza UPnP para asignar el puerto de escucha (predeterminado: 1 cuando esta escuchando sin -proxy)</translation> </message> <message> - <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source> - <translation>Atención: ¡Parece que la red no está totalmente de acuerdo! Algunos mineros están presentando inconvenientes.</translation> - </message> - <message> - <source>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</source> - <translation>Atención: ¡Parece que no estamos completamente de acuerdo con nuestros pares! Podría necesitar una actualización, u otros nodos podrían necesitarla.</translation> - </message> - <message> - <source>Whitelist peers connecting from the given netmask or IP address. Can be specified multiple times.</source> - <translation>Poner en lista blanca a los equipos que se conecten desde la máscara de subred o dirección IP especificada. Se puede especificar múltiples veces.</translation> - </message> - <message> <source>You need to rebuild the database using -reindex-chainstate to change -txindex</source> <translation>Necesita reconstruir la base de datos usando -reindex-chainstate para cambiar -txindex</translation> </message> @@ -1930,10 +3133,6 @@ <translation>Cambio de indice fuera de rango</translation> </message> <message> - <source>Connect only to the specified node(s)</source> - <translation>Conectar sólo a los nodos (o nodo) especificados</translation> - </message> - <message> <source>Connection options:</source> <translation>Opciones de conexión:</translation> </message> @@ -2054,10 +3253,6 @@ <translation>Ubicación de la cookie de autenticación (default: data dir)</translation> </message> <message> - <source>Minimum bytes per sigop in transactions we relay and mine (default: %u)</source> - <translation>Mínimo de bytes por sigop en transacciones que retransmitimos y minamos (predeterminado: %u)</translation> - </message> - <message> <source>Not enough file descriptors available.</source> <translation>No hay suficientes descriptores de archivo disponibles. </translation> </message> @@ -2095,11 +3290,7 @@ </message> <message> <source>Set database cache size in megabytes (%d to %d, default: %d)</source> - <translation>Asignar tamaño de cache en megabytes (entre %d y %d; predeterminado: %d)</translation> - </message> - <message> - <source>Set maximum block cost (default: %d)</source> - <translation>Establecer tamaño máximo de bloque (por defecto: %d)</translation> + <translation>Asignar tamaño del cache en megabytes (entre %d y %d; predeterminado: %d)</translation> </message> <message> <source>Set maximum block size in bytes (default: %d)</source> @@ -2199,17 +3390,13 @@ </message> <message> <source>Invalid amount for -maxtxfee=<amount>: '%s' (must be at least the minrelay fee of %s to prevent stuck transactions)</source> - <translation>Cantidad no válida para -maxtxfee=<amount>: '%s' (debe ser por lo menos la cuota de comisión mínima de %s para prevenir transacciones atascadas)</translation> + <translation>Cantidad no válida para -maxtxfee=<amount>: '%s' (debe ser por lo menos la comisión mínima de %s para prevenir transacciones atascadas)</translation> </message> <message> <source>Maximum size of data in data carrier transactions we relay and mine (default: %u)</source> <translation>El tamaño máximo de los datos en las operaciones de transporte de datos que transmitimos y el mio (default: %u)</translation> </message> <message> - <source>Query for peer addresses via DNS lookup, if low on addresses (default: 1 unless -connect)</source> - <translation>Consulta de direcciones pares mediante búsqueda de DNS, si bajo en direcciones (por defecto: 1 a menos que - conectar)</translation> - </message> - <message> <source>Randomize credentials for every proxy connection. This enables Tor stream isolation (default: %u)</source> <translation>Aleatorizar las credenciales para cada conexión proxy. Esto habilita la Tor stream isolation (por defecto: %u)</translation> </message> @@ -2222,10 +3409,6 @@ <translation>Monto de transacción muy pequeña luego de la deducción por comisión</translation> </message> <message> - <source>This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit <https://www.openssl.org/> and cryptographic software written by Eric Young and UPnP software written by Thomas Bernard.</source> - <translation>Este producto incluye software desarrollado por el OpenSSL Project para su uso en OpenSSL Toolkit <https://www.openssl.org/>, software de cifrado escrito por Eric Young y software UPnP escrito por Thomas Bernard.</translation> - </message> - <message> <source>Use hierarchical deterministic key generation (HD) after BIP32. Only has effect during wallet creation/first start</source> <translation>Usar tras BIP32 la generación de llave determinística jerárquica (HD) . Solo tiene efecto durante el primer inicio/generación del monedero</translation> </message> @@ -2295,7 +3478,7 @@ </message> <message> <source>Rescan the block chain for missing wallet transactions on startup</source> - <translation>Rescanea la cadena de bloques para transacciones perdidas de la cartera</translation> + <translation>Rescanea la cadena de bloques para buscar transacciones perdidas del monedero</translation> </message> <message> <source>Send trace/debug info to console instead of debug.log file</source> @@ -2338,16 +3521,12 @@ <translation>Cantidad de la transacción demasiado pequeña</translation> </message> <message> - <source>Transaction amounts must be positive</source> - <translation>Las cantidades en las transacciones deben ser positivas</translation> - </message> - <message> <source>Transaction too large for fee policy</source> <translation>Operación demasiado grande para la política de tasas</translation> </message> <message> <source>Transaction too large</source> - <translation>Transacción demasiado grande</translation> + <translation>Transacción demasiado grande, intenta dividirla en varias.</translation> </message> <message> <source>Unable to bind to %s on this computer (bind returned error %s)</source> @@ -2355,7 +3534,7 @@ </message> <message> <source>Upgrade wallet to latest format on startup</source> - <translation>Actualizar el monedero al último formato</translation> + <translation>Actualizar el monedero al último formato al inicio</translation> </message> <message> <source>Username for JSON-RPC connections</source> @@ -2401,25 +3580,29 @@ </message> <message> <source>(1 = keep tx meta data e.g. account owner and payment request information, 2 = drop tx meta data)</source> - <translation>(1 = keep tx meta data e.g. account owner and payment request information, 2 = drop tx meta data)</translation> + <translation>(1 = mantener los meta datos de transacción, por ejemplo: propietario e información de pago, 2 = omitir los metadatos)</translation> </message> <message> <source>-maxtxfee is set very high! Fees this large could be paid on a single transaction.</source> - <translation>-maxtxfee tiene un ajuste muy elevado! Las comisiones así de grandes podrían ser pagadas en una única transaccion.</translation> - </message> - <message> - <source>-paytxfee is set very high! This is the transaction fee you will pay if you send a transaction.</source> - <translation>-paytxfee tiene un ajuste muy elevado! Esta es la comisión de transacción que pagaras si envías una transaccion.</translation> + <translation>-maxtxfee tiene un ajuste muy elevado! Comisiones muy grandes podrían ser pagadas en una única transaccion.</translation> </message> <message> <source>Do not keep transactions in the mempool longer than <n> hours (default: %u)</source> <translation>No mantener transacciones en la memoria mas de <n> horas (predeterminado: %u)</translation> </message> <message> + <source>Equivalent bytes per sigop in transactions for relay and mining (default: %u)</source> + <translation>Bytes equivalentes por sigop en transacciones para retrasmisión y minado (predeterminado: %u)</translation> + </message> + <message> <source>Fees (in %s/kB) smaller than this are considered zero fee for transaction creation (default: %s)</source> <translation>Las comisiones (en %s/kB) menores que esto son consideradas de cero comision para la creacion de transacciones (predeterminado: %s)</translation> </message> <message> + <source>Force relay of transactions from whitelisted peers even if they violate local relay policy (default: %d)</source> + <translation>Fuerza la retransmisión de transacciones desde nodos en la lista blanca incluso si violan la política de retransmisiones local (predeterminado: %d)</translation> + </message> + <message> <source>How thorough the block verification of -checkblocks is (0-4, default: %u)</source> <translation>Nivel de rigor en la verificación de bloques de -checkblocks (0-4; predeterminado: %u)</translation> </message> @@ -2436,8 +3619,25 @@ <translation>Mostrar depuración (por defecto: %u, proporcionar <category> es opcional)</translation> </message> <message> + <source>Sets the serialization of raw transaction or block hex returned in non-verbose mode, non-segwit(0) or segwit(1) (default: %d)</source> + <translation>https://www.transifex.com/joyful-world/breaking-english/ +Establecer la serialización de las transacciones sin procesar o el bloque hex devuelto en non-verbose mode, non-segwit(O) o segwit(1) (default: %d)</translation> + </message> + <message> + <source>Support filtering of blocks and transaction with bloom filters (default: %u)</source> + <translation>Admite filtrado de bloques, y transacciones con filtros Bloom. Reduce la carga de red. ( por defecto :%u)</translation> + </message> + <message> + <source>Total length of network version string (%i) exceeds maximum length (%i). Reduce the number or size of uacomments.</source> + <translation>La longitud total de la cadena de versión de red ( %i ) supera la longitud máxima ( %i ) . Reducir el número o tamaño de uacomments .</translation> + </message> + <message> + <source>Tries to keep outbound traffic under the given target (in MiB per 24h), 0 = no limit (default: %d)</source> + <translation>Intenta de mantener el Tráfico de salida , bajo el Objetivo Determinado (en MiB por 24h) , 0 = sin limite (Por Defecto :%d )</translation> + </message> + <message> <source>Unsupported argument -socks found. Setting SOCKS version isn't possible anymore, only SOCKS5 proxies are supported.</source> - <translation>Error: Unsupported argumento -socks encontrados. SOCKS versión ajuste ya no es posible, sólo SOCKS5 proxies son compatibles.</translation> + <translation>Error: argumento -socks encontrado. El ajuste de la versión SOCKS ya no es posible, sólo proxies SOCKS5 son compatibles.</translation> </message> <message> <source>Unsupported argument -whitelistalwaysrelay ignored, use -whitelistrelay and/or -whitelistforcerelay.</source> @@ -2448,10 +3648,6 @@ <translation>Usar distintos proxys SOCKS5 para comunicarse vía Tor de forma anónima (Por defecto: %s)</translation> </message> <message> - <source>Username and hashed password for JSON-RPC connections. The field <userpw> comes in the format: <USERNAME>:<SALT>$<HASH>. A canonical python script is included in share/rpcuser. This option can be specified multiple times</source> - <translation>Nombre de usuario y hash de la contraseña para las conexiones JSON-RPC. El campo <userpw> tiene el formato: <USERNAME>:<SALT>$<HASH>. Se incluye un script python convencional en share/rpcuser. Esta opción puede ser especificada multiples veces</translation> - </message> - <message> <source>Warning: Unknown block versions being mined! It's possible unknown rules are in effect</source> <translation>Advertencia: Se están minando versiones de bloques desconocidas! Es posible que normas desconocidas estén activas</translation> </message> @@ -2460,6 +3656,10 @@ <translation>Aviso: fichero de monedero corrupto, datos recuperados! Original %s guardado como %s en %s; si su balance de transacciones es incorrecto, debe restaurar desde una copia de seguridad.</translation> </message> <message> + <source>Whitelist peers connecting from the given IP address (e.g. 1.2.3.4) or CIDR notated network (e.g. 1.2.3.0/24). Can be specified multiple times.</source> + <translation>Los pares de listas blancas que se conectan desde la dirección IP dada (por ejemplo, 1.2.3.4) o la red marcada CIDR (por ejemplo, 1.2.3.0/24). Se puede especificar varias veces.</translation> + </message> + <message> <source>(default: %s)</source> <translation>(predeterminado: %s)</translation> </message> @@ -2520,8 +3720,8 @@ <translation>Ajustar el número de claves en reserva <n> (predeterminado: %u)</translation> </message> <message> - <source>Set minimum block size in bytes (default: %u)</source> - <translation>Establecer tamaño mínimo de bloque en bytes (por defecto: %u)</translation> + <source>Set maximum BIP141 block weight (default: %d)</source> + <translation>Establecer peso máximo bloque BIP141 (predeterminado: %d)</translation> </message> <message> <source>Set the number of threads to service RPC calls (default: %d)</source> @@ -2541,7 +3741,11 @@ </message> <message> <source>Spend unconfirmed change when sending transactions (default: %u)</source> - <translation>Gastar cambio no confirmado al enviar transacciones (predeterminado: %u)</translation> + <translation>Usar cambio aún no confirmado al enviar transacciones (predeterminado: %u)</translation> + </message> + <message> + <source>Starting network threads...</source> + <translation>Iniciando funciones de red...</translation> </message> <message> <source>Threshold for disconnecting misbehaving peers (default: %u)</source> @@ -2569,7 +3773,7 @@ </message> <message> <source>Cannot downgrade wallet</source> - <translation>No se puede rebajar el monedero</translation> + <translation>No se puede cambiar a una versión mas antigua el monedero</translation> </message> <message> <source>Cannot write default address</source> diff --git a/src/qt/locale/bitcoin_es_AR.ts b/src/qt/locale/bitcoin_es_AR.ts index 40ebaf8856..6a418e645b 100644 --- a/src/qt/locale/bitcoin_es_AR.ts +++ b/src/qt/locale/bitcoin_es_AR.ts @@ -41,7 +41,10 @@ <source>&Delete</source> <translation>&Borrar</translation> </message> -</context> + </context> +<context> + <name>AddressTableModel</name> + </context> <context> <name>AskPassphraseDialog</name> <message> @@ -60,7 +63,7 @@ <source>Repeat new passphrase</source> <translation>Repetí la nueva Frase de Contraseña</translation> </message> -</context> + </context> <context> <name>BanTableModel</name> </context> @@ -83,6 +86,9 @@ <name>Intro</name> </context> <context> + <name>ModalOverlay</name> + </context> +<context> <name>OpenURIDialog</name> </context> <context> @@ -92,12 +98,21 @@ <name>OverviewPage</name> </context> <context> + <name>PaymentServer</name> + </context> +<context> <name>PeerTableModel</name> </context> <context> <name>QObject</name> </context> <context> + <name>QObject::QObject</name> + </context> +<context> + <name>QRImageWidget</name> + </context> +<context> <name>RPCConsole</name> </context> <context> @@ -107,12 +122,18 @@ <name>ReceiveRequestDialog</name> </context> <context> + <name>RecentRequestsTableModel</name> + </context> +<context> <name>SendCoinsDialog</name> </context> <context> <name>SendCoinsEntry</name> </context> <context> + <name>SendConfirmationDialog</name> + </context> +<context> <name>ShutdownWindow</name> </context> <context> @@ -125,12 +146,30 @@ <name>TrafficGraphWidget</name> </context> <context> + <name>TransactionDesc</name> + </context> +<context> <name>TransactionDescDialog</name> </context> <context> + <name>TransactionTableModel</name> + </context> +<context> + <name>TransactionView</name> + </context> +<context> <name>UnitDisplayStatusBarControl</name> </context> <context> + <name>WalletFrame</name> + </context> +<context> + <name>WalletModel</name> + </context> +<context> + <name>WalletView</name> + </context> +<context> <name>bitcoin-core</name> </context> </TS>
\ No newline at end of file diff --git a/src/qt/locale/bitcoin_es_CL.ts b/src/qt/locale/bitcoin_es_CL.ts index 188641d6e7..ac01c4219b 100644 --- a/src/qt/locale/bitcoin_es_CL.ts +++ b/src/qt/locale/bitcoin_es_CL.ts @@ -41,7 +41,10 @@ <source>&Delete</source> <translation>&Borrar</translation> </message> -</context> + </context> +<context> + <name>AddressTableModel</name> + </context> <context> <name>AskPassphraseDialog</name> <message> @@ -56,7 +59,7 @@ <source>Repeat new passphrase</source> <translation>Repite nueva contraseña</translation> </message> -</context> + </context> <context> <name>BanTableModel</name> </context> @@ -207,10 +210,6 @@ <translation>Pide pagos (genera codigos QR and bitcoin: URls)</translation> </message> <message> - <source>%1 and %2</source> - <translation>%1 y %2</translation> - </message> - <message> <source>Error</source> <translation>Error</translation> </message> @@ -246,7 +245,7 @@ <source>Wallet is <b>encrypted</b> and currently <b>locked</b></source> <translation>La billetera esta <b>codificada</b> y actualmente <b>bloqueda</b></translation> </message> -</context> + </context> <context> <name>CoinControlDialog</name> <message> @@ -254,10 +253,6 @@ <translation>Cantidad:</translation> </message> <message> - <source>Priority:</source> - <translation>prioridad:</translation> - </message> - <message> <source>Fee:</source> <translation>comisión: </translation> @@ -278,11 +273,7 @@ <source>Confirmed</source> <translation>Confirmado</translation> </message> - <message> - <source>Priority</source> - <translation>prioridad</translation> - </message> -</context> + </context> <context> <name>EditAddressDialog</name> <message> @@ -297,7 +288,7 @@ <source>&Address</source> <translation>&Dirección</translation> </message> -</context> + </context> <context> <name>FreespaceChecker</name> <message> @@ -332,6 +323,13 @@ </message> </context> <context> + <name>ModalOverlay</name> + <message> + <source>Form</source> + <translation>Formulario</translation> + </message> + </context> +<context> <name>OpenURIDialog</name> <message> <source>URI:</source> @@ -442,6 +440,9 @@ </message> </context> <context> + <name>PaymentServer</name> + </context> +<context> <name>PeerTableModel</name> </context> <context> @@ -454,6 +455,16 @@ <source>N/A</source> <translation>N/A</translation> </message> + <message> + <source>%1 and %2</source> + <translation>%1 y %2</translation> + </message> + </context> +<context> + <name>QObject::QObject</name> + </context> +<context> + <name>QRImageWidget</name> </context> <context> <name>RPCConsole</name> @@ -548,7 +559,10 @@ <source>&Save Image...</source> <translation>Guardar imagen...</translation> </message> -</context> + </context> +<context> + <name>RecentRequestsTableModel</name> + </context> <context> <name>SendCoinsDialog</name> <message> @@ -564,10 +578,6 @@ <translation>Cantidad:</translation> </message> <message> - <source>Priority:</source> - <translation>prioridad:</translation> - </message> - <message> <source>Fee:</source> <translation>comisión: </translation> @@ -608,7 +618,7 @@ <source>S&end</source> <translation>&Envía</translation> </message> -</context> + </context> <context> <name>SendCoinsEntry</name> <message> @@ -645,6 +655,9 @@ </message> </context> <context> + <name>SendConfirmationDialog</name> + </context> +<context> <name>ShutdownWindow</name> </context> <context> @@ -709,16 +722,34 @@ </message> </context> <context> + <name>TransactionDesc</name> + </context> +<context> <name>TransactionDescDialog</name> <message> <source>This pane shows a detailed description of the transaction</source> <translation>Esta ventana muestra información detallada sobre la transacción</translation> </message> -</context> + </context> +<context> + <name>TransactionTableModel</name> + </context> +<context> + <name>TransactionView</name> + </context> <context> <name>UnitDisplayStatusBarControl</name> </context> <context> + <name>WalletFrame</name> + </context> +<context> + <name>WalletModel</name> + </context> +<context> + <name>WalletView</name> + </context> +<context> <name>bitcoin-core</name> <message> <source>Options:</source> @@ -745,11 +776,6 @@ <translation>bitcoin core</translation> </message> <message> - <source>Connect only to the specified node(s)</source> - <translation>Conecta solo al nodo especificado -</translation> - </message> - <message> <source>Error loading block database</source> <translation>Error cargando blkindex.dat</translation> </message> diff --git a/src/qt/locale/bitcoin_es_CO.ts b/src/qt/locale/bitcoin_es_CO.ts index df189190f6..f993f88605 100644 --- a/src/qt/locale/bitcoin_es_CO.ts +++ b/src/qt/locale/bitcoin_es_CO.ts @@ -37,7 +37,10 @@ <source>&Delete</source> <translation>&Borrar</translation> </message> -</context> + </context> +<context> + <name>AddressTableModel</name> + </context> <context> <name>AskPassphraseDialog</name> <message> @@ -56,7 +59,7 @@ <source>Repeat new passphrase</source> <translation>Repetir nueva contraseña</translation> </message> -</context> + </context> <context> <name>BanTableModel</name> </context> @@ -198,11 +201,18 @@ <context> <name>Intro</name> <message> + <source>Welcome</source> + <translation>bienvenido</translation> + </message> + <message> <source>Error</source> <translation>Error</translation> </message> </context> <context> + <name>ModalOverlay</name> + </context> +<context> <name>OpenURIDialog</name> </context> <context> @@ -212,12 +222,21 @@ <name>OverviewPage</name> </context> <context> + <name>PaymentServer</name> + </context> +<context> <name>PeerTableModel</name> </context> <context> <name>QObject</name> </context> <context> + <name>QObject::QObject</name> + </context> +<context> + <name>QRImageWidget</name> + </context> +<context> <name>RPCConsole</name> </context> <context> @@ -227,12 +246,18 @@ <name>ReceiveRequestDialog</name> </context> <context> + <name>RecentRequestsTableModel</name> + </context> +<context> <name>SendCoinsDialog</name> </context> <context> <name>SendCoinsEntry</name> </context> <context> + <name>SendConfirmationDialog</name> + </context> +<context> <name>ShutdownWindow</name> </context> <context> @@ -245,12 +270,30 @@ <name>TrafficGraphWidget</name> </context> <context> + <name>TransactionDesc</name> + </context> +<context> <name>TransactionDescDialog</name> </context> <context> + <name>TransactionTableModel</name> + </context> +<context> + <name>TransactionView</name> + </context> +<context> <name>UnitDisplayStatusBarControl</name> </context> <context> + <name>WalletFrame</name> + </context> +<context> + <name>WalletModel</name> + </context> +<context> + <name>WalletView</name> + </context> +<context> <name>bitcoin-core</name> <message> <source>Bitcoin Core</source> diff --git a/src/qt/locale/bitcoin_es_DO.ts b/src/qt/locale/bitcoin_es_DO.ts index ba963d2b80..77e6ef16f3 100644 --- a/src/qt/locale/bitcoin_es_DO.ts +++ b/src/qt/locale/bitcoin_es_DO.ts @@ -37,7 +37,10 @@ <source>&Delete</source> <translation>&Eliminar</translation> </message> -</context> + </context> +<context> + <name>AddressTableModel</name> + </context> <context> <name>AskPassphraseDialog</name> <message> @@ -56,7 +59,7 @@ <source>Repeat new passphrase</source> <translation>Repita la nueva contraseña</translation> </message> -</context> + </context> <context> <name>BanTableModel</name> </context> @@ -235,10 +238,6 @@ <translation>&Opciones de linea de comando</translation> </message> <message> - <source>No block source available...</source> - <translation>Ninguna fuente de bloques disponible ...</translation> - </message> - <message> <source>%1 behind</source> <translation>%1 atrás</translation> </message> @@ -286,7 +285,7 @@ <source>Wallet is <b>encrypted</b> and currently <b>locked</b></source> <translation>El monedero está <b>cifrado</b> y actualmente <b>bloqueado</b></translation> </message> -</context> + </context> <context> <name>CoinControlDialog</name> <message> @@ -302,10 +301,6 @@ <translation>Cuantía:</translation> </message> <message> - <source>Priority:</source> - <translation>Prioridad:</translation> - </message> - <message> <source>Fee:</source> <translation>Tasa:</translation> </message> @@ -345,11 +340,7 @@ <source>Confirmed</source> <translation>Confirmado</translation> </message> - <message> - <source>Priority</source> - <translation>Prioridad</translation> - </message> -</context> + </context> <context> <name>EditAddressDialog</name> <message> @@ -372,7 +363,7 @@ <source>&Address</source> <translation>&Dirección</translation> </message> -</context> + </context> <context> <name>FreespaceChecker</name> <message> @@ -435,6 +426,17 @@ </message> </context> <context> + <name>ModalOverlay</name> + <message> + <source>Form</source> + <translation>Desde</translation> + </message> + <message> + <source>Last block time</source> + <translation>Hora del último bloque</translation> + </message> + </context> +<context> <name>OpenURIDialog</name> <message> <source>Open URI</source> @@ -452,7 +454,7 @@ <source>Select payment request file</source> <translation>Seleccione archivo de sulicitud de pago</translation> </message> -</context> + </context> <context> <name>OptionsDialog</name> <message> @@ -616,6 +618,9 @@ </message> </context> <context> + <name>PaymentServer</name> + </context> +<context> <name>PeerTableModel</name> </context> <context> @@ -638,6 +643,12 @@ </message> </context> <context> + <name>QObject::QObject</name> + </context> +<context> + <name>QRImageWidget</name> + </context> +<context> <name>RPCConsole</name> <message> <source>N/A</source> @@ -798,7 +809,7 @@ <source>Remove</source> <translation>Eliminar</translation> </message> -</context> + </context> <context> <name>ReceiveRequestDialog</name> <message> @@ -817,7 +828,10 @@ <source>&Save Image...</source> <translation>Guardar Imagen...</translation> </message> -</context> + </context> +<context> + <name>RecentRequestsTableModel</name> + </context> <context> <name>SendCoinsDialog</name> <message> @@ -853,10 +867,6 @@ <translation>Cuantía:</translation> </message> <message> - <source>Priority:</source> - <translation>Prioridad:</translation> - </message> - <message> <source>Fee:</source> <translation>Tasa:</translation> </message> @@ -908,7 +918,7 @@ <source>S&end</source> <translation>&Enviar</translation> </message> -</context> + </context> <context> <name>SendCoinsEntry</name> <message> @@ -963,7 +973,10 @@ <source>Memo:</source> <translation>Memo:</translation> </message> -</context> + </context> +<context> + <name>SendConfirmationDialog</name> + </context> <context> <name>ShutdownWindow</name> </context> @@ -1037,7 +1050,7 @@ <source>Reset all verify message fields</source> <translation>Limpiar todos los campos de la verificación de mensaje</translation> </message> -</context> + </context> <context> <name>SplashScreen</name> <message> @@ -1053,16 +1066,34 @@ </message> </context> <context> + <name>TransactionDesc</name> + </context> +<context> <name>TransactionDescDialog</name> <message> <source>This pane shows a detailed description of the transaction</source> <translation>Esta ventana muestra información detallada sobre la transacción</translation> </message> -</context> + </context> +<context> + <name>TransactionTableModel</name> + </context> +<context> + <name>TransactionView</name> + </context> <context> <name>UnitDisplayStatusBarControl</name> </context> <context> + <name>WalletFrame</name> + </context> +<context> + <name>WalletModel</name> + </context> +<context> + <name>WalletView</name> + </context> +<context> <name>bitcoin-core</name> <message> <source>Options:</source> @@ -1092,10 +1123,6 @@ </translation> </message> <message> - <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> - <translation>Aceptar conexiones desde el exterior (predeterminado: 1 si no -proxy o -connect)</translation> - </message> - <message> <source>Bitcoin Core</source> <translation>Núcleo de Bitcoin</translation> </message> @@ -1108,18 +1135,6 @@ <translation>Ejecutar comando cuando una transacción del monedero cambia (%s en cmd se remplazará por TxID)</translation> </message> <message> - <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source> - <translation>Esta es una versión de pre-prueba - utilícela bajo su propio riesgo. No la utilice para usos comerciales o de minería.</translation> - </message> - <message> - <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source> - <translation>Atención: ¡Parece que la red no está totalmente de acuerdo! Algunos mineros están presentando inconvenientes.</translation> - </message> - <message> - <source>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</source> - <translation>Atención: ¡Parece que no estamos completamente de acuerdo con nuestros pares! Podría necesitar una actualización, u otros nodos podrían necesitarla.</translation> - </message> - <message> <source><category> can be:</source> <translation><category> puede ser:</translation> </message> @@ -1128,10 +1143,6 @@ <translation>Opciones de creación de bloques:</translation> </message> <message> - <source>Connect only to the specified node(s)</source> - <translation>Conectar sólo a los nodos (o nodo) especificados</translation> - </message> - <message> <source>Corrupted block database detected</source> <translation>Corrupción de base de datos de bloques detectada.</translation> </message> @@ -1232,10 +1243,6 @@ <translation>Monto de la transacción muy pequeño</translation> </message> <message> - <source>Transaction amounts must be positive</source> - <translation>Montos de transacciones deben ser positivos</translation> - </message> - <message> <source>Transaction too large</source> <translation>Transacción demasiado grande</translation> </message> diff --git a/src/qt/locale/bitcoin_es_ES.ts b/src/qt/locale/bitcoin_es_ES.ts index c66a477cc2..7865483183 100644 --- a/src/qt/locale/bitcoin_es_ES.ts +++ b/src/qt/locale/bitcoin_es_ES.ts @@ -3,11 +3,11 @@ <name>AddressBookPage</name> <message> <source>Right-click to edit address or label</source> - <translation>Haz clic derecho para editar la dirección o la etiqueta</translation> + <translation>Haz clic derecho para editar la dirección o etiqueta</translation> </message> <message> <source>Create a new address</source> - <translation>Crea una nueva direccióon</translation> + <translation>Crear una nueva dirección</translation> </message> <message> <source>&New</source> @@ -15,7 +15,7 @@ </message> <message> <source>Copy the currently selected address to the system clipboard</source> - <translation>Copia la direccón seleccionada al portapapeles del sistema</translation> + <translation>Copiar la dirección seleccionada al portapapeles del sistema</translation> </message> <message> <source>&Copy</source> @@ -27,11 +27,11 @@ </message> <message> <source>Delete the currently selected address from the list</source> - <translation>Elimina la dirección seleccionada de la lista</translation> + <translation>Eliminar la dirección seleccionada de la lista</translation> </message> <message> <source>Export the data in the current tab to a file</source> - <translation>Exporta los datos de la pestaña actual a un archivo</translation> + <translation>Exportar los datos en la ficha actual a un archivo</translation> </message> <message> <source>&Export</source> @@ -41,16 +41,87 @@ <source>&Delete</source> <translation>&Eliminar</translation> </message> + <message> + <source>Choose the address to send coins to</source> + <translation>Seleccione la dirección a la que enviar monedas</translation> + </message> + <message> + <source>Choose the address to receive coins with</source> + <translation>Seleccione la dirección de la que recibir monedas</translation> + </message> + <message> + <source>C&hoose</source> + <translation>E&scoger</translation> + </message> + <message> + <source>Sending addresses</source> + <translation>Enviando direcciones</translation> + </message> + <message> + <source>Receiving addresses</source> + <translation>Recibiendo direcciones</translation> + </message> + <message> + <source>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source> + <translation>Estas son sus direcciones Bitcoin para enviar pagos. Verifique siempre la cantidad y la dirección de recibimiento antes de enviar monedas.</translation> + </message> + <message> + <source>These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction.</source> + <translation>Estas son sus direcciones Bitcoin para recibir pagos. Se recomienda utilizar una nueva dirección de recibimiento para cada transacción</translation> + </message> + <message> + <source>&Copy Address</source> + <translation>&Copiar Dirección</translation> + </message> + <message> + <source>Copy &Label</source> + <translation>Copiar &Etiqueta</translation> + </message> + <message> + <source>&Edit</source> + <translation>&Editar</translation> + </message> + <message> + <source>Export Address List</source> + <translation>Exportar lista de direcciones</translation> + </message> + <message> + <source>Comma separated file (*.csv)</source> + <translation>Archivo separado de coma (*.csv)</translation> + </message> + <message> + <source>Exporting Failed</source> + <translation>Falló la exportación</translation> + </message> + <message> + <source>There was an error trying to save the address list to %1. Please try again.</source> + <translation>Había un error intentando guardar la lista de direcciones en %1. Por favor inténtelo de nuevo.</translation> + </message> +</context> +<context> + <name>AddressTableModel</name> + <message> + <source>Label</source> + <translation>Etiqueta</translation> + </message> + <message> + <source>Address</source> + <translation>Dirección</translation> + </message> + <message> + <source>(no label)</source> + <translation>(sin etiqueta)</translation> + </message> </context> <context> <name>AskPassphraseDialog</name> <message> <source>Passphrase Dialog</source> - <translation>Dialogo de Contraseña</translation> + <translation>Diálogo de contraseña</translation> </message> <message> <source>Enter passphrase</source> - <translation>Introduzca la contraseña</translation> + <translation>Introducir contraseña</translation> </message> <message> <source>New passphrase</source> @@ -58,12 +129,108 @@ </message> <message> <source>Repeat new passphrase</source> - <translation>Repite la nueva contraseña</translation> + <translation>Repita la nueva contraseña</translation> + </message> + <message> + <source>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>.</source> + <translation>Introduzca la nueva frase clave del monedero. <br/>Por favor utilice una frase clave de <b>diez o más carácteres aleatorios</b>, o <b>ocho o más palabras</b>.</translation> + </message> + <message> + <source>Encrypt wallet</source> + <translation>Monedero encriptado</translation> + </message> + <message> + <source>This operation needs your wallet passphrase to unlock the wallet.</source> + <translation>Esta operación necesita su frase clave de monedero para desbloquear el monedero.</translation> + </message> + <message> + <source>Unlock wallet</source> + <translation>Desbloquear monedero</translation> + </message> + <message> + <source>This operation needs your wallet passphrase to decrypt the wallet.</source> + <translation>Esta operación necesita su frase clave de cartera para desencriptar el monedero.</translation> + </message> + <message> + <source>Decrypt wallet</source> + <translation>Desencriptar monedero</translation> + </message> + <message> + <source>Change passphrase</source> + <translation>Cambiar frase clave</translation> + </message> + <message> + <source>Enter the old passphrase and new passphrase to the wallet.</source> + <translation>Introduzca la vieja frase clave y la nueva flase clave para el monedero.</translation> + </message> + <message> + <source>Confirm wallet encryption</source> + <translation>Confirmar encriptación del monedero</translation> + </message> + <message> + <source>Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR BITCOINS</b>!</source> + <translation>Advertencia: Si encripta su monedero y pierde su frase clave <b>PERDERÁ TODOS SUS BITCOINS</b>!</translation> + </message> + <message> + <source>Are you sure you wish to encrypt your wallet?</source> + <translation>¿Seguro que desea encriptar su monedero?</translation> + </message> + <message> + <source>Wallet encrypted</source> + <translation>Monedero encriptado</translation> + </message> + <message> + <source>%1 will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your bitcoins from being stolen by malware infecting your computer.</source> + <translation>%1 se cerrará ahora para terminar el proceso de encriptación. Recuerde que encriptar su monedero no puede proteger completamente su monedero de ser robado por malware que infecte su ordenador.</translation> + </message> + <message> + <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source> + <translation>IMPORTANTE: Cualquier copia de seguridad anterior que haya hecho en su archivo de monedero debería ser reemplazada con el archivo de monedero encriptado generado recientemente. Por razones de seguridad, las copias de seguridad anteriores del archivo de monedero desencriptado serán inútiles en cuanto empiece a utilizar el nuevo monedero encriptado.</translation> + </message> + <message> + <source>Wallet encryption failed</source> + <translation>Fracasó la encriptación de monedero</translation> + </message> + <message> + <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source> + <translation>Falló la encriptación del monedero debido a un error interno. Su monedero no fue encriptado.</translation> + </message> + <message> + <source>The supplied passphrases do not match.</source> + <translation>La frase clave introducida no coincide.</translation> + </message> + <message> + <source>Wallet unlock failed</source> + <translation>Fracasó el desbloqueo del monedero</translation> + </message> + <message> + <source>The passphrase entered for the wallet decryption was incorrect.</source> + <translation>La frase clave introducida para la encriptación del monedero es incorrecta.</translation> + </message> + <message> + <source>Wallet decryption failed</source> + <translation>Fracasó la encriptación del monedero</translation> + </message> + <message> + <source>Wallet passphrase was successfully changed.</source> + <translation>La frase clave del monedero se ha cambiado con éxito.</translation> + </message> + <message> + <source>Warning: The Caps Lock key is on!</source> + <translation>Alerta: ¡La clave de bloqueo Caps está activa!</translation> </message> </context> <context> <name>BanTableModel</name> - </context> + <message> + <source>IP/Netmask</source> + <translation>IP/Máscara</translation> + </message> + <message> + <source>Banned Until</source> + <translation>Bloqueado Hasta</translation> + </message> +</context> <context> <name>BitcoinGUI</name> <message> @@ -72,7 +239,7 @@ </message> <message> <source>Synchronizing with network...</source> - <translation>Sincronizando con la red...</translation> + <translation>Sincronizando con la red…</translation> </message> <message> <source>&Overview</source> @@ -84,7 +251,7 @@ </message> <message> <source>Show general overview of wallet</source> - <translation>Mostrar vista general de la cartera</translation> + <translation>Mostrar vista general del monedero</translation> </message> <message> <source>&Transactions</source> @@ -92,7 +259,7 @@ </message> <message> <source>Browse transaction history</source> - <translation>Navegar historial de transacciones</translation> + <translation>Examinar el historial de transacciones</translation> </message> <message> <source>E&xit</source> @@ -103,36 +270,48 @@ <translation>Salir de la aplicación</translation> </message> <message> + <source>&About %1</source> + <translation>&Acerca de %1</translation> + </message> + <message> + <source>Show information about %1</source> + <translation>Mostrar información acerca de %1</translation> + </message> + <message> <source>About &Qt</source> <translation>Acerca de &Qt</translation> </message> <message> <source>Show information about Qt</source> - <translation>Muestra información acerca de Qt</translation> + <translation>Mostrar información acerca de Qt</translation> </message> <message> <source>&Options...</source> <translation>&Opciones...</translation> </message> <message> + <source>Modify configuration options for %1</source> + <translation>Modificar las opciones de configuración para %1</translation> + </message> + <message> <source>&Encrypt Wallet...</source> - <translation>&Encriptar Cartera...</translation> + <translation>&Cifrar monedero…</translation> </message> <message> <source>&Backup Wallet...</source> - <translation>&Hacer copia de seguridad de la cartera...</translation> + <translation>&Guardar copia del monedero...</translation> </message> <message> <source>&Change Passphrase...</source> - <translation>&Cambiar contraseña...</translation> + <translation>&Cambiar la contraseña…</translation> </message> <message> <source>&Sending addresses...</source> - <translation>&Enviando direcciones...</translation> + <translation>Direcciones de &envío...</translation> </message> <message> <source>&Receiving addresses...</source> - <translation>&Recibiendo direcciones..</translation> + <translation>Direcciones de &recepción...</translation> </message> <message> <source>Open &URI...</source> @@ -140,93 +319,3300 @@ </message> <message> <source>Reindexing blocks on disk...</source> - <translation>Reindexando bloques en el disco...</translation> + <translation>Reindexando bloques en disco...</translation> </message> <message> <source>Send coins to a Bitcoin address</source> - <translation>Envia monedas a una dirección Bitcoin</translation> + <translation>Enviar bitcoins a una dirección Bitcoin</translation> </message> <message> <source>Backup wallet to another location</source> - <translation>Crea una copia de seguridad de tu cartera en otra ubicación</translation> + <translation>Copia de seguridad del monedero en otra ubicación</translation> + </message> + <message> + <source>Change the passphrase used for wallet encryption</source> + <translation>Cambiar la contraseña utilizada para el cifrado del monedero</translation> + </message> + <message> + <source>&Debug window</source> + <translation>&Ventana de depuración</translation> + </message> + <message> + <source>Open debugging and diagnostic console</source> + <translation>Abrir la consola de depuración y diagnóstico</translation> + </message> + <message> + <source>&Verify message...</source> + <translation>&Verificar mensaje...</translation> + </message> + <message> + <source>Bitcoin</source> + <translation>Bitcoin</translation> + </message> + <message> + <source>Wallet</source> + <translation>Monedero</translation> + </message> + <message> + <source>&Send</source> + <translation>&Enviar</translation> + </message> + <message> + <source>&Receive</source> + <translation>&Recibir</translation> + </message> + <message> + <source>&Show / Hide</source> + <translation>&Mostrar / Ocultar</translation> + </message> + <message> + <source>Show or hide the main Window</source> + <translation>Mostrar u ocultar la ventana principal</translation> + </message> + <message> + <source>Encrypt the private keys that belong to your wallet</source> + <translation>Cifrar las claves privadas de su monedero</translation> + </message> + <message> + <source>Sign messages with your Bitcoin addresses to prove you own them</source> + <translation>Firmar mensajes con sus direcciones Bitcoin para demostrar la propiedad</translation> + </message> + <message> + <source>Verify messages to ensure they were signed with specified Bitcoin addresses</source> + <translation>Verificar mensajes comprobando que están firmados con direcciones Bitcoin concretas</translation> + </message> + <message> + <source>&File</source> + <translation>&Archivo</translation> + </message> + <message> + <source>&Settings</source> + <translation>&Configuración</translation> + </message> + <message> + <source>&Help</source> + <translation>&Ayuda</translation> + </message> + <message> + <source>Tabs toolbar</source> + <translation>Barra de pestañas</translation> + </message> + <message> + <source>Request payments (generates QR codes and bitcoin: URIs)</source> + <translation>Solicitar pagos (generando códigos QR e identificadores URI "bitcoin:")</translation> + </message> + <message> + <source>Show the list of used sending addresses and labels</source> + <translation>Mostrar la lista de direcciones de envío y etiquetas</translation> + </message> + <message> + <source>Show the list of used receiving addresses and labels</source> + <translation>Muestra la lista de direcciones de recepción y etiquetas</translation> + </message> + <message> + <source>Open a bitcoin: URI or payment request</source> + <translation>Abrir un identificador URI "bitcoin:" o una petición de pago</translation> + </message> + <message> + <source>&Command-line options</source> + <translation>&Opciones de consola de comandos</translation> + </message> + <message numerus="yes"> + <source>%n active connection(s) to Bitcoin network</source> + <translation><numerusform>%n conexión activa hacia la red Bitcoin</numerusform><numerusform>%n conexiones activas hacia la red Bitcoin</numerusform></translation> + </message> + <message> + <source>Indexing blocks on disk...</source> + <translation>Indexando bloques en disco...</translation> + </message> + <message> + <source>Processing blocks on disk...</source> + <translation>Procesando bloques en disco...</translation> + </message> + <message numerus="yes"> + <source>Processed %n block(s) of transaction history.</source> + <translation><numerusform>%n bloque procesado del historial de transacciones.</numerusform><numerusform>%n bloques procesados del historial de transacciones.</numerusform></translation> + </message> + <message> + <source>%1 behind</source> + <translation>%1 atrás</translation> + </message> + <message> + <source>Last received block was generated %1 ago.</source> + <translation>El último bloque recibido fue generado hace %1.</translation> + </message> + <message> + <source>Transactions after this will not yet be visible.</source> + <translation>Las transacciones posteriores aún no están visibles.</translation> + </message> + <message> + <source>Error</source> + <translation>Error</translation> + </message> + <message> + <source>Warning</source> + <translation>Aviso</translation> + </message> + <message> + <source>Information</source> + <translation>Información</translation> + </message> + <message> + <source>Up to date</source> + <translation>Actualizado</translation> + </message> + <message> + <source>Show the %1 help message to get a list with possible Bitcoin command-line options</source> + <translation>Mostrar el mensaje de ayuda %1 para obtener una lista de los posibles comandos de linea de comandos de Bitcoin</translation> + </message> + <message> + <source>%1 client</source> + <translation>%1 cliente</translation> + </message> + <message> + <source>Catching up...</source> + <translation>Actualizando...</translation> + </message> + <message> + <source>Date: %1 +</source> + <translation>Fecha: %1 +</translation> + </message> + <message> + <source>Amount: %1 +</source> + <translation>Amount: %1 +</translation> + </message> + <message> + <source>Type: %1 +</source> + <translation>Tipo: %1 +</translation> + </message> + <message> + <source>Label: %1 +</source> + <translation>Etiqueta: %1 +</translation> + </message> + <message> + <source>Address: %1 +</source> + <translation>Dirección: %1 +</translation> + </message> + <message> + <source>Sent transaction</source> + <translation>Transacción enviada</translation> + </message> + <message> + <source>Incoming transaction</source> + <translation>Transacción entrante</translation> + </message> + <message> + <source>Wallet is <b>encrypted</b> and currently <b>unlocked</b></source> + <translation>El monedero está <b>cifrado</b> y actualmente <b>desbloqueado</b></translation> + </message> + <message> + <source>Wallet is <b>encrypted</b> and currently <b>locked</b></source> + <translation>El monedero está <b>cifrado</b> y actualmente <b>bloqueado</b></translation> </message> </context> <context> <name>CoinControlDialog</name> - </context> + <message> + <source>Coin Selection</source> + <translation>Selección de la moneda</translation> + </message> + <message> + <source>Quantity:</source> + <translation>Cantidad:</translation> + </message> + <message> + <source>Bytes:</source> + <translation>Bytes:</translation> + </message> + <message> + <source>Amount:</source> + <translation>Cuantía:</translation> + </message> + <message> + <source>Fee:</source> + <translation>Tasa:</translation> + </message> + <message> + <source>Dust:</source> + <translation>Polvo:</translation> + </message> + <message> + <source>After Fee:</source> + <translation>Después de aplicar la comisión:</translation> + </message> + <message> + <source>Change:</source> + <translation>Cambio:</translation> + </message> + <message> + <source>(un)select all</source> + <translation>(des)marcar todos</translation> + </message> + <message> + <source>Tree mode</source> + <translation>Modo árbol</translation> + </message> + <message> + <source>List mode</source> + <translation>Modo lista</translation> + </message> + <message> + <source>Amount</source> + <translation>Cantidad</translation> + </message> + <message> + <source>Received with label</source> + <translation>Recibido con etiqueta</translation> + </message> + <message> + <source>Received with address</source> + <translation>Recibido con dirección</translation> + </message> + <message> + <source>Date</source> + <translation>Fecha</translation> + </message> + <message> + <source>Confirmations</source> + <translation>Confirmaciones</translation> + </message> + <message> + <source>Confirmed</source> + <translation>Confirmado</translation> + </message> + <message> + <source>Copy address</source> + <translation>Copiar ubicación</translation> + </message> + <message> + <source>Copy label</source> + <translation>Copiar etiqueta</translation> + </message> + <message> + <source>Copy amount</source> + <translation>Copiar cantidad</translation> + </message> + <message> + <source>Copy transaction ID</source> + <translation>Copiar ID de transacción</translation> + </message> + <message> + <source>Lock unspent</source> + <translation>Bloquear lo no gastado</translation> + </message> + <message> + <source>Unlock unspent</source> + <translation>Desbloquear lo no gastado</translation> + </message> + <message> + <source>Copy quantity</source> + <translation>Copiar cantidad</translation> + </message> + <message> + <source>Copy fee</source> + <translation>Copiar cuota</translation> + </message> + <message> + <source>Copy after fee</source> + <translation>Copiar después de couta</translation> + </message> + <message> + <source>Copy bytes</source> + <translation>Copiar bytes</translation> + </message> + <message> + <source>Copy dust</source> + <translation>Copiar polvo</translation> + </message> + <message> + <source>Copy change</source> + <translation>Copiar cambio</translation> + </message> + <message> + <source>(%1 locked)</source> + <translation>(%1 bloqueado)</translation> + </message> + <message> + <source>yes</source> + <translation>sí</translation> + </message> + <message> + <source>no</source> + <translation>no</translation> + </message> + <message> + <source>This label turns red if any recipient receives an amount smaller than the current dust threshold.</source> + <translation>Esta etiqueta se vuelve roja si algún destinatario recibe una cantidad inferior a la actual puerta polvorienta.</translation> + </message> + <message> + <source>Can vary +/- %1 satoshi(s) per input.</source> + <translation>Puede variar +/- %1 satoshi(s) por entrada.</translation> + </message> + <message> + <source>(no label)</source> + <translation>(sin etiqueta)</translation> + </message> + <message> + <source>change from %1 (%2)</source> + <translation>cambia desde %1 (%2)</translation> + </message> + <message> + <source>(change)</source> + <translation>(cambio)</translation> + </message> +</context> <context> <name>EditAddressDialog</name> <message> + <source>Edit Address</source> + <translation>Editar Dirección</translation> + </message> + <message> <source>&Label</source> - <translation>Etiqueta</translation> + <translation>&Etiqueta</translation> + </message> + <message> + <source>The label associated with this address list entry</source> + <translation>La etiqueta asociada con esta entrada de la lista de direcciones</translation> + </message> + <message> + <source>The address associated with this address list entry. This can only be modified for sending addresses.</source> + <translation>La dirección asociada con esta entrada de la lista de direcciones. Solo puede ser modificada para direcciones de envío.</translation> </message> <message> <source>&Address</source> - <translation>Dirección</translation> + <translation>&Dirección</translation> + </message> + <message> + <source>New receiving address</source> + <translation>Nueva dirección de recivimiento</translation> + </message> + <message> + <source>New sending address</source> + <translation>Nueva dirección de envío</translation> + </message> + <message> + <source>Edit receiving address</source> + <translation>Editar dirección de recivimiento</translation> + </message> + <message> + <source>Edit sending address</source> + <translation>Editar dirección de envío</translation> + </message> + <message> + <source>The entered address "%1" is not a valid Bitcoin address.</source> + <translation>La dirección introducida "%1" no es una dirección Bitcoin válida.</translation> + </message> + <message> + <source>The entered address "%1" is already in the address book.</source> + <translation>La dirección introducida "%1" está ya en la agenda.</translation> + </message> + <message> + <source>Could not unlock wallet.</source> + <translation>Podría no desbloquear el monedero.</translation> + </message> + <message> + <source>New key generation failed.</source> + <translation>Falló la generación de la nueva clave.</translation> </message> </context> <context> <name>FreespaceChecker</name> - </context> + <message> + <source>A new data directory will be created.</source> + <translation>Se creará un nuevo directorio de datos.</translation> + </message> + <message> + <source>name</source> + <translation>nombre</translation> + </message> + <message> + <source>Directory already exists. Add %1 if you intend to create a new directory here.</source> + <translation>El directorio ya existe. Añada %1 si pretende crear aquí un directorio nuevo.</translation> + </message> + <message> + <source>Path already exists, and is not a directory.</source> + <translation>La ruta ya existe y no es un directorio.</translation> + </message> + <message> + <source>Cannot create data directory here.</source> + <translation>No se puede crear un directorio de datos aquí.</translation> + </message> +</context> <context> <name>HelpMessageDialog</name> - </context> + <message> + <source>version</source> + <translation>versión</translation> + </message> + <message> + <source>(%1-bit)</source> + <translation>(%1-bit)</translation> + </message> + <message> + <source>About %1</source> + <translation>Acerda de %1</translation> + </message> + <message> + <source>Command-line options</source> + <translation>Opciones de la línea de órdenes</translation> + </message> + <message> + <source>Usage:</source> + <translation>Uso:</translation> + </message> + <message> + <source>command-line options</source> + <translation>opciones de la consola de comandos</translation> + </message> + <message> + <source>UI Options:</source> + <translation>Opciones de interfaz de usuario:</translation> + </message> + <message> + <source>Choose data directory on startup (default: %u)</source> + <translation>Elegir directorio de datos al iniciar (predeterminado: %u)</translation> + </message> + <message> + <source>Set language, for example "de_DE" (default: system locale)</source> + <translation>Establecer el idioma, por ejemplo, "es_ES" (predeterminado: configuración regional del sistema)</translation> + </message> + <message> + <source>Start minimized</source> + <translation>Arrancar minimizado</translation> + </message> + <message> + <source>Set SSL root certificates for payment request (default: -system-)</source> + <translation>Establecer los certificados raíz SSL para solicitudes de pago (predeterminado: -system-)</translation> + </message> + <message> + <source>Show splash screen on startup (default: %u)</source> + <translation>Mostrar pantalla de bienvenida en el inicio (predeterminado: %u)</translation> + </message> + <message> + <source>Reset all settings changed in the GUI</source> + <translation>Reiniciar todos los ajustes modificados en el GUI</translation> + </message> +</context> <context> <name>Intro</name> + <message> + <source>Welcome</source> + <translation>Bienvenido</translation> + </message> + <message> + <source>Welcome to %1.</source> + <translation>Bienvenido a %1</translation> + </message> + <message> + <source>As this is the first time the program is launched, you can choose where %1 will store its data.</source> + <translation>Al ser la primera vez que se ejecuta el programa, puede elegir donde %1 almacenara sus datos</translation> + </message> + <message> + <source>%1 will download and store a copy of the Bitcoin block chain. At least %2GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source> + <translation>%1 va a descargar y almacenar una copia de la cadena de bloques de Bitcoin. Al menos %2GB de datos seran almacenados en este directorio, que ira creciendo con el tiempo. El monedero se guardara tambien en ese directorio. </translation> + </message> + <message> + <source>Use the default data directory</source> + <translation>Utilizar el directorio de datos predeterminado</translation> + </message> + <message> + <source>Use a custom data directory:</source> + <translation>Utilizar un directorio de datos personalizado:</translation> + </message> + <message> + <source>Error: Specified data directory "%1" cannot be created.</source> + <translation>Error: no ha podido crearse el directorio de datos especificado "%1".</translation> + </message> + <message> + <source>Error</source> + <translation>Error</translation> + </message> + <message numerus="yes"> + <source>%n GB of free space available</source> + <translation><numerusform>%n GB de espacio libre</numerusform><numerusform>%n GB de espacio disponible</numerusform></translation> + </message> + <message numerus="yes"> + <source>(of %n GB needed)</source> + <translation><numerusform>(de %n GB necesitados)</numerusform><numerusform>(de %n GB requeridos)</numerusform></translation> + </message> +</context> +<context> + <name>ModalOverlay</name> + <message> + <source>Form</source> + <translation>Formulario</translation> + </message> + <message> + <source>Last block time</source> + <translation>Hora del último bloque</translation> + </message> + <message> + <source>Hide</source> + <translation>Ocultar</translation> + </message> </context> <context> <name>OpenURIDialog</name> - </context> + <message> + <source>Open URI</source> + <translation>Abrir URI...</translation> + </message> + <message> + <source>Open payment request from URI or file</source> + <translation>Abrir solicitud de pago a partir de un identificador URI o de un archivo</translation> + </message> + <message> + <source>URI:</source> + <translation>URI:</translation> + </message> + <message> + <source>Select payment request file</source> + <translation>Seleccionar archivo de sulicitud de pago</translation> + </message> + <message> + <source>Select payment request file to open</source> + <translation>Seleccionar el archivo de solicitud de pago para abrir</translation> + </message> +</context> <context> <name>OptionsDialog</name> - </context> + <message> + <source>Options</source> + <translation>Opciones</translation> + </message> + <message> + <source>&Main</source> + <translation>&Principal</translation> + </message> + <message> + <source>Automatically start %1 after logging in to the system.</source> + <translation>Iniciar automaticamente %1 al encender el sistema.</translation> + </message> + <message> + <source>&Start %1 on system login</source> + <translation>&Iniciar %1 al iniciar el sistema</translation> + </message> + <message> + <source>Size of &database cache</source> + <translation>Tamaño de cache de la &base de datos</translation> + </message> + <message> + <source>MB</source> + <translation>MB</translation> + </message> + <message> + <source>Number of script &verification threads</source> + <translation>Número de hilos de &verificación de scripts</translation> + </message> + <message> + <source>Accept connections from outside</source> + <translation>Aceptar conexiones desde el exterior</translation> + </message> + <message> + <source>Allow incoming connections</source> + <translation>Aceptar conexiones entrantes</translation> + </message> + <message> + <source>IP address of the proxy (e.g. IPv4: 127.0.0.1 / IPv6: ::1)</source> + <translation>Dirección IP del proxy (p. ej. IPv4: 127.0.0.1 / IPv6: ::1)</translation> + </message> + <message> + <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Exit in the menu.</source> + <translation>Minimizar en lugar de salir de la aplicación cuando la ventana está cerrada. Cuando se activa esta opción, la aplicación sólo se cerrará después de seleccionar Salir en el menú.</translation> + </message> + <message> + <source>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 |.</source> + <translation>Identificadores URL de terceros (por ejemplo, un explorador de bloques) que aparecen en la pestaña de transacciones como elementos del menú contextual. El %s en la URL es reemplazado por el valor hash de la transacción. Se pueden separar URL múltiples por una barra vertical |.</translation> + </message> + <message> + <source>Third party transaction URLs</source> + <translation>Identificadores URL de transacciones de terceros</translation> + </message> + <message> + <source>Active command-line options that override above options:</source> + <translation>Opciones activas de consola de comandos que tienen preferencia sobre las opciones anteriores:</translation> + </message> + <message> + <source>Reset all client options to default.</source> + <translation>Restablecer todas las opciones predeterminadas del cliente.</translation> + </message> + <message> + <source>&Reset Options</source> + <translation>&Restablecer opciones</translation> + </message> + <message> + <source>&Network</source> + <translation>&Red</translation> + </message> + <message> + <source>(0 = auto, <0 = leave that many cores free)</source> + <translation>(0 = automático, <0 = dejar libres ese número de núcleos)</translation> + </message> + <message> + <source>W&allet</source> + <translation>&Monedero</translation> + </message> + <message> + <source>Expert</source> + <translation>Experto</translation> + </message> + <message> + <source>Enable coin &control features</source> + <translation>Habilitar funcionalidad de &coin control</translation> + </message> + <message> + <source>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.</source> + <translation>Si desactiva el gasto del cambio no confirmado, no se podrá usar el cambio de una transacción hasta que se alcance al menos una confirmación. Esto afecta también a cómo se calcula su saldo.</translation> + </message> + <message> + <source>&Spend unconfirmed change</source> + <translation>&Gastar cambio no confirmado</translation> + </message> + <message> + <source>Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled.</source> + <translation>Abrir automáticamente el puerto del cliente Bitcoin en el router. Esta opción solo funciona si el router admite UPnP y está activado.</translation> + </message> + <message> + <source>Map port using &UPnP</source> + <translation>Mapear el puerto mediante &UPnP</translation> + </message> + <message> + <source>Connect to the Bitcoin network through a SOCKS5 proxy.</source> + <translation>Conectarse a la red Bitcoin a través de un proxy SOCKS5.</translation> + </message> + <message> + <source>&Connect through SOCKS5 proxy (default proxy):</source> + <translation>&Conectarse a través de proxy SOCKS5 (proxy predeterminado):</translation> + </message> + <message> + <source>Proxy &IP:</source> + <translation>Dirección &IP del proxy:</translation> + </message> + <message> + <source>&Port:</source> + <translation>&Puerto:</translation> + </message> + <message> + <source>Port of the proxy (e.g. 9050)</source> + <translation>Puerto del servidor proxy (ej. 9050)</translation> + </message> + <message> + <source>Used for reaching peers via:</source> + <translation>Usado para alcanzar compañeros via:</translation> + </message> + <message> + <source>Shows, if the supplied default SOCKS5 proxy is used to reach peers via this network type.</source> + <translation>Muestra si el proxy SOCKS5 predeterminado es utilizado para llegar a los pares a traves de este tipo de red.</translation> + </message> + <message> + <source>IPv4</source> + <translation>IPv4</translation> + </message> + <message> + <source>IPv6</source> + <translation>IPv6</translation> + </message> + <message> + <source>Tor</source> + <translation>Tor</translation> + </message> + <message> + <source>Connect to the Bitcoin network through a separate SOCKS5 proxy for Tor hidden services.</source> + <translation>Conectar a la red Bitcoin mediante un proxy SOCKS5 por separado para los servicios ocultos de Tor.</translation> + </message> + <message> + <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services:</source> + <translation>Usar distintos proxys SOCKS5 para comunicarse vía Tor de forma anónima:</translation> + </message> + <message> + <source>&Window</source> + <translation>&Ventana</translation> + </message> + <message> + <source>&Hide the icon from the system tray.</source> + <translation>&Ocultar el icono de la barra de tareas</translation> + </message> + <message> + <source>Hide tray icon</source> + <translation>Ocultar barra de tareas</translation> + </message> + <message> + <source>Show only a tray icon after minimizing the window.</source> + <translation>Minimizar la ventana a la bandeja de iconos del sistema.</translation> + </message> + <message> + <source>&Minimize to the tray instead of the taskbar</source> + <translation>&Minimizar a la bandeja en vez de a la barra de tareas</translation> + </message> + <message> + <source>M&inimize on close</source> + <translation>M&inimizar al cerrar</translation> + </message> + <message> + <source>&Display</source> + <translation>&Interfaz</translation> + </message> + <message> + <source>User Interface &language:</source> + <translation>I&dioma de la interfaz de usuario</translation> + </message> + <message> + <source>The user interface language can be set here. This setting will take effect after restarting %1.</source> + <translation>El idioma de la interfaz de usuario puede establecerse aquí. Esta configuración tendrá efecto tras reiniciar %1.</translation> + </message> + <message> + <source>&Unit to show amounts in:</source> + <translation>Mostrar las cantidades en la &unidad:</translation> + </message> + <message> + <source>Choose the default subdivision unit to show in the interface and when sending coins.</source> + <translation>Elegir la subdivisión predeterminada para mostrar cantidades en la interfaz y cuando se envían bitcoins.</translation> + </message> + <message> + <source>Whether to show coin control features or not.</source> + <translation>Mostrar o no funcionalidad de Coin Control</translation> + </message> + <message> + <source>&OK</source> + <translation>&Aceptar</translation> + </message> + <message> + <source>&Cancel</source> + <translation>&Cancelar</translation> + </message> + <message> + <source>default</source> + <translation>predeterminado</translation> + </message> + <message> + <source>none</source> + <translation>ninguna</translation> + </message> + <message> + <source>Confirm options reset</source> + <translation>Confirme el restablecimiento de las opciones</translation> + </message> + <message> + <source>Client restart required to activate changes.</source> + <translation>Se necesita reiniciar el cliente para activar los cambios.</translation> + </message> + <message> + <source>Client will be shut down. Do you want to proceed?</source> + <translation>El cliente se cerrará. ¿Desea continuar?</translation> + </message> + <message> + <source>This change would require a client restart.</source> + <translation>Este cambio exige el reinicio del cliente.</translation> + </message> + <message> + <source>The supplied proxy address is invalid.</source> + <translation>La dirección proxy indicada es inválida.</translation> + </message> +</context> <context> <name>OverviewPage</name> - </context> + <message> + <source>Form</source> + <translation>Formulario</translation> + </message> + <message> + <source>The displayed information may be out of date. Your wallet automatically synchronizes with the Bitcoin network after a connection is established, but this process has not completed yet.</source> + <translation>La información mostrada puede estar desactualizada. Su monedero se sincroniza automáticamente con la red Bitcoin después de que se haya establecido una conexión, pero este proceso aún no se ha completado.</translation> + </message> + <message> + <source>Watch-only:</source> + <translation>De observación:</translation> + </message> + <message> + <source>Available:</source> + <translation>Disponible:</translation> + </message> + <message> + <source>Your current spendable balance</source> + <translation>Su saldo disponible actual</translation> + </message> + <message> + <source>Pending:</source> + <translation>Pendiente:</translation> + </message> + <message> + <source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source> + <translation>Total de transacciones pendientes de confirmar y que aún no contribuye al saldo disponible</translation> + </message> + <message> + <source>Immature:</source> + <translation>No madurado:</translation> + </message> + <message> + <source>Mined balance that has not yet matured</source> + <translation>Saldo recién minado que aún no ha madurado.</translation> + </message> + <message> + <source>Balances</source> + <translation>Saldos</translation> + </message> + <message> + <source>Total:</source> + <translation>Total:</translation> + </message> + <message> + <source>Your current total balance</source> + <translation>Su saldo actual total</translation> + </message> + <message> + <source>Your current balance in watch-only addresses</source> + <translation>Su saldo actual en direcciones watch-only</translation> + </message> + <message> + <source>Spendable:</source> + <translation>Gastable:</translation> + </message> + <message> + <source>Recent transactions</source> + <translation>Transacciones recientes</translation> + </message> + <message> + <source>Unconfirmed transactions to watch-only addresses</source> + <translation>Transacciones sin confirmar en direcciones watch-only</translation> + </message> + <message> + <source>Mined balance in watch-only addresses that has not yet matured</source> + <translation>Saldo minado en direcciones watch-only que aún no ha madurado</translation> + </message> + <message> + <source>Current total balance in watch-only addresses</source> + <translation>Saldo total en las direcciones watch-only</translation> + </message> +</context> +<context> + <name>PaymentServer</name> + <message> + <source>Payment request error</source> + <translation>Fallo en la solicitud de pago</translation> + </message> + <message> + <source>Cannot start bitcoin: click-to-pay handler</source> + <translation>No se puede iniciar bitcoin: encargado click-para-pagar</translation> + </message> + <message> + <source>URI handling</source> + <translation>Manejo de URI</translation> + </message> + <message> + <source>Payment request fetch URL is invalid: %1</source> + <translation>La búsqueda de solicitud de pago URL es válida: %1</translation> + </message> + <message> + <source>Invalid payment address %1</source> + <translation>Dirección de pago inválida %1</translation> + </message> + <message> + <source>URI cannot be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters.</source> + <translation>URI no puede ser analizado! Esto puede ser causado por una dirección Bitcoin inválida o parametros URI mal formados.</translation> + </message> + <message> + <source>Payment request file handling</source> + <translation>Manejo del archivo de solicitud de pago</translation> + </message> + <message> + <source>Payment request file cannot be read! This can be caused by an invalid payment request file.</source> + <translation>¡El archivo de solicitud de pago no puede ser leído! Esto puede ser causado por un archivo de solicitud de pago inválido.</translation> + </message> + <message> + <source>Payment request rejected</source> + <translation>Solicitud de pago rechazada</translation> + </message> + <message> + <source>Payment request network doesn't match client network.</source> + <translation>La red de solicitud de pago no cimbina la red cliente.</translation> + </message> + <message> + <source>Payment request expired.</source> + <translation>Solicitud de pago caducada.</translation> + </message> + <message> + <source>Payment request is not initialized.</source> + <translation>La solicitud de pago no se ha iniciado.</translation> + </message> + <message> + <source>Unverified payment requests to custom payment scripts are unsupported.</source> + <translation>Solicitudes de pago sin verificar a scripts de pago habitual no se soportan.</translation> + </message> + <message> + <source>Invalid payment request.</source> + <translation>Solicitud de pago inválida.</translation> + </message> + <message> + <source>Requested payment amount of %1 is too small (considered dust).</source> + <translation>Cantidad de pago solicitada de %1 es demasiado pequeña (considerado polvo).</translation> + </message> + <message> + <source>Refund from %1</source> + <translation>Reembolsar desde %1</translation> + </message> + <message> + <source>Payment request %1 is too large (%2 bytes, allowed %3 bytes).</source> + <translation>Solicitud de pago de %1 es demasiado grande (%2 bytes, permitidos %3 bytes).</translation> + </message> + <message> + <source>Error communicating with %1: %2</source> + <translation>Fallo al comunicar con %1: %2</translation> + </message> + <message> + <source>Payment request cannot be parsed!</source> + <translation>¡La solicitud de pago no puede ser analizada!</translation> + </message> + <message> + <source>Bad response from server %1</source> + <translation>Mala respuesta desde el servidor %1</translation> + </message> + <message> + <source>Network request error</source> + <translation>Fallo de solicitud de red</translation> + </message> + <message> + <source>Payment acknowledged</source> + <translation>Pago declarado</translation> + </message> +</context> <context> <name>PeerTableModel</name> + <message> + <source>User Agent</source> + <translation>User Agent</translation> + </message> + <message> + <source>Node/Service</source> + <translation>Nodo/Servicio</translation> + </message> </context> <context> <name>QObject</name> + <message> + <source>Amount</source> + <translation>Cantidad</translation> + </message> + <message> + <source>Enter a Bitcoin address (e.g. %1)</source> + <translation>Introducir una dirección Bitcoin (p. ej. %1)</translation> + </message> + <message> + <source>%1 d</source> + <translation>%1 d</translation> + </message> + <message> + <source>%1 h</source> + <translation>%1 h</translation> + </message> + <message> + <source>%1 m</source> + <translation>%1 m</translation> + </message> + <message> + <source>%1 s</source> + <translation>%1 s</translation> + </message> + <message> + <source>None</source> + <translation>Ninguno</translation> + </message> + <message> + <source>N/A</source> + <translation>N/D</translation> + </message> + <message> + <source>%1 ms</source> + <translation>%1 ms</translation> + </message> + <message> + <source>%1 and %2</source> + <translation>%1 y %2</translation> + </message> </context> <context> - <name>RPCConsole</name> + <name>QObject::QObject</name> </context> <context> + <name>QRImageWidget</name> + <message> + <source>&Save Image...</source> + <translation>&Guardar imagen...</translation> + </message> + <message> + <source>&Copy Image</source> + <translation>&Copiar imagen</translation> + </message> + <message> + <source>Save QR Code</source> + <translation>Guardar código QR</translation> + </message> + <message> + <source>PNG Image (*.png)</source> + <translation>Imagen PNG (*.png)</translation> + </message> +</context> +<context> + <name>RPCConsole</name> + <message> + <source>N/A</source> + <translation>N/D</translation> + </message> + <message> + <source>Client version</source> + <translation>Versión del cliente</translation> + </message> + <message> + <source>&Information</source> + <translation>&Información</translation> + </message> + <message> + <source>Debug window</source> + <translation>Ventana de depuración</translation> + </message> + <message> + <source>General</source> + <translation>General</translation> + </message> + <message> + <source>Using BerkeleyDB version</source> + <translation>Utilizando la versión de BerkeleyDB</translation> + </message> + <message> + <source>Datadir</source> + <translation>Datadir</translation> + </message> + <message> + <source>Startup time</source> + <translation>Hora de inicio</translation> + </message> + <message> + <source>Network</source> + <translation>Red</translation> + </message> + <message> + <source>Name</source> + <translation>Nombre</translation> + </message> + <message> + <source>Number of connections</source> + <translation>Número de conexiones</translation> + </message> + <message> + <source>Block chain</source> + <translation>Cadena de bloques</translation> + </message> + <message> + <source>Current number of blocks</source> + <translation>Número actual de bloques</translation> + </message> + <message> + <source>Memory Pool</source> + <translation>Piscina de Memoria</translation> + </message> + <message> + <source>Current number of transactions</source> + <translation>Número actual de transacciones</translation> + </message> + <message> + <source>Memory usage</source> + <translation>Uso de memoria</translation> + </message> + <message> + <source>Received</source> + <translation>Recibido</translation> + </message> + <message> + <source>Sent</source> + <translation>Enviado</translation> + </message> + <message> + <source>&Peers</source> + <translation>&Pares</translation> + </message> + <message> + <source>Banned peers</source> + <translation>Peers Bloqueados</translation> + </message> + <message> + <source>Select a peer to view detailed information.</source> + <translation>Seleccionar un par para ver su información detallada.</translation> + </message> + <message> + <source>Whitelisted</source> + <translation>En la lista blanca</translation> + </message> + <message> + <source>Direction</source> + <translation>Dirección</translation> + </message> + <message> + <source>Version</source> + <translation>Versión</translation> + </message> + <message> + <source>Starting Block</source> + <translation>Importando bloques...</translation> + </message> + <message> + <source>Synced Headers</source> + <translation>Sincronizar Cabeceras</translation> + </message> + <message> + <source>Synced Blocks</source> + <translation>Bloques Sincronizados</translation> + </message> + <message> + <source>User Agent</source> + <translation>User Agent</translation> + </message> + <message> + <source>Open the %1 debug log file from the current data directory. This can take a few seconds for large log files.</source> + <translation>Abrir el archivo de depuración %1 desde el directorio de datos actual. Puede tardar unos segundos para ficheros de gran tamaño.</translation> + </message> + <message> + <source>Decrease font size</source> + <translation>Disminuir tamaño de letra</translation> + </message> + <message> + <source>Increase font size</source> + <translation>Aumentar tamaño de letra</translation> + </message> + <message> + <source>Services</source> + <translation>Servicios</translation> + </message> + <message> + <source>Ban Score</source> + <translation>Puntuación de bloqueo</translation> + </message> + <message> + <source>Connection Time</source> + <translation>Duración de la conexión</translation> + </message> + <message> + <source>Last Send</source> + <translation>Ultimo envío</translation> + </message> + <message> + <source>Last Receive</source> + <translation>Ultima recepción</translation> + </message> + <message> + <source>Ping Time</source> + <translation>Ping</translation> + </message> + <message> + <source>The duration of a currently outstanding ping.</source> + <translation>La duración de un ping actualmente en proceso.</translation> + </message> + <message> + <source>Ping Wait</source> + <translation>Espera de Ping</translation> + </message> + <message> + <source>Time Offset</source> + <translation>Desplazamiento de tiempo</translation> + </message> + <message> + <source>Last block time</source> + <translation>Hora del último bloque</translation> + </message> + <message> + <source>&Open</source> + <translation>&Abrir</translation> + </message> + <message> + <source>&Console</source> + <translation>&Consola</translation> + </message> + <message> + <source>&Network Traffic</source> + <translation>&Tráfico de Red</translation> + </message> + <message> + <source>&Clear</source> + <translation>&Vaciar</translation> + </message> + <message> + <source>Totals</source> + <translation>Total:</translation> + </message> + <message> + <source>In:</source> + <translation>Entrante:</translation> + </message> + <message> + <source>Out:</source> + <translation>Saliente:</translation> + </message> + <message> + <source>Debug log file</source> + <translation>Archivo de registro de depuración</translation> + </message> + <message> + <source>Clear console</source> + <translation>Borrar consola</translation> + </message> + <message> + <source>1 &hour</source> + <translation>1 &hora</translation> + </message> + <message> + <source>1 &day</source> + <translation>1 &día</translation> + </message> + <message> + <source>1 &week</source> + <translation>1 &semana</translation> + </message> + <message> + <source>1 &year</source> + <translation>1 &año</translation> + </message> + <message> + <source>Welcome to the %1 RPC console.</source> + <translation>Bienvenido a la consola RPC %1.</translation> + </message> + <message> + <source>Use up and down arrows to navigate history, and <b>Ctrl-L</b> to clear screen.</source> + <translation>Use las flechas arriba y abajo para navegar por el historial y <b>Control+L</b> para vaciar la pantalla.</translation> + </message> + <message> + <source>Type <b>help</b> for an overview of available commands.</source> + <translation>Escriba <b>help</b> para ver un resumen de los comandos disponibles.</translation> + </message> + <message> + <source>%1 B</source> + <translation>%1 B</translation> + </message> + <message> + <source>%1 KB</source> + <translation>%1 KB</translation> + </message> + <message> + <source>%1 MB</source> + <translation>%1 MB</translation> + </message> + <message> + <source>%1 GB</source> + <translation>%1 GB</translation> + </message> + <message> + <source>(node id: %1)</source> + <translation>(nodo: %1)</translation> + </message> + <message> + <source>via %1</source> + <translation>via %1</translation> + </message> + <message> + <source>never</source> + <translation>nunca</translation> + </message> + <message> + <source>Inbound</source> + <translation>Entrante</translation> + </message> + <message> + <source>Outbound</source> + <translation>Saliente</translation> + </message> + <message> + <source>Yes</source> + <translation>Sí</translation> + </message> + <message> + <source>No</source> + <translation>No</translation> + </message> + <message> + <source>Unknown</source> + <translation>Desconocido</translation> + </message> +</context> +<context> <name>ReceiveCoinsDialog</name> - </context> + <message> + <source>&Amount:</source> + <translation>Cantidad</translation> + </message> + <message> + <source>&Label:</source> + <translation>&Etiqueta:</translation> + </message> + <message> + <source>&Message:</source> + <translation>Mensaje:</translation> + </message> + <message> + <source>Reuse one of the previously used receiving addresses. Reusing addresses has security and privacy issues. Do not use this unless re-generating a payment request made before.</source> + <translation>Reutilizar una de las direcciones previamente usadas para recibir. Reutilizar direcciones tiene problemas de seguridad y privacidad. No lo uses a menos que antes regeneres una solicitud de pago.</translation> + </message> + <message> + <source>R&euse an existing receiving address (not recommended)</source> + <translation>R&eutilizar una dirección existente para recibir (no recomendado)</translation> + </message> + <message> + <source>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 Bitcoin network.</source> + <translation>Un mensaje opcional para adjuntar a la solicitud de pago, que se muestra cuando se abre la solicitud. Nota: El mensaje no se enviará con el pago por la red Bitcoin.</translation> + </message> + <message> + <source>An optional label to associate with the new receiving address.</source> + <translation>Etiqueta opcional para asociar con la nueva dirección de recepción.</translation> + </message> + <message> + <source>Use this form to request payments. All fields are <b>optional</b>.</source> + <translation>Utilice este formulario para solicitar pagos. Todos los campos son <b>opcionales</b>.</translation> + </message> + <message> + <source>An optional amount to request. Leave this empty or zero to not request a specific amount.</source> + <translation>Para solicitar una cantidad opcional. Deje este vacío o cero para no solicitar una cantidad específica.</translation> + </message> + <message> + <source>Clear all fields of the form.</source> + <translation>Vaciar todos los campos del formulario.</translation> + </message> + <message> + <source>Clear</source> + <translation>Vaciar</translation> + </message> + <message> + <source>Requested payments history</source> + <translation>Historial de pagos solicitados</translation> + </message> + <message> + <source>&Request payment</source> + <translation>&Solicitar pago</translation> + </message> + <message> + <source>Show the selected request (does the same as double clicking an entry)</source> + <translation>Muestra la petición seleccionada (También doble clic)</translation> + </message> + <message> + <source>Show</source> + <translation>Mostrar</translation> + </message> + <message> + <source>Remove the selected entries from the list</source> + <translation>Borrar de la lista las direcciónes actualmente seleccionadas</translation> + </message> + <message> + <source>Remove</source> + <translation>Eliminar</translation> + </message> + <message> + <source>Copy label</source> + <translation>Copiar capa</translation> + </message> + <message> + <source>Copy message</source> + <translation>Copiar imagen</translation> + </message> + <message> + <source>Copy amount</source> + <translation>Copiar cantidad</translation> + </message> +</context> <context> <name>ReceiveRequestDialog</name> <message> + <source>QR Code</source> + <translation>Código QR</translation> + </message> + <message> + <source>Copy &URI</source> + <translation>Copiar &URI</translation> + </message> + <message> <source>Copy &Address</source> - <translation>&Copiar Direccón</translation> + <translation>Copiar &Dirección</translation> </message> - </context> + <message> + <source>&Save Image...</source> + <translation>Guardar Imagen...</translation> + </message> + <message> + <source>Request payment to %1</source> + <translation>Solicitar pago a %1</translation> + </message> + <message> + <source>Payment information</source> + <translation>Información de pago</translation> + </message> + <message> + <source>URI</source> + <translation>URI</translation> + </message> + <message> + <source>Address</source> + <translation>Dirección</translation> + </message> + <message> + <source>Amount</source> + <translation>Cantidad</translation> + </message> + <message> + <source>Label</source> + <translation>Etiqueta</translation> + </message> + <message> + <source>Message</source> + <translation>Mensaje</translation> + </message> + <message> + <source>Resulting URI too long, try to reduce the text for label / message.</source> + <translation>URI resultante demasiado grande, trate de reducir el texto de etiqueta / mensaje.</translation> + </message> + <message> + <source>Error encoding URI into QR Code.</source> + <translation>Fallo al codificar URI en código QR.</translation> + </message> +</context> +<context> + <name>RecentRequestsTableModel</name> + <message> + <source>Date</source> + <translation>Fecha</translation> + </message> + <message> + <source>Label</source> + <translation>Etiqueta</translation> + </message> + <message> + <source>Message</source> + <translation>Mensaje</translation> + </message> + <message> + <source>(no label)</source> + <translation>(sin etiqueta)</translation> + </message> + <message> + <source>(no message)</source> + <translation>(no hay mensaje)</translation> + </message> + <message> + <source>(no amount requested)</source> + <translation>(no hay solicitud de cantidad)</translation> + </message> + <message> + <source>Requested</source> + <translation>Solicitado</translation> + </message> +</context> <context> <name>SendCoinsDialog</name> - </context> + <message> + <source>Send Coins</source> + <translation>Enviar bitcoins</translation> + </message> + <message> + <source>Coin Control Features</source> + <translation>Características de Coin Control</translation> + </message> + <message> + <source>Inputs...</source> + <translation>Entradas...</translation> + </message> + <message> + <source>automatically selected</source> + <translation>Seleccionado automáticamente</translation> + </message> + <message> + <source>Insufficient funds!</source> + <translation>Fondos insuficientes!</translation> + </message> + <message> + <source>Quantity:</source> + <translation>Cantidad:</translation> + </message> + <message> + <source>Bytes:</source> + <translation>Bytes:</translation> + </message> + <message> + <source>Amount:</source> + <translation>Cuantía:</translation> + </message> + <message> + <source>Fee:</source> + <translation>Tasa:</translation> + </message> + <message> + <source>After Fee:</source> + <translation>Después de tasas:</translation> + </message> + <message> + <source>Change:</source> + <translation>Cambio:</translation> + </message> + <message> + <source>If this is activated, but the change address is empty or invalid, change will be sent to a newly generated address.</source> + <translation>Si se marca esta opción pero la dirección de cambio está vacía o es inválida, el cambio se enviará a una nueva dirección recién generada.</translation> + </message> + <message> + <source>Custom change address</source> + <translation>Dirección propia</translation> + </message> + <message> + <source>Transaction Fee:</source> + <translation>Comisión de Transacción:</translation> + </message> + <message> + <source>Choose...</source> + <translation>Elija...</translation> + </message> + <message> + <source>collapse fee-settings</source> + <translation>Colapsar ajustes de cuota</translation> + </message> + <message> + <source>per kilobyte</source> + <translation>por kilobyte</translation> + </message> + <message> + <source>If the custom fee is set to 1000 satoshis and the transaction is only 250 bytes, then "per kilobyte" only pays 250 satoshis in fee, while "total at least" pays 1000 satoshis. For transactions bigger than a kilobyte both pay by kilobyte.</source> + <translation>Si la tarifa de aduana se establece en 1000 satoshis y la transacción está a sólo 250 bytes, entonces "por kilobyte" sólo paga 250 satoshis de cuota, mientras que "el mínimo total" pagaría 1.000 satoshis. Para las transacciones más grandes que un kilobyte ambos pagan por kilobyte</translation> + </message> + <message> + <source>Hide</source> + <translation>Ocultar</translation> + </message> + <message> + <source>total at least</source> + <translation>total por lo menos</translation> + </message> + <message> + <source>Paying only the minimum fee is just fine as long as there is less transaction volume than space in the blocks. But be aware that this can end up in a never confirming transaction once there is more demand for bitcoin transactions than the network can process.</source> + <translation>Pagando solamente la cuota mínima es correcto, siempre y cuando haya menos volumen de transacciones que el espacio en los bloques. Pero tenga en cuenta que esto puede terminar en una transacción nunca confirmada, una vez que haya más demanda para transacciones Bitcoin que la red pueda procesar.</translation> + </message> + <message> + <source>(read the tooltip)</source> + <translation>(leer la sugerencia)</translation> + </message> + <message> + <source>Recommended:</source> + <translation>Recomendado:</translation> + </message> + <message> + <source>Custom:</source> + <translation>Personalizado:</translation> + </message> + <message> + <source>(Smart fee not initialized yet. This usually takes a few blocks...)</source> + <translation>(Tarifa inteligente no inicializado aún. Esto generalmente lleva a pocos bloques...)</translation> + </message> + <message> + <source>normal</source> + <translation>normal</translation> + </message> + <message> + <source>fast</source> + <translation>rápido</translation> + </message> + <message> + <source>Send to multiple recipients at once</source> + <translation>Enviar a múltiples destinatarios de una vez</translation> + </message> + <message> + <source>Add &Recipient</source> + <translation>Añadir &destinatario</translation> + </message> + <message> + <source>Clear all fields of the form.</source> + <translation>Vaciar todos los campos del formulario</translation> + </message> + <message> + <source>Dust:</source> + <translation>Polvo:</translation> + </message> + <message> + <source>Clear &All</source> + <translation>Vaciar &todo</translation> + </message> + <message> + <source>Balance:</source> + <translation>Saldo:</translation> + </message> + <message> + <source>Confirm the send action</source> + <translation>Confirmar el envío</translation> + </message> + <message> + <source>S&end</source> + <translation>&Enviar</translation> + </message> + <message> + <source>Copy quantity</source> + <translation>Copiar cantidad</translation> + </message> + <message> + <source>Copy amount</source> + <translation>Copiar cantidad</translation> + </message> + <message> + <source>Copy fee</source> + <translation>Copiar cuota</translation> + </message> + <message> + <source>Copy after fee</source> + <translation>Copiar después de couta</translation> + </message> + <message> + <source>Copy bytes</source> + <translation>Copiar bytes</translation> + </message> + <message> + <source>Copy dust</source> + <translation>Copiar polvo</translation> + </message> + <message> + <source>Copy change</source> + <translation>Copiar cambio</translation> + </message> + <message> + <source>%1 to %2</source> + <translation>%1 a %2</translation> + </message> + <message> + <source>Are you sure you want to send?</source> + <translation>¿Seguro que quiere enviar?</translation> + </message> + <message> + <source>added as transaction fee</source> + <translation>añadido como transacción de cuota</translation> + </message> + <message> + <source>Total Amount %1</source> + <translation>Cantidad total %1</translation> + </message> + <message> + <source>or</source> + <translation>o</translation> + </message> + <message> + <source>Confirm send coins</source> + <translation>Confirmar enviar monedas</translation> + </message> + <message> + <source>The recipient address is not valid. Please recheck.</source> + <translation>La dirección de destinatario no es válida. Por favor revísela.</translation> + </message> + <message> + <source>The amount to pay must be larger than 0.</source> + <translation>La cantidad a pagar debe de ser mayor que 0.</translation> + </message> + <message> + <source>The amount exceeds your balance.</source> + <translation>La cantidad excede su saldo.</translation> + </message> + <message> + <source>The total exceeds your balance when the %1 transaction fee is included.</source> + <translation>El total excede su saldo cuando la cuota de transacción de %1 es incluida.</translation> + </message> + <message> + <source>Duplicate address found: addresses should only be used once each.</source> + <translation>Dirección duplicada encontrada: la dirección sólo debería ser utilizada una vez por cada uso.</translation> + </message> + <message> + <source>Transaction creation failed!</source> + <translation>¡Falló la creación de transacción!</translation> + </message> + <message> + <source>A fee higher than %1 is considered an absurdly high fee.</source> + <translation>Una couta mayor que %1 se considera una cuota irracionalmente alta.</translation> + </message> + <message> + <source>Payment request expired.</source> + <translation>Solicitud de pago caducada.</translation> + </message> + <message> + <source>Pay only the required fee of %1</source> + <translation>Pagar únicamente la cuota solicitada de %1</translation> + </message> + <message> + <source>Warning: Invalid Bitcoin address</source> + <translation>Alerta: dirección Bitcoin inválida</translation> + </message> + <message> + <source>Warning: Unknown change address</source> + <translation>Alerta: dirección cambiada desconocida</translation> + </message> + <message> + <source>(no label)</source> + <translation>(sin etiqueta)</translation> + </message> +</context> <context> <name>SendCoinsEntry</name> - </context> + <message> + <source>A&mount:</source> + <translation>Ca&ntidad:</translation> + </message> + <message> + <source>Pay &To:</source> + <translation>&Pagar a:</translation> + </message> + <message> + <source>&Label:</source> + <translation>&Etiqueta:</translation> + </message> + <message> + <source>Choose previously used address</source> + <translation>Escoger direcciones previamente usadas</translation> + </message> + <message> + <source>This is a normal payment.</source> + <translation>Esto es un pago ordinario.</translation> + </message> + <message> + <source>The Bitcoin address to send the payment to</source> + <translation>Dirección Bitcoin a la que enviar el pago</translation> + </message> + <message> + <source>Alt+A</source> + <translation>Alt+A</translation> + </message> + <message> + <source>Paste address from clipboard</source> + <translation>Pegar dirección desde portapapeles</translation> + </message> + <message> + <source>Alt+P</source> + <translation>Alt+P</translation> + </message> + <message> + <source>Remove this entry</source> + <translation>Eliminar esta transacción</translation> + </message> + <message> + <source>The fee will be deducted from the amount being sent. The recipient will receive less bitcoins than you enter in the amount field. If multiple recipients are selected, the fee is split equally.</source> + <translation>La cuota será deducida de la cantidad que sea mandada. El destinatario recibirá menos bitcoins de los que entres en el </translation> + </message> + <message> + <source>S&ubtract fee from amount</source> + <translation>Restar comisiones a la cantidad</translation> + </message> + <message> + <source>Message:</source> + <translation>Mensaje:</translation> + </message> + <message> + <source>This is an unauthenticated payment request.</source> + <translation>Esta es una petición de pago no autentificada.</translation> + </message> + <message> + <source>This is an authenticated payment request.</source> + <translation>Esta es una petición de pago autentificada.</translation> + </message> + <message> + <source>Enter a label for this address to add it to the list of used addresses</source> + <translation>Introduce una etiqueta para esta dirección para añadirla a la lista de direcciones utilizadas</translation> + </message> + <message> + <source>A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source> + <translation>Un mensaje que se adjuntó a la bitcoin: URL que será almacenada con la transacción para su referencia. Nota: Este mensaje no se envía a través de la red Bitcoin.</translation> + </message> + <message> + <source>Pay To:</source> + <translation>Paga a:</translation> + </message> + <message> + <source>Memo:</source> + <translation>Memo:</translation> + </message> + <message> + <source>Enter a label for this address to add it to your address book</source> + <translation>Introduzca una etiqueta para esta dirección para añadirla a su agenda</translation> + </message> +</context> +<context> + <name>SendConfirmationDialog</name> + <message> + <source>Yes</source> + <translation>Sí</translation> + </message> +</context> <context> <name>ShutdownWindow</name> - </context> + <message> + <source>%1 is shutting down...</source> + <translation>%1 se esta cerrando...</translation> + </message> + <message> + <source>Do not shut down the computer until this window disappears.</source> + <translation>No apague el equipo hasta que desaparezca esta ventana.</translation> + </message> +</context> <context> <name>SignVerifyMessageDialog</name> - </context> + <message> + <source>Signatures - Sign / Verify a Message</source> + <translation>Firmas - Firmar / verificar un mensaje</translation> + </message> + <message> + <source>&Sign Message</source> + <translation>&Firmar mensaje</translation> + </message> + <message> + <source>You can sign messages/agreements with your addresses to prove you can receive bitcoins 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.</source> + <translation>Puede firmar los mensajes con sus direcciones para demostrar que las posee. Tenga cuidado de no firmar cualquier cosa de manera vaga o aleatoria, pues los ataques de phishing pueden tratar de engañarle firmando su identidad a través de ellos. Sólo firme declaraciones totalmente detalladas con las que usted esté de acuerdo.</translation> + </message> + <message> + <source>The Bitcoin address to sign the message with</source> + <translation>Dirección Bitcoin con la que firmar el mensaje</translation> + </message> + <message> + <source>Choose previously used address</source> + <translation>Escoger dirección previamente usada</translation> + </message> + <message> + <source>Alt+A</source> + <translation>Alt+A</translation> + </message> + <message> + <source>Paste address from clipboard</source> + <translation>Pegar dirección desde portapapeles</translation> + </message> + <message> + <source>Alt+P</source> + <translation>Alt+P</translation> + </message> + <message> + <source>Enter the message you want to sign here</source> + <translation>Introduzca el mensaje que desea firmar aquí</translation> + </message> + <message> + <source>Signature</source> + <translation>Firma</translation> + </message> + <message> + <source>Copy the current signature to the system clipboard</source> + <translation>Copiar la firma actual al portapapeles del sistema</translation> + </message> + <message> + <source>Sign the message to prove you own this Bitcoin address</source> + <translation>Firmar el mensaje para demostrar que se posee esta dirección Bitcoin</translation> + </message> + <message> + <source>Sign &Message</source> + <translation>Firmar &mensaje</translation> + </message> + <message> + <source>Reset all sign message fields</source> + <translation>Vaciar todos los campos de la firma de mensaje</translation> + </message> + <message> + <source>Clear &All</source> + <translation>Vaciar &todo</translation> + </message> + <message> + <source>&Verify Message</source> + <translation>&Verificar mensaje</translation> + </message> + <message> + <source>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!</source> + <translation>Introduzca la dirección para la firma, el mensaje (asegurándose de copiar tal cual los saltos de línea, espacios, tabulaciones, etc.) y la firma a continuación para verificar el mensaje. Tenga cuidado de no asumir más información de lo que dice el propio mensaje firmado para evitar fraudes basados en ataques de tipo man-in-the-middle. </translation> + </message> + <message> + <source>The Bitcoin address the message was signed with</source> + <translation>La dirección Bitcoin con la que se firmó el mensaje</translation> + </message> + <message> + <source>Verify the message to ensure it was signed with the specified Bitcoin address</source> + <translation>Verificar el mensaje para comprobar que fue firmado con la dirección Bitcoin indicada</translation> + </message> + <message> + <source>Verify &Message</source> + <translation>Verificar &mensaje</translation> + </message> + <message> + <source>Reset all verify message fields</source> + <translation>Vaciar todos los campos de la verificación de mensaje</translation> + </message> + <message> + <source>Click "Sign Message" to generate signature</source> + <translation>Click en "Fírmar mensaje" para generar una firma</translation> + </message> + <message> + <source>The entered address is invalid.</source> + <translation>La dirección introducida no es válida.</translation> + </message> + <message> + <source>Please check the address and try again.</source> + <translation>Por favor revise la dirección e inténtelo de nuevo.</translation> + </message> + <message> + <source>The entered address does not refer to a key.</source> + <translation>La dirección introducida no remite a una clave.</translation> + </message> + <message> + <source>Wallet unlock was cancelled.</source> + <translation>El desbloqueo del monedero fue cancelado.</translation> + </message> + <message> + <source>Private key for the entered address is not available.</source> + <translation>La clave privada de la dirección introducida no está disponible.</translation> + </message> + <message> + <source>Message signing failed.</source> + <translation>Falló la firma del mensaje.</translation> + </message> + <message> + <source>Message signed.</source> + <translation>Mensaje firmado.</translation> + </message> + <message> + <source>The signature could not be decoded.</source> + <translation>La firma no pudo descodificarse.</translation> + </message> + <message> + <source>Please check the signature and try again.</source> + <translation>Por favor compruebe la firma y pruebe de nuevo.</translation> + </message> + <message> + <source>The signature did not match the message digest.</source> + <translation>La firma no se combinó con el mensaje.</translation> + </message> + <message> + <source>Message verification failed.</source> + <translation>Falló la verificación del mensaje.</translation> + </message> + <message> + <source>Message verified.</source> + <translation>Mensaje verificado.</translation> + </message> +</context> <context> <name>SplashScreen</name> - </context> + <message> + <source>[testnet]</source> + <translation>[testnet]</translation> + </message> +</context> <context> <name>TrafficGraphWidget</name> - </context> + <message> + <source>KB/s</source> + <translation>KB/s</translation> + </message> +</context> +<context> + <name>TransactionDesc</name> + <message> + <source>Open until %1</source> + <translation>Abierto hasta %1</translation> + </message> + <message> + <source>conflicted with a transaction with %1 confirmations</source> + <translation>Hay un conflicto con la traducción de las confirmaciones %1</translation> + </message> + <message> + <source>%1/offline</source> + <translation>%1/sin conexión</translation> + </message> + <message> + <source>0/unconfirmed, %1</source> + <translation>0/no confirmado, %1</translation> + </message> + <message> + <source>in memory pool</source> + <translation>en el equipo de memoria</translation> + </message> + <message> + <source>not in memory pool</source> + <translation>no en el equipo de memoria</translation> + </message> + <message> + <source>abandoned</source> + <translation>abandonado</translation> + </message> + <message> + <source>%1/unconfirmed</source> + <translation>%1/no confirmado</translation> + </message> + <message> + <source>%1 confirmations</source> + <translation>confirmaciones %1</translation> + </message> + <message> + <source>Status</source> + <translation>Estado</translation> + </message> + <message> + <source>, has not been successfully broadcast yet</source> + <translation>, no ha sido emitido con éxito aún</translation> + </message> + <message> + <source>Date</source> + <translation>Fecha</translation> + </message> + <message> + <source>Source</source> + <translation>Fuente</translation> + </message> + <message> + <source>Generated</source> + <translation>Generado</translation> + </message> + <message> + <source>From</source> + <translation>Desde</translation> + </message> + <message> + <source>unknown</source> + <translation>desconocido</translation> + </message> + <message> + <source>To</source> + <translation>Para</translation> + </message> + <message> + <source>own address</source> + <translation>dirección propia</translation> + </message> + <message> + <source>watch-only</source> + <translation>de observación</translation> + </message> + <message> + <source>label</source> + <translation>etiqueta</translation> + </message> + <message> + <source>Credit</source> + <translation>Credito</translation> + </message> + <message> + <source>not accepted</source> + <translation>no aceptada</translation> + </message> + <message> + <source>Debit</source> + <translation>Enviado</translation> + </message> + <message> + <source>Total debit</source> + <translation>Total enviado</translation> + </message> + <message> + <source>Total credit</source> + <translation>Total recibido</translation> + </message> + <message> + <source>Transaction fee</source> + <translation>Comisión de transacción</translation> + </message> + <message> + <source>Net amount</source> + <translation>Cantidad neta</translation> + </message> + <message> + <source>Message</source> + <translation>Mensaje</translation> + </message> + <message> + <source>Comment</source> + <translation>Comentario</translation> + </message> + <message> + <source>Transaction ID</source> + <translation>Identificador de transacción (ID)</translation> + </message> + <message> + <source>Output index</source> + <translation>Indice de salida</translation> + </message> + <message> + <source>Merchant</source> + <translation>Vendedor</translation> + </message> + <message> + <source>Generated coins must mature %1 blocks before they can be spent. When you generated this block, it was broadcast to the network to be added to the block chain. If it fails to get into the chain, its state will change to "not accepted" and it won't be spendable. This may occasionally happen if another node generates a block within a few seconds of yours.</source> + <translation>Los bitcoins generados deben madurar %1 bloques antes de que puedan gastarse. Cuando generó este bloque, se transmitió a la red para que se añadiera a la cadena de bloques. Si no consigue entrar en la cadena, su estado cambiará a "no aceptado" y ya no se podrá gastar. Esto puede ocurrir ocasionalmente si otro nodo genera un bloque a pocos segundos del suyo.</translation> + </message> + <message> + <source>Debug information</source> + <translation>Información de depuración</translation> + </message> + <message> + <source>Transaction</source> + <translation>Transacción</translation> + </message> + <message> + <source>Inputs</source> + <translation>entradas</translation> + </message> + <message> + <source>Amount</source> + <translation>Cantidad</translation> + </message> + <message> + <source>true</source> + <translation>verdadero</translation> + </message> + <message> + <source>false</source> + <translation>falso</translation> + </message> +</context> <context> <name>TransactionDescDialog</name> - </context> + <message> + <source>This pane shows a detailed description of the transaction</source> + <translation>Esta ventana muestra información detallada sobre la transacción</translation> + </message> + <message> + <source>Details for %1</source> + <translation>Detalles para %1</translation> + </message> +</context> +<context> + <name>TransactionTableModel</name> + <message> + <source>Date</source> + <translation>Fecha</translation> + </message> + <message> + <source>Type</source> + <translation>Tipo</translation> + </message> + <message> + <source>Label</source> + <translation>Etiqueta</translation> + </message> + <message> + <source>Open until %1</source> + <translation>Abierto hasta %1</translation> + </message> + <message> + <source>Offline</source> + <translation>Sin conexion</translation> + </message> + <message> + <source>Unconfirmed</source> + <translation>Sin confirmar</translation> + </message> + <message> + <source>Abandoned</source> + <translation>Abandonado</translation> + </message> + <message> + <source>Confirming (%1 of %2 recommended confirmations)</source> + <translation>Confirmando (%1 de %2 confirmaciones recomendadas)</translation> + </message> + <message> + <source>Confirmed (%1 confirmations)</source> + <translation>Confirmado (%1 confirmaciones)</translation> + </message> + <message> + <source>Conflicted</source> + <translation>En conflicto</translation> + </message> + <message> + <source>Immature (%1 confirmations, will be available after %2)</source> + <translation>No disponible (%1 confirmaciones. Estarán disponibles al cabo de %2)</translation> + </message> + <message> + <source>This block was not received by any other nodes and will probably not be accepted!</source> + <translation>Este bloque no ha sido recibido por otros nodos y probablemente no sea aceptado!</translation> + </message> + <message> + <source>Generated but not accepted</source> + <translation>Generado pero no aceptado</translation> + </message> + <message> + <source>Received with</source> + <translation>Recibido con</translation> + </message> + <message> + <source>Received from</source> + <translation>Recibidos de</translation> + </message> + <message> + <source>Sent to</source> + <translation>Enviado a</translation> + </message> + <message> + <source>Payment to yourself</source> + <translation>Pago proprio</translation> + </message> + <message> + <source>Mined</source> + <translation>Minado</translation> + </message> + <message> + <source>watch-only</source> + <translation>de observación</translation> + </message> + <message> + <source>(n/a)</source> + <translation>(nd)</translation> + </message> + <message> + <source>(no label)</source> + <translation>(sin etiqueta)</translation> + </message> + <message> + <source>Transaction status. Hover over this field to show number of confirmations.</source> + <translation>Estado de transacción. Pasa el ratón sobre este campo para ver el número de confirmaciones.</translation> + </message> + <message> + <source>Date and time that the transaction was received.</source> + <translation>Fecha y hora en que se recibió la transacción.</translation> + </message> + <message> + <source>Type of transaction.</source> + <translation>Tipo de transacción.</translation> + </message> + <message> + <source>Whether or not a watch-only address is involved in this transaction.</source> + <translation>Si una dirección watch-only está involucrada en esta transacción o no.</translation> + </message> + <message> + <source>User-defined intent/purpose of the transaction.</source> + <translation>Descripción de la transacción definido por el usuario.</translation> + </message> + <message> + <source>Amount removed from or added to balance.</source> + <translation>Cantidad retirada o añadida al saldo.</translation> + </message> +</context> +<context> + <name>TransactionView</name> + <message> + <source>All</source> + <translation>Todo</translation> + </message> + <message> + <source>Today</source> + <translation>Hoy</translation> + </message> + <message> + <source>This week</source> + <translation>Esta semana</translation> + </message> + <message> + <source>This month</source> + <translation>Este mes</translation> + </message> + <message> + <source>Last month</source> + <translation>Mes pasado</translation> + </message> + <message> + <source>This year</source> + <translation>Este año</translation> + </message> + <message> + <source>Range...</source> + <translation>Rango...</translation> + </message> + <message> + <source>Received with</source> + <translation>Recibido con</translation> + </message> + <message> + <source>Sent to</source> + <translation>Enviado a</translation> + </message> + <message> + <source>To yourself</source> + <translation>A usted mismo</translation> + </message> + <message> + <source>Mined</source> + <translation>Minado</translation> + </message> + <message> + <source>Other</source> + <translation>Otra</translation> + </message> + <message> + <source>Enter address or label to search</source> + <translation>Introduzca una dirección o etiqueta que buscar</translation> + </message> + <message> + <source>Min amount</source> + <translation>Cantidad mínima</translation> + </message> + <message> + <source>Abandon transaction</source> + <translation>Transacción abandonada</translation> + </message> + <message> + <source>Copy address</source> + <translation>Copiar ubicación</translation> + </message> + <message> + <source>Copy label</source> + <translation>Copiar capa</translation> + </message> + <message> + <source>Copy amount</source> + <translation>Copiar cantidad</translation> + </message> + <message> + <source>Copy transaction ID</source> + <translation>Copiar ID de transacción</translation> + </message> + <message> + <source>Copy raw transaction</source> + <translation>Copiar transacción raw</translation> + </message> + <message> + <source>Copy full transaction details</source> + <translation>Copiar todos los detalles de la transacción</translation> + </message> + <message> + <source>Edit label</source> + <translation>Editar etiqueta</translation> + </message> + <message> + <source>Show transaction details</source> + <translation>Mostrar detalles de la transacción</translation> + </message> + <message> + <source>Export Transaction History</source> + <translation>Exportar historial de transacciones</translation> + </message> + <message> + <source>Comma separated file (*.csv)</source> + <translation>Archivo separado de coma (*.csv)</translation> + </message> + <message> + <source>Confirmed</source> + <translation>Confirmado</translation> + </message> + <message> + <source>Watch-only</source> + <translation>De observación</translation> + </message> + <message> + <source>Date</source> + <translation>Fecha</translation> + </message> + <message> + <source>Type</source> + <translation>Tipo</translation> + </message> + <message> + <source>Label</source> + <translation>Etiqueta</translation> + </message> + <message> + <source>Address</source> + <translation>Dirección</translation> + </message> + <message> + <source>ID</source> + <translation>ID</translation> + </message> + <message> + <source>Exporting Failed</source> + <translation>Falló la exportación</translation> + </message> + <message> + <source>There was an error trying to save the transaction history to %1.</source> + <translation>Ha habido un error al intentar guardar la transacción con %1.</translation> + </message> + <message> + <source>Exporting Successful</source> + <translation>Exportación finalizada</translation> + </message> + <message> + <source>The transaction history was successfully saved to %1.</source> + <translation>La transacción ha sido guardada en %1.</translation> + </message> + <message> + <source>Range:</source> + <translation>Rango:</translation> + </message> + <message> + <source>to</source> + <translation>para</translation> + </message> +</context> <context> <name>UnitDisplayStatusBarControl</name> - </context> + <message> + <source>Unit to show amounts in. Click to select another unit.</source> + <translation>Unidad en la que se muestran las cantidades. Haga clic para seleccionar otra unidad.</translation> + </message> +</context> +<context> + <name>WalletFrame</name> + <message> + <source>No wallet has been loaded.</source> + <translation>No se ha cargado ningún monedero</translation> + </message> +</context> +<context> + <name>WalletModel</name> + <message> + <source>Send Coins</source> + <translation>Enviar</translation> + </message> +</context> +<context> + <name>WalletView</name> + <message> + <source>&Export</source> + <translation>&Exportar</translation> + </message> + <message> + <source>Export the data in the current tab to a file</source> + <translation>Exportar a un archivo los datos de esta pestaña</translation> + </message> + <message> + <source>Backup Wallet</source> + <translation>Copia de seguridad del monedero</translation> + </message> + <message> + <source>Wallet Data (*.dat)</source> + <translation>Datos de monedero (*.dat)</translation> + </message> + <message> + <source>Backup Failed</source> + <translation>La copia de seguridad ha fallado</translation> + </message> + <message> + <source>There was an error trying to save the wallet data to %1.</source> + <translation>Ha habido un error al intentar guardar los datos del monedero en %1.</translation> + </message> + <message> + <source>Backup Successful</source> + <translation>Se ha completado con éxito la copia de respaldo</translation> + </message> + <message> + <source>The wallet data was successfully saved to %1.</source> + <translation>Los datos del monedero se han guardado con éxito en %1.</translation> + </message> +</context> <context> <name>bitcoin-core</name> - </context> + <message> + <source>Options:</source> + <translation>Opciones: +</translation> + </message> + <message> + <source>Specify data directory</source> + <translation>Especificar directorio para los datos</translation> + </message> + <message> + <source>Connect to a node to retrieve peer addresses, and disconnect</source> + <translation>Conectar a un nodo para obtener direcciones de pares y desconectar</translation> + </message> + <message> + <source>Specify your own public address</source> + <translation>Especifique su propia dirección pública</translation> + </message> + <message> + <source>Accept command line and JSON-RPC commands</source> + <translation>Aceptar comandos consola y JSON-RPC +</translation> + </message> + <message> + <source>If <category> is not supplied or if <category> = 1, output all debugging information.</source> + <translation>Si <category> no es proporcionado o si <category> =1, muestra toda la información de depuración.</translation> + </message> + <message> + <source>Prune configured below the minimum of %d MiB. Please use a higher number.</source> + <translation>La Poda se ha configurado por debajo del minimo de %d MiB. Por favor utiliza un valor mas alto.</translation> + </message> + <message> + <source>Prune: last wallet synchronisation goes beyond pruned data. You need to -reindex (download the whole blockchain again in case of pruned node)</source> + <translation>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)</translation> + </message> + <message> + <source>Rescans are not possible in pruned mode. You will need to use -reindex which will download the whole blockchain again.</source> + <translation>Nos es posible re-escanear en modo podado.Necesitas utilizar -reindex el cual descargara la cadena de bloques al completo de nuevo.</translation> + </message> + <message> + <source>Error: A fatal internal error occurred, see debug.log for details</source> + <translation>Un error interno fatal ocurrió, ver debug.log para detalles</translation> + </message> + <message> + <source>Fee (in %s/kB) to add to transactions you send (default: %s)</source> + <translation>Comisión (en %s/KB) para agregar a las transacciones que envíe (por defecto: %s)</translation> + </message> + <message> + <source>Pruning blockstore...</source> + <translation>Poda blockstore ...</translation> + </message> + <message> + <source>Run in the background as a daemon and accept commands</source> + <translation>Ejecutar en segundo plano como daemon y aceptar comandos +</translation> + </message> + <message> + <source>Unable to start HTTP server. See debug log for details.</source> + <translation>No se ha podido comenzar el servidor HTTP. Ver debug log para detalles.</translation> + </message> + <message> + <source>Bitcoin Core</source> + <translation>Bitcoin Core</translation> + </message> + <message> + <source>The %s developers</source> + <translation>Los %s desarrolladores</translation> + </message> + <message> + <source>A fee rate (in %s/kB) that will be used when fee estimation has insufficient data (default: %s)</source> + <translation>Una comision (en %s/kB) que sera usada cuando las estimacion de comision no disponga de suficientes datos (predeterminado: %s)</translation> + </message> + <message> + <source>Accept relayed transactions received from whitelisted peers even when not relaying transactions (default: %d)</source> + <translation>Aceptar transacciones retransmitidas recibidas desde nodos en la lista blanca incluso cuando no estés retransmitiendo transacciones (predeterminado: %d)</translation> + </message> + <message> + <source>Bind to given address and always listen on it. Use [host]:port notation for IPv6</source> + <translation>Vincular a la dirección dada y escuchar siempre en ella. Utilice la notación [host]:port para IPv6</translation> + </message> + <message> + <source>Cannot obtain a lock on data directory %s. %s is probably already running.</source> + <translation>No se puede bloquear el directorio %s. %s ya se está ejecutando.</translation> + </message> + <message> + <source>Delete all wallet transactions and only recover those parts of the blockchain through -rescan on startup</source> + <translation>Borrar todas las transacciones del monedero y sólo recuperar aquellas partes de la cadena de bloques por medio de -rescan on startup.</translation> + </message> + <message> + <source>Error loading %s: You can't enable HD on a already existing non-HD wallet</source> + <translation>Error cargando %s: No puede habilitar HD en un monedero existente que no es HD</translation> + </message> + <message> + <source>Error reading %s! All keys read correctly, but transaction data or address book entries might be missing or incorrect.</source> + <translation>Error leyendo %s!. Todas las claves se han leido correctamente, pero los datos de transacciones o la libreta de direcciones pueden faltar o ser incorrectos.</translation> + </message> + <message> + <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source> + <translation>Ejecutar comando cuando una transacción del monedero cambia (%s en cmd se remplazará por TxID)</translation> + </message> + <message> + <source>Maximum allowed median peer time offset adjustment. Local perspective of time may be influenced by peers forward or backward by this amount. (default: %u seconds)</source> + <translation>Ajuste máximo permitido del tiempo offset medio de pares. La perspectiva local de tiempo se verá influenciada por los pares anteriores y posteriores a esta cantidad. (Por defecto: %u segundos)</translation> + </message> + <message> + <source>Maximum total fees (in %s) to use in a single wallet transaction or raw transaction; setting this too low may abort large transactions (default: %s)</source> + <translation>Máximas comisiones totales (en %s) para utilizar en una sola transacción de la cartera; establecer esto demasiado bajo puede abortar grandes transacciones (predeterminado: %s)</translation> + </message> + <message> + <source>Please check that your computer's date and time are correct! If your clock is wrong, %s will not work properly.</source> + <translation>Por favor, compruebe si la fecha y hora en su computadora son correctas! Si su reloj esta mal, %s no trabajara correctamente. </translation> + </message> + <message> + <source>Please contribute if you find %s useful. Visit %s for further information about the software.</source> + <translation>Contribuya si encuentra %s de utilidad. Visite %s para mas información acerca del programa.</translation> + </message> + <message> + <source>Set the number of script verification threads (%u to %d, 0 = auto, <0 = leave that many cores free, default: %d)</source> + <translation>Establecer el número de hilos (threads) de verificación de scripts (entre %u y %d, 0 = automático, <0 = dejar libres ese número de núcleos; predeterminado: %d)</translation> + </message> + <message> + <source>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</source> + <translation>La base de datos de bloques contiene un bloque que parece ser del futuro. Esto puede ser porque la fecha y hora de tu ordenador están mal ajustados. Reconstruye la base de datos de bloques solo si estas seguro de que la fecha y hora de tu ordenador estan ajustados correctamente.</translation> + </message> + <message> + <source>Unable to rewind the database to a pre-fork state. You will need to redownload the blockchain</source> + <translation>No es posible reconstruir la base de datos a un estado anterior. Debe descargar de nuevo la cadena de bloques.</translation> + </message> + <message> + <source>Use UPnP to map the listening port (default: 1 when listening and no -proxy)</source> + <translation>Utiliza UPnP para asignar el puerto de escucha (predeterminado: 1 cuando esta escuchando sin -proxy)</translation> + </message> + <message> + <source>You need to rebuild the database using -reindex-chainstate to change -txindex</source> + <translation>Necesita reconstruir la base de datos usando -reindex-chainstate para cambiar -txindex</translation> + </message> + <message> + <source>%s corrupt, salvage failed</source> + <translation>%s corrupto. Fracasó la recuperacion</translation> + </message> + <message> + <source>-maxmempool must be at least %d MB</source> + <translation>-maxmempool debe ser por lo menos de %d MB</translation> + </message> + <message> + <source><category> can be:</source> + <translation><category> puede ser:</translation> + </message> + <message> + <source>Append comment to the user agent string</source> + <translation>Adjunta un comentario a la linea de agente de usuario</translation> + </message> + <message> + <source>Attempt to recover private keys from a corrupt wallet on startup</source> + <translation>Intento de recuperar claves privadas de un monedero corrupto en arranque</translation> + </message> + <message> + <source>Block creation options:</source> + <translation>Opciones de creación de bloques:</translation> + </message> + <message> + <source>Cannot resolve -%s address: '%s'</source> + <translation>No se puede resolver -%s direccion: '%s'</translation> + </message> + <message> + <source>Change index out of range</source> + <translation>Cambio de indice fuera de rango</translation> + </message> + <message> + <source>Connection options:</source> + <translation>Opciones de conexión:</translation> + </message> + <message> + <source>Copyright (C) %i-%i</source> + <translation>Copyright (C) %i-%i</translation> + </message> + <message> + <source>Corrupted block database detected</source> + <translation>Corrupción de base de datos de bloques detectada.</translation> + </message> + <message> + <source>Debugging/Testing options:</source> + <translation>Opciones de depuración/pruebas:</translation> + </message> + <message> + <source>Do not load the wallet and disable wallet RPC calls</source> + <translation>No cargar el monedero y desactivar las llamadas RPC del monedero</translation> + </message> + <message> + <source>Do you want to rebuild the block database now?</source> + <translation>¿Quieres reconstruir la base de datos de bloques ahora?</translation> + </message> + <message> + <source>Enable publish hash block in <address></source> + <translation>Activar publicar bloque .hash en <.Address></translation> + </message> + <message> + <source>Enable publish hash transaction in <address></source> + <translation>Activar publicar transacción .hash en <.Address></translation> + </message> + <message> + <source>Enable publish raw block in <address></source> + <translation>Habilita la publicacion de bloques en bruto en <direccion></translation> + </message> + <message> + <source>Enable publish raw transaction in <address></source> + <translation>Habilitar publicar transacción en rama en <dirección></translation> + </message> + <message> + <source>Enable transaction replacement in the memory pool (default: %u)</source> + <translation>Habilita el reemplazamiento de transacciones en la piscina de memoria (predeterminado: %u)</translation> + </message> + <message> + <source>Error initializing block database</source> + <translation>Error al inicializar la base de datos de bloques</translation> + </message> + <message> + <source>Error initializing wallet database environment %s!</source> + <translation>Error al inicializar el entorno de la base de datos del monedero %s</translation> + </message> + <message> + <source>Error loading %s</source> + <translation>Error cargando %s</translation> + </message> + <message> + <source>Error loading %s: Wallet corrupted</source> + <translation>Error cargando %s: Monedero dañado</translation> + </message> + <message> + <source>Error loading %s: Wallet requires newer version of %s</source> + <translation>Error cargando %s: Monedero requiere un versión mas reciente de %s</translation> + </message> + <message> + <source>Error loading %s: You can't disable HD on a already existing HD wallet</source> + <translation>Error cargando %s: No puede deshabilitar HD en un monedero existente que ya es HD</translation> + </message> + <message> + <source>Error loading block database</source> + <translation>Error cargando base de datos de bloques</translation> + </message> + <message> + <source>Error opening block database</source> + <translation>Error al abrir base de datos de bloques.</translation> + </message> + <message> + <source>Error: Disk space is low!</source> + <translation>Error: ¡Espacio en disco bajo!</translation> + </message> + <message> + <source>Failed to listen on any port. Use -listen=0 if you want this.</source> + <translation>Ha fallado la escucha en todos los puertos. Use -listen=0 si desea esto.</translation> + </message> + <message> + <source>Importing...</source> + <translation>Importando...</translation> + </message> + <message> + <source>Incorrect or no genesis block found. Wrong datadir for network?</source> + <translation>Incorrecto o bloque de génesis no encontrado. Datadir equivocada para la red?</translation> + </message> + <message> + <source>Initialization sanity check failed. %s is shutting down.</source> + <translation>La inicialización de la verificación de validez falló. Se está apagando %s.</translation> + </message> + <message> + <source>Invalid -onion address: '%s'</source> + <translation>Dirección -onion inválida: '%s'</translation> + </message> + <message> + <source>Invalid amount for -%s=<amount>: '%s'</source> + <translation>Cantidad no valida para -%s=<amount>: '%s'</translation> + </message> + <message> + <source>Invalid amount for -fallbackfee=<amount>: '%s'</source> + <translation>Cantidad inválida para -fallbackfee=<amount>: '%s'</translation> + </message> + <message> + <source>Keep the transaction memory pool below <n> megabytes (default: %u)</source> + <translation>Mantener la memoria de transacciones por debajo de <n> megabytes (predeterminado: %u)</translation> + </message> + <message> + <source>Loading banlist...</source> + <translation>Cargando banlist...</translation> + </message> + <message> + <source>Location of the auth cookie (default: data dir)</source> + <translation>Ubicación de la cookie de autenticación (default: data dir)</translation> + </message> + <message> + <source>Not enough file descriptors available.</source> + <translation>No hay suficientes descriptores de archivo disponibles. </translation> + </message> + <message> + <source>Only connect to nodes in network <net> (ipv4, ipv6 or onion)</source> + <translation>Sólo conectar a nodos en redes <net> (ipv4, ipv6 o onion)</translation> + </message> + <message> + <source>Print this help message and exit</source> + <translation>Imprimir este mensaje de ayuda y salir</translation> + </message> + <message> + <source>Print version and exit</source> + <translation>Imprimir versión y salir</translation> + </message> + <message> + <source>Prune cannot be configured with a negative value.</source> + <translation>Pode no se puede configurar con un valor negativo.</translation> + </message> + <message> + <source>Prune mode is incompatible with -txindex.</source> + <translation>El modo recorte es incompatible con -txindex.</translation> + </message> + <message> + <source>Rebuild chain state and block index from the blk*.dat files on disk</source> + <translation>Reconstruir el estado de la cadena e indice de bloques a partir de los ficheros blk*.dat en disco</translation> + </message> + <message> + <source>Rebuild chain state from the currently indexed blocks</source> + <translation>Reconstruir el estado de la cadena a partir de los bloques indexados</translation> + </message> + <message> + <source>Rewinding blocks...</source> + <translation>Verificando bloques...</translation> + </message> + <message> + <source>Set database cache size in megabytes (%d to %d, default: %d)</source> + <translation>Asignar tamaño de cache en megabytes (entre %d y %d; predeterminado: %d)</translation> + </message> + <message> + <source>Set maximum block size in bytes (default: %d)</source> + <translation>Establecer tamaño máximo de bloque en bytes (predeterminado: %d)</translation> + </message> + <message> + <source>Specify wallet file (within data directory)</source> + <translation>Especificar archivo de monedero (dentro del directorio de datos)</translation> + </message> + <message> + <source>The source code is available from %s.</source> + <translation>El código fuente esta disponible desde %s.</translation> + </message> + <message> + <source>Unable to bind to %s on this computer. %s is probably already running.</source> + <translation>No se ha podido conectar con %s en este equipo. %s es posible que este todavia en ejecución.</translation> + </message> + <message> + <source>Unsupported argument -benchmark ignored, use -debug=bench.</source> + <translation>El argumento -benchmark no es soportado y ha sido ignorado, utiliza -debug=bench</translation> + </message> + <message> + <source>Unsupported argument -debugnet ignored, use -debug=net.</source> + <translation>Parámetros no compatibles -debugnet ignorados , use -debug = red.</translation> + </message> + <message> + <source>Unsupported argument -tor found, use -onion.</source> + <translation>Parámetros no compatibles -tor encontrados, use -onion .</translation> + </message> + <message> + <source>Use UPnP to map the listening port (default: %u)</source> + <translation>Usar UPnP para asignar el puerto de escucha (predeterminado:: %u)</translation> + </message> + <message> + <source>User Agent comment (%s) contains unsafe characters.</source> + <translation>El comentario del Agente de Usuario (%s) contiene caracteres inseguros.</translation> + </message> + <message> + <source>Verifying blocks...</source> + <translation>Verificando bloques...</translation> + </message> + <message> + <source>Verifying wallet...</source> + <translation>Verificando monedero...</translation> + </message> + <message> + <source>Wallet %s resides outside data directory %s</source> + <translation>El monedero %s se encuentra fuera del directorio de datos %s</translation> + </message> + <message> + <source>Wallet debugging/testing options:</source> + <translation>Opciones de depuración/pruebas de monedero:</translation> + </message> + <message> + <source>Wallet needed to be rewritten: restart %s to complete</source> + <translation>Es necesario reescribir el monedero: reiniciar %s para completar</translation> + </message> + <message> + <source>Wallet options:</source> + <translation>Opciones de monedero:</translation> + </message> + <message> + <source>Allow JSON-RPC connections from specified source. Valid for <ip> are a single IP (e.g. 1.2.3.4), a network/netmask (e.g. 1.2.3.4/255.255.255.0) or a network/CIDR (e.g. 1.2.3.4/24). This option can be specified multiple times</source> + <translation>Permitir conexiones JSON-RPC de origen especificado. Válido para son una sola IP (por ejemplo 1.2.3.4), una red/máscara de red (por ejemplo 1.2.3.4/255.255.255.0) o una red/CIDR (e.g. 1.2.3.4/24). Esta opción se puede especificar varias veces</translation> + </message> + <message> + <source>Bind to given address and whitelist peers connecting to it. Use [host]:port notation for IPv6</source> + <translation>Ligar a las direcciones especificadas y poner en lista blanca a los equipos conectados a ellas. Usar la notación para IPv6 [host]:puerto.</translation> + </message> + <message> + <source>Bind to given address to listen for JSON-RPC connections. Use [host]:port notation for IPv6. This option can be specified multiple times (default: bind to all interfaces)</source> + <translation>Ligar a las direcciones especificadas para escuchar por conexiones JSON-RPC. Usar la notación para IPv6 [host]:puerto. Esta opción se puede especificar múltiples veces (por defecto: ligar a todas las interfaces)</translation> + </message> + <message> + <source>Create new files with system default permissions, instead of umask 077 (only effective with disabled wallet functionality)</source> + <translation>Crear nuevos archivos con permisos por defecto del sistema, en lugar de umask 077 (sólo efectivo con la funcionalidad de monedero desactivada)</translation> + </message> + <message> + <source>Discover own IP addresses (default: 1 when listening and no -externalip or -proxy)</source> + <translation>Descubra direcciones IP propias (por defecto: 1 cuando se escucha y nadie -externalip o -proxy)</translation> + </message> + <message> + <source>Error: Listening for incoming connections failed (listen returned error %s)</source> + <translation>Error: la escucha para conexiones entrantes falló (la escucha regresó el error %s)</translation> + </message> + <message> + <source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source> + <translation>Ejecutar un comando cuando se reciba una alerta importante o cuando veamos un fork demasiado largo (%s en cmd se reemplazará por el mensaje)</translation> + </message> + <message> + <source>Fees (in %s/kB) smaller than this are considered zero fee for relaying, mining and transaction creation (default: %s)</source> + <translation>Las comisiones (en %s/kB) mas pequeñas que esto se consideran como cero comisión para la retransmisión, minería y creación de la transacción (predeterminado: %s)</translation> + </message> + <message> + <source>If paytxfee is not set, include enough fee so transactions begin confirmation on average within n blocks (default: %u)</source> + <translation>Si el pago de comisión no está establecido, incluir la cuota suficiente para que las transacciones comiencen la confirmación en una media de n bloques ( por defecto :%u)</translation> + </message> + <message> + <source>Invalid amount for -maxtxfee=<amount>: '%s' (must be at least the minrelay fee of %s to prevent stuck transactions)</source> + <translation>Cantidad no válida para -maxtxfee=<amount>: '%s' (debe ser por lo menos la cuota de comisión mínima de %s para prevenir transacciones atascadas)</translation> + </message> + <message> + <source>Maximum size of data in data carrier transactions we relay and mine (default: %u)</source> + <translation>El tamaño máximo de los datos en las operaciones de transporte de datos que transmitimos y el mio (default: %u)</translation> + </message> + <message> + <source>Randomize credentials for every proxy connection. This enables Tor stream isolation (default: %u)</source> + <translation>Aleatorizar las credenciales para cada conexión proxy. Esto habilita la Tor stream isolation (por defecto: %u)</translation> + </message> + <message> + <source>Set maximum size of high-priority/low-fee transactions in bytes (default: %d)</source> + <translation>Establecer tamaño máximo de las transacciones de alta prioridad/baja comisión en bytes (predeterminado: %d)</translation> + </message> + <message> + <source>The transaction amount is too small to send after the fee has been deducted</source> + <translation>Monto de transacción muy pequeña luego de la deducción por comisión</translation> + </message> + <message> + <source>Use hierarchical deterministic key generation (HD) after BIP32. Only has effect during wallet creation/first start</source> + <translation>Usar tras BIP32 la generación de llave determinística jerárquica (HD) . Solo tiene efecto durante el primer inicio/generación del monedero</translation> + </message> + <message> + <source>Whitelisted peers cannot be DoS banned and their transactions are always relayed, even if they are already in the mempool, useful e.g. for a gateway</source> + <translation>A los equipos en lista blanca no se les pueden prohibir los ataques DoS y sus transacciones siempre son retransmitidas, incluso si ya están en el mempool, es útil por ejemplo para un gateway.</translation> + </message> + <message> + <source>You need to rebuild the database using -reindex to go back to unpruned mode. This will redownload the entire blockchain</source> + <translation>Necesitas reconstruir la base de datos utilizando -reindex para volver al modo sin recorte. Esto volverá a descargar toda la cadena de bloques</translation> + </message> + <message> + <source>(default: %u)</source> + <translation>(por defecto: %u)</translation> + </message> + <message> + <source>Accept public REST requests (default: %u)</source> + <translation>Aceptar solicitudes públicas en FERIADOS (por defecto: %u)</translation> + </message> + <message> + <source>Automatically create Tor hidden service (default: %d)</source> + <translation>Automáticamente crea el servicio Tor oculto (por defecto: %d)</translation> + </message> + <message> + <source>Connect through SOCKS5 proxy</source> + <translation>Conectar usando SOCKS5 proxy</translation> + </message> + <message> + <source>Error reading from database, shutting down.</source> + <translation>Error al leer la base de datos, cerrando.</translation> + </message> + <message> + <source>Imports blocks from external blk000??.dat file on startup</source> + <translation>Importa los bloques desde un archivo externo blk000?.dat</translation> + </message> + <message> + <source>Information</source> + <translation>Información</translation> + </message> + <message> + <source>Invalid amount for -paytxfee=<amount>: '%s' (must be at least %s)</source> + <translation>Cantidad inválida para -paytxfee=<amount>: '%s' (debe ser por lo menos %s)</translation> + </message> + <message> + <source>Invalid netmask specified in -whitelist: '%s'</source> + <translation>Máscara de red inválida especificada en -whitelist: '%s'</translation> + </message> + <message> + <source>Keep at most <n> unconnectable transactions in memory (default: %u)</source> + <translation>Mantener como máximo <n> transacciones no conectables en memoria (por defecto: %u)</translation> + </message> + <message> + <source>Need to specify a port with -whitebind: '%s'</source> + <translation>Necesita especificar un puerto con -whitebind: '%s'</translation> + </message> + <message> + <source>Node relay options:</source> + <translation>Opciones de nodos de retransmisión:</translation> + </message> + <message> + <source>RPC server options:</source> + <translation>Opciones de servidor RPC:</translation> + </message> + <message> + <source>Reducing -maxconnections from %d to %d, because of system limitations.</source> + <translation>Reduciendo -maxconnections de %d a %d, debido a limitaciones del sistema.</translation> + </message> + <message> + <source>Rescan the block chain for missing wallet transactions on startup</source> + <translation>Rescanea la cadena de bloques para transacciones perdidas de la cartera</translation> + </message> + <message> + <source>Send trace/debug info to console instead of debug.log file</source> + <translation>Enviar información de trazas/depuración a la consola en lugar de al archivo debug.log</translation> + </message> + <message> + <source>Send transactions as zero-fee transactions if possible (default: %u)</source> + <translation>Mandar transacciones como comisión-cero si es posible (por defecto: %u)</translation> + </message> + <message> + <source>Show all debugging options (usage: --help -help-debug)</source> + <translation>Muestra todas las opciones de depuración (uso: --help -help-debug)</translation> + </message> + <message> + <source>Shrink debug.log file on client startup (default: 1 when no -debug)</source> + <translation>Reducir el archivo debug.log al iniciar el cliente (predeterminado: 1 sin -debug)</translation> + </message> + <message> + <source>Signing transaction failed</source> + <translation>Transacción falló</translation> + </message> + <message> + <source>The transaction amount is too small to pay the fee</source> + <translation>Cantidad de la transacción demasiado pequeña para pagar la comisión</translation> + </message> + <message> + <source>This is experimental software.</source> + <translation>Este software es experimental.</translation> + </message> + <message> + <source>Tor control port password (default: empty)</source> + <translation>Contraseña del puerto de control de Tor (predeterminado: vacio)</translation> + </message> + <message> + <source>Tor control port to use if onion listening enabled (default: %s)</source> + <translation>Puerto de control de Tor a utilizar si la escucha de onion esta activada (predeterminado: %s)</translation> + </message> + <message> + <source>Transaction amount too small</source> + <translation>Cantidad de la transacción demasiado pequeña</translation> + </message> + <message> + <source>Transaction too large for fee policy</source> + <translation>Operación demasiado grande para la política de tasas</translation> + </message> + <message> + <source>Transaction too large</source> + <translation>Transacción demasiado grande, intenta dividirla en varias.</translation> + </message> + <message> + <source>Unable to bind to %s on this computer (bind returned error %s)</source> + <translation>No es posible conectar con %s en este sistema (bind ha dado el error %s)</translation> + </message> + <message> + <source>Upgrade wallet to latest format on startup</source> + <translation>Actualizar el monedero al último formato al inicio</translation> + </message> + <message> + <source>Username for JSON-RPC connections</source> + <translation>Nombre de usuario para las conexiones JSON-RPC +</translation> + </message> + <message> + <source>Warning</source> + <translation>Aviso</translation> + </message> + <message> + <source>Warning: unknown new rules activated (versionbit %i)</source> + <translation>Advertencia: nuevas reglas desconocidas activadas (versionbit %i)</translation> + </message> + <message> + <source>Whether to operate in a blocks only mode (default: %u)</source> + <translation>Si se debe o no operar en un modo de solo bloques (predeterminado: %u)</translation> + </message> + <message> + <source>Zapping all transactions from wallet...</source> + <translation>Eliminando todas las transacciones del monedero...</translation> + </message> + <message> + <source>ZeroMQ notification options:</source> + <translation>Opciones de notificación ZeroQM:</translation> + </message> + <message> + <source>Password for JSON-RPC connections</source> + <translation>Contraseña para las conexiones JSON-RPC +</translation> + </message> + <message> + <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> + <translation>Ejecutar un comando cuando cambia el mejor bloque (%s en cmd se sustituye por el hash de bloque)</translation> + </message> + <message> + <source>Allow DNS lookups for -addnode, -seednode and -connect</source> + <translation>Permitir búsquedas DNS para -addnode, -seednode y -connect</translation> + </message> + <message> + <source>Loading addresses...</source> + <translation>Cargando direcciones...</translation> + </message> + <message> + <source>(1 = keep tx meta data e.g. account owner and payment request information, 2 = drop tx meta data)</source> + <translation>(1 = mantener los meta datos de transacción, por ejemplo: propietario e información de pago, 2 = omitir los metadatos)</translation> + </message> + <message> + <source>-maxtxfee is set very high! Fees this large could be paid on a single transaction.</source> + <translation>-maxtxfee tiene un ajuste muy elevado! Comisiones muy grandes podrían ser pagadas en una única transaccion.</translation> + </message> + <message> + <source>Do not keep transactions in the mempool longer than <n> hours (default: %u)</source> + <translation>No mantener transacciones en la memoria mas de <n> horas (predeterminado: %u)</translation> + </message> + <message> + <source>Equivalent bytes per sigop in transactions for relay and mining (default: %u)</source> + <translation>Bytes equivalentes por sigop en transacciones para retrasmisión y minado (predeterminado: %u)</translation> + </message> + <message> + <source>Fees (in %s/kB) smaller than this are considered zero fee for transaction creation (default: %s)</source> + <translation>Las comisiones (en %s/kB) menores que esto son consideradas de cero comision para la creacion de transacciones (predeterminado: %s)</translation> + </message> + <message> + <source>Force relay of transactions from whitelisted peers even if they violate local relay policy (default: %d)</source> + <translation>Fuerza la retransmisión de transacciones desde nodos en la lista blanca incluso si violan la política de retransmisiones local (predeterminado: %d)</translation> + </message> + <message> + <source>How thorough the block verification of -checkblocks is (0-4, default: %u)</source> + <translation>Nivel de rigor en la verificación de bloques de -checkblocks (0-4; predeterminado: %u)</translation> + </message> + <message> + <source>Maintain a full transaction index, used by the getrawtransaction rpc call (default: %u)</source> + <translation>Mantener el índice completo de transacciones, usado por la llamada rpc de getrawtransaction (por defecto: %u)</translation> + </message> + <message> + <source>Number of seconds to keep misbehaving peers from reconnecting (default: %u)</source> + <translation>Número de segundos en que se evita la reconexión de pares con mal comportamiento (predeterminado: %u)</translation> + </message> + <message> + <source>Output debugging information (default: %u, supplying <category> is optional)</source> + <translation>Mostrar depuración (por defecto: %u, proporcionar <category> es opcional)</translation> + </message> + <message> + <source>Support filtering of blocks and transaction with bloom filters (default: %u)</source> + <translation>Admite filtrado de bloques, y transacciones con filtros Bloom. Reduce la carga de red. ( por defecto :%u)</translation> + </message> + <message> + <source>Total length of network version string (%i) exceeds maximum length (%i). Reduce the number or size of uacomments.</source> + <translation>La longitud total de la cadena de versión de red ( %i ) supera la longitud máxima ( %i ) . Reducir el número o tamaño de uacomments .</translation> + </message> + <message> + <source>Unsupported argument -socks found. Setting SOCKS version isn't possible anymore, only SOCKS5 proxies are supported.</source> + <translation>Error: argumento -socks encontrado. El ajuste de la versión SOCKS ya no es posible, sólo proxies SOCKS5 son compatibles.</translation> + </message> + <message> + <source>Unsupported argument -whitelistalwaysrelay ignored, use -whitelistrelay and/or -whitelistforcerelay.</source> + <translation>El argumento no soportado -whitelistalwaysrelay ha sido ignorado, utiliza -whitelistrelay y/o -whitelistforcerelay.</translation> + </message> + <message> + <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: %s)</source> + <translation>Usar distintos proxys SOCKS5 para comunicarse vía Tor de forma anónima (Por defecto: %s)</translation> + </message> + <message> + <source>Warning: Unknown block versions being mined! It's possible unknown rules are in effect</source> + <translation>Advertencia: Se están minando versiones de bloques desconocidas! Es posible que normas desconocidas estén activas</translation> + </message> + <message> + <source>Warning: Wallet file corrupt, data salvaged! Original %s saved as %s in %s; if your balance or transactions are incorrect you should restore from a backup.</source> + <translation>Aviso: fichero de monedero corrupto, datos recuperados! Original %s guardado como %s en %s; si su balance de transacciones es incorrecto, debe restaurar desde una copia de seguridad.</translation> + </message> + <message> + <source>(default: %s)</source> + <translation>(predeterminado: %s)</translation> + </message> + <message> + <source>Always query for peer addresses via DNS lookup (default: %u)</source> + <translation>Siempre consultar direcciones de otros equipos por medio de DNS lookup (por defecto: %u)</translation> + </message> + <message> + <source>How many blocks to check at startup (default: %u, 0 = all)</source> + <translation>Cuántos bloques comprobar al iniciar (predeterminado: %u, 0 = todos)</translation> + </message> + <message> + <source>Include IP addresses in debug output (default: %u)</source> + <translation>Incluir direcciones IP en la salida de depuración (por defecto: %u)</translation> + </message> + <message> + <source>Invalid -proxy address: '%s'</source> + <translation>Dirección -proxy inválida: '%s'</translation> + </message> + <message> + <source>Listen for JSON-RPC connections on <port> (default: %u or testnet: %u)</source> + <translation>Escuchar conexiones JSON-RPC en <puerto> (predeterminado: %u o testnet: %u)</translation> + </message> + <message> + <source>Listen for connections on <port> (default: %u or testnet: %u)</source> + <translation>Escuchar conexiones en <puerto> (predeterminado: %u o testnet: %u)</translation> + </message> + <message> + <source>Maintain at most <n> connections to peers (default: %u)</source> + <translation>Mantener como máximo <n> conexiones a pares (predeterminado: %u)</translation> + </message> + <message> + <source>Make the wallet broadcast transactions</source> + <translation>Realiza las operaciones de difusión del monedero</translation> + </message> + <message> + <source>Maximum per-connection receive buffer, <n>*1000 bytes (default: %u)</source> + <translation>Búfer de recepción máximo por conexión, <n>*1000 bytes (por defecto: %u)</translation> + </message> + <message> + <source>Maximum per-connection send buffer, <n>*1000 bytes (default: %u)</source> + <translation>Búfer de recepción máximo por conexión, , <n>*1000 bytes (por defecto: %u)</translation> + </message> + <message> + <source>Prepend debug output with timestamp (default: %u)</source> + <translation>Anteponer marca temporal a la información de depuración (por defecto: %u)</translation> + </message> + <message> + <source>Relay and mine data carrier transactions (default: %u)</source> + <translation>Retransmitir y minar transacciones de transporte de datos (por defecto: %u)</translation> + </message> + <message> + <source>Relay non-P2SH multisig (default: %u)</source> + <translation>Relay non-P2SH multisig (default: %u)</translation> + </message> + <message> + <source>Set key pool size to <n> (default: %u)</source> + <translation>Ajustar el número de claves en reserva <n> (predeterminado: %u)</translation> + </message> + <message> + <source>Set maximum BIP141 block weight (default: %d)</source> + <translation>Establecer peso máximo bloque BIP141 (predeterminado: %d)</translation> + </message> + <message> + <source>Set the number of threads to service RPC calls (default: %d)</source> + <translation>Establecer el número de procesos para llamadas del servicio RPC (por defecto: %d)</translation> + </message> + <message> + <source>Specify configuration file (default: %s)</source> + <translation>Especificar archivo de configuración (por defecto: %s)</translation> + </message> + <message> + <source>Specify connection timeout in milliseconds (minimum: 1, default: %d)</source> + <translation>Especificar tiempo de espera de la conexión (mínimo: 1, por defecto: %d)</translation> + </message> + <message> + <source>Specify pid file (default: %s)</source> + <translation>Especificar archivo pid (predeterminado: %s)</translation> + </message> + <message> + <source>Spend unconfirmed change when sending transactions (default: %u)</source> + <translation>Usar cambio aún no confirmado al enviar transacciones (predeterminado: %u)</translation> + </message> + <message> + <source>Starting network threads...</source> + <translation>Iniciando funciones de red...</translation> + </message> + <message> + <source>Threshold for disconnecting misbehaving peers (default: %u)</source> + <translation>Umbral para la desconexión de pares con mal comportamiento (predeterminado: %u)</translation> + </message> + <message> + <source>Unknown network specified in -onlynet: '%s'</source> + <translation>La red especificada en -onlynet '%s' es desconocida</translation> + </message> + <message> + <source>Insufficient funds</source> + <translation>Fondos insuficientes</translation> + </message> + <message> + <source>Loading block index...</source> + <translation>Cargando el índice de bloques...</translation> + </message> + <message> + <source>Add a node to connect to and attempt to keep the connection open</source> + <translation>Añadir un nodo al que conectarse y tratar de mantener la conexión abierta</translation> + </message> + <message> + <source>Loading wallet...</source> + <translation>Cargando monedero...</translation> + </message> + <message> + <source>Cannot downgrade wallet</source> + <translation>No se puede cambiar a una versión mas antigua el monedero</translation> + </message> + <message> + <source>Cannot write default address</source> + <translation>No se puede escribir la dirección predeterminada</translation> + </message> + <message> + <source>Rescanning...</source> + <translation>Reexplorando...</translation> + </message> + <message> + <source>Done loading</source> + <translation>Se terminó de cargar</translation> + </message> + <message> + <source>Error</source> + <translation>Error</translation> + </message> +</context> </TS>
\ No newline at end of file diff --git a/src/qt/locale/bitcoin_es_MX.ts b/src/qt/locale/bitcoin_es_MX.ts index 0a6ea1e1dd..bf8f0ceb88 100644 --- a/src/qt/locale/bitcoin_es_MX.ts +++ b/src/qt/locale/bitcoin_es_MX.ts @@ -41,7 +41,10 @@ <source>&Delete</source> <translation>&Borrar</translation> </message> -</context> + </context> +<context> + <name>AddressTableModel</name> + </context> <context> <name>AskPassphraseDialog</name> <message> @@ -60,7 +63,7 @@ <source>Repeat new passphrase</source> <translation>Repita la nueva contraseña</translation> </message> -</context> + </context> <context> <name>BanTableModel</name> <message> @@ -246,7 +249,7 @@ <source>Wallet is <b>encrypted</b> and currently <b>locked</b></source> <translation>La cartera esta <b>encriptada</b> y <b>bloqueada</b> actualmente </translation> </message> -</context> + </context> <context> <name>CoinControlDialog</name> <message> @@ -262,10 +265,6 @@ <translation>Monto:</translation> </message> <message> - <source>Priority:</source> - <translation>Prioridad:</translation> - </message> - <message> <source>Fee:</source> <translation>Cuota:</translation> </message> @@ -289,11 +288,7 @@ <source>Confirmed</source> <translation>Confirmado </translation> </message> - <message> - <source>Priority</source> - <translation>Prioridad</translation> - </message> -</context> + </context> <context> <name>EditAddressDialog</name> <message> @@ -308,7 +303,7 @@ <source>&Address</source> <translation>&Dirección</translation> </message> -</context> + </context> <context> <name>FreespaceChecker</name> <message> @@ -347,6 +342,13 @@ </message> </context> <context> + <name>ModalOverlay</name> + <message> + <source>Form</source> + <translation>Formulario</translation> + </message> + </context> +<context> <name>OpenURIDialog</name> </context> <context> @@ -376,6 +378,9 @@ </message> </context> <context> + <name>PaymentServer</name> + </context> +<context> <name>PeerTableModel</name> </context> <context> @@ -386,6 +391,12 @@ </message> </context> <context> + <name>QObject::QObject</name> + </context> +<context> + <name>QRImageWidget</name> + </context> +<context> <name>RPCConsole</name> <message> <source>Debug window</source> @@ -427,6 +438,9 @@ </message> </context> <context> + <name>RecentRequestsTableModel</name> + </context> +<context> <name>SendCoinsDialog</name> <message> <source>Send Coins</source> @@ -445,10 +459,6 @@ <translation>Monto:</translation> </message> <message> - <source>Priority:</source> - <translation>Prioridad:</translation> - </message> - <message> <source>Fee:</source> <translation>Cuota:</translation> </message> @@ -521,6 +531,9 @@ </message> </context> <context> + <name>SendConfirmationDialog</name> + </context> +<context> <name>ShutdownWindow</name> <message> <source>Do not shut down the computer until this window disappears.</source> @@ -553,16 +566,38 @@ <name>TrafficGraphWidget</name> </context> <context> + <name>TransactionDesc</name> + </context> +<context> <name>TransactionDescDialog</name> <message> <source>This pane shows a detailed description of the transaction</source> <translation>Este panel muestras una descripción detallada de la transacción</translation> </message> -</context> + </context> +<context> + <name>TransactionTableModel</name> + </context> +<context> + <name>TransactionView</name> + </context> <context> <name>UnitDisplayStatusBarControl</name> </context> <context> + <name>WalletFrame</name> + </context> +<context> + <name>WalletModel</name> + <message> + <source>Send Coins</source> + <translation>Enviar monedas</translation> + </message> +</context> +<context> + <name>WalletView</name> + </context> +<context> <name>bitcoin-core</name> <message> <source>Options:</source> diff --git a/src/qt/locale/bitcoin_es_UY.ts b/src/qt/locale/bitcoin_es_UY.ts index c565a63cd8..61bf9ad7ed 100644 --- a/src/qt/locale/bitcoin_es_UY.ts +++ b/src/qt/locale/bitcoin_es_UY.ts @@ -33,7 +33,10 @@ <source>&Delete</source> <translation>&Borrar</translation> </message> -</context> + </context> +<context> + <name>AddressTableModel</name> + </context> <context> <name>AskPassphraseDialog</name> <message> @@ -48,7 +51,7 @@ <source>Repeat new passphrase</source> <translation>Repetir nueva contraseña</translation> </message> -</context> + </context> <context> <name>BanTableModel</name> </context> @@ -189,7 +192,7 @@ <source>Wallet is <b>encrypted</b> and currently <b>locked</b></source> <translation>El Monedero esta <b>cifrado</b> y actualmente <b>bloqueado</b></translation> </message> -</context> + </context> <context> <name>CoinControlDialog</name> <message> @@ -205,10 +208,6 @@ <translation>AMonto:</translation> </message> <message> - <source>Priority:</source> - <translation>Prioridad:</translation> - </message> - <message> <source>Change:</source> <translation>Cambio:</translation> </message> @@ -220,11 +219,7 @@ <source>Confirmed</source> <translation>Confirmado</translation> </message> - <message> - <source>Priority</source> - <translation>Prioridad</translation> - </message> -</context> + </context> <context> <name>EditAddressDialog</name> <message> @@ -239,7 +234,7 @@ <source>&Address</source> <translation>&Direccion </translation> </message> -</context> + </context> <context> <name>FreespaceChecker</name> </context> @@ -254,6 +249,13 @@ </message> </context> <context> + <name>ModalOverlay</name> + <message> + <source>Form</source> + <translation>Formulario</translation> + </message> + </context> +<context> <name>OpenURIDialog</name> </context> <context> @@ -275,12 +277,21 @@ </message> </context> <context> + <name>PaymentServer</name> + </context> +<context> <name>PeerTableModel</name> </context> <context> <name>QObject</name> </context> <context> + <name>QObject::QObject</name> + </context> +<context> + <name>QRImageWidget</name> + </context> +<context> <name>RPCConsole</name> <message> <source>&Information</source> @@ -302,6 +313,9 @@ </message> </context> <context> + <name>RecentRequestsTableModel</name> + </context> +<context> <name>SendCoinsDialog</name> <message> <source>Send Coins</source> @@ -320,10 +334,6 @@ <translation>AMonto:</translation> </message> <message> - <source>Priority:</source> - <translation>Prioridad:</translation> - </message> - <message> <source>Change:</source> <translation>Cambio:</translation> </message> @@ -372,6 +382,9 @@ </message> </context> <context> + <name>SendConfirmationDialog</name> + </context> +<context> <name>ShutdownWindow</name> </context> <context> @@ -400,12 +413,30 @@ <name>TrafficGraphWidget</name> </context> <context> + <name>TransactionDesc</name> + </context> +<context> <name>TransactionDescDialog</name> </context> <context> + <name>TransactionTableModel</name> + </context> +<context> + <name>TransactionView</name> + </context> +<context> <name>UnitDisplayStatusBarControl</name> </context> <context> + <name>WalletFrame</name> + </context> +<context> + <name>WalletModel</name> + </context> +<context> + <name>WalletView</name> + </context> +<context> <name>bitcoin-core</name> <message> <source>Options:</source> diff --git a/src/qt/locale/bitcoin_es_VE.ts b/src/qt/locale/bitcoin_es_VE.ts index 432adc57ee..f465b949a2 100644 --- a/src/qt/locale/bitcoin_es_VE.ts +++ b/src/qt/locale/bitcoin_es_VE.ts @@ -41,7 +41,10 @@ <source>&Delete</source> <translation>&Borrar</translation> </message> -</context> + </context> +<context> + <name>AddressTableModel</name> + </context> <context> <name>AskPassphraseDialog</name> <message> @@ -60,7 +63,7 @@ <source>Repeat new passphrase</source> <translation>Repetir nueva frase de contraseña</translation> </message> -</context> + </context> <context> <name>BanTableModel</name> </context> @@ -175,10 +178,6 @@ <translation>Opciones de línea de comandos</translation> </message> <message> - <source>%1 and %2</source> - <translation>%1 y %2</translation> - </message> - <message> <source>%1 behind</source> <translation>%1 detrás</translation> </message> @@ -226,7 +225,7 @@ <source>Wallet is <b>encrypted</b> and currently <b>locked</b></source> <translation>La billetera está encriptada y bloqueada recientemente</translation> </message> -</context> + </context> <context> <name>CoinControlDialog</name> <message> @@ -246,10 +245,6 @@ <translation>Monto:</translation> </message> <message> - <source>Priority:</source> - <translation>Prioridad:</translation> - </message> - <message> <source>Fee:</source> <translation>Comisión:</translation> </message> @@ -297,11 +292,7 @@ <source>Confirmed</source> <translation>Confirmado</translation> </message> - <message> - <source>Priority</source> - <translation>Prioridad</translation> - </message> -</context> + </context> <context> <name>EditAddressDialog</name> <message> @@ -324,7 +315,7 @@ <source>&Address</source> <translation>&Dirección</translation> </message> -</context> + </context> <context> <name>FreespaceChecker</name> <message> @@ -391,6 +382,9 @@ </message> </context> <context> + <name>ModalOverlay</name> + </context> +<context> <name>OpenURIDialog</name> <message> <source>Open URI</source> @@ -408,7 +402,7 @@ <source>Select payment request file</source> <translation>Seleccionar archivo de solicitud de pago</translation> </message> -</context> + </context> <context> <name>OptionsDialog</name> <message> @@ -448,6 +442,9 @@ </message> </context> <context> + <name>PaymentServer</name> + </context> +<context> <name>PeerTableModel</name> </context> <context> @@ -456,6 +453,16 @@ <source>Amount</source> <translation>Monto</translation> </message> + <message> + <source>%1 and %2</source> + <translation>%1 y %2</translation> + </message> + </context> +<context> + <name>QObject::QObject</name> + </context> +<context> + <name>QRImageWidget</name> </context> <context> <name>RPCConsole</name> @@ -495,6 +502,9 @@ </message> </context> <context> + <name>RecentRequestsTableModel</name> + </context> +<context> <name>SendCoinsDialog</name> <message> <source>Quantity:</source> @@ -509,10 +519,6 @@ <translation>Monto:</translation> </message> <message> - <source>Priority:</source> - <translation>Prioridad:</translation> - </message> - <message> <source>Fee:</source> <translation>Comisión:</translation> </message> @@ -537,6 +543,9 @@ </message> </context> <context> + <name>SendConfirmationDialog</name> + </context> +<context> <name>ShutdownWindow</name> </context> <context> @@ -549,12 +558,30 @@ <name>TrafficGraphWidget</name> </context> <context> + <name>TransactionDesc</name> + </context> +<context> <name>TransactionDescDialog</name> </context> <context> + <name>TransactionTableModel</name> + </context> +<context> + <name>TransactionView</name> + </context> +<context> <name>UnitDisplayStatusBarControl</name> </context> <context> + <name>WalletFrame</name> + </context> +<context> + <name>WalletModel</name> + </context> +<context> + <name>WalletView</name> + </context> +<context> <name>bitcoin-core</name> <message> <source>Options:</source> @@ -593,10 +620,6 @@ <translation>Borrar todas las transacciones de la billetera y solo recuperar aquellas partes de la cadena de bloques a través de -rescan en el inicio del sistema.</translation> </message> <message> - <source>Distributed under the MIT software license, see the accompanying file COPYING or <http://www.opensource.org/licenses/mit-license.php>.</source> - <translation>Distribuido bajo la licensia de software MIT, ver el archivo adjunto COPYING o <http://www.opensource.org/licenses/mit-license.php>.</translation> - </message> - <message> <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source> <translation>Ejecutar comando cuando una transacción de la billetera cambia (%s en cmd es reemplazado por TxID)</translation> </message> @@ -605,18 +628,6 @@ <translation>Fija el número de verificación de hilos de script (%u a %d, 0 = auto, <0 = leave that many cores free, default: %d)</translation> </message> <message> - <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source> - <translation>Esta es una compilación de prueba pre-lanzamiento - use bajo su propio riesgo - no utilizar para aplicaciones de minería o mercantes</translation> - </message> - <message> - <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source> - <translation>Aviso: ¡La red no parece estar totalmente de acuerdo! Algunos mineros parecen estar teniendo inconvenientes.</translation> - </message> - <message> - <source>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</source> - <translation>Aviso: ¡No parecen estar totalmente de acuerdo con nuestros compañeros! Puede que tengas que actualizar, u otros nodos tengan que actualizarce.</translation> - </message> - <message> <source>Information</source> <translation>Información</translation> </message> diff --git a/src/qt/locale/bitcoin_et.ts b/src/qt/locale/bitcoin_et.ts index 0d659fd719..313d5e3be1 100644 --- a/src/qt/locale/bitcoin_et.ts +++ b/src/qt/locale/bitcoin_et.ts @@ -2,6 +2,10 @@ <context> <name>AddressBookPage</name> <message> + <source>Right-click to edit address or label</source> + <translation>Paremkliki aadressi või sildi muutmiseks</translation> + </message> + <message> <source>Create a new address</source> <translation>Loo uus aadress</translation> </message> @@ -37,6 +41,77 @@ <source>&Delete</source> <translation>&Kustuta</translation> </message> + <message> + <source>Choose the address to send coins to</source> + <translation>Vali aadress millele mündid saata</translation> + </message> + <message> + <source>Choose the address to receive coins with</source> + <translation>Vali aadress müntide vastuvõtmiseks</translation> + </message> + <message> + <source>C&hoose</source> + <translation>V&ali</translation> + </message> + <message> + <source>Sending addresses</source> + <translation>Saatvad aadressid</translation> + </message> + <message> + <source>Receiving addresses</source> + <translation>Vastuvõtvad aadressid</translation> + </message> + <message> + <source>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source> + <translation>Need on sinu Bitcoin aadressid maksete saatmiseks. Ennem müntide saatmist kontrolli alati summat ja makse saaja aadressi.</translation> + </message> + <message> + <source>These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction.</source> + <translation>Need on sinu Bitcoin aadressid sisenevate maksete vastu võtmiseks. Soovitav on iga tehingu tarbeks kasutada uut aadressi.</translation> + </message> + <message> + <source>&Copy Address</source> + <translation>&Kopeeri Aadress</translation> + </message> + <message> + <source>Copy &Label</source> + <translation>Kopeeri &Silt</translation> + </message> + <message> + <source>&Edit</source> + <translation>&Muuda</translation> + </message> + <message> + <source>Export Address List</source> + <translation>Ekspordi Aadresside Nimekiri</translation> + </message> + <message> + <source>Comma separated file (*.csv)</source> + <translation>Komadega eraldatud väärtuste fail (*.csv)</translation> + </message> + <message> + <source>Exporting Failed</source> + <translation>Eksport ebaõnnestus.</translation> + </message> + <message> + <source>There was an error trying to save the address list to %1. Please try again.</source> + <translation>Tõrge aadressi nimekirja salvestamisel %1. Palun proovi uuesti.</translation> + </message> +</context> +<context> + <name>AddressTableModel</name> + <message> + <source>Label</source> + <translation>Märge</translation> + </message> + <message> + <source>Address</source> + <translation>Aadress</translation> + </message> + <message> + <source>(no label)</source> + <translation>(märge puudub)</translation> + </message> </context> <context> <name>AskPassphraseDialog</name> @@ -56,9 +131,93 @@ <source>Repeat new passphrase</source> <translation>Korda salafraasi</translation> </message> + <message> + <source>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>.</source> + <translation>Sisesta uus salafraas rahakotti.<br/>Kasuta salafraasi millles on<b>kümme või rohkem juhuslikku sümbolit<b>,või<b>kaheksa või rohkem sõna<b/>.</translation> + </message> + <message> + <source>Encrypt wallet</source> + <translation>Krüpteeri rahakott</translation> + </message> + <message> + <source>This operation needs your wallet passphrase to unlock the wallet.</source> + <translation>Antud operatsioon vajab rahakoti lahtilukustamiseks salafraasi.</translation> + </message> + <message> + <source>Unlock wallet</source> + <translation>Ava rahakoti lukk</translation> + </message> + <message> + <source>This operation needs your wallet passphrase to decrypt the wallet.</source> + <translation>Antud operatsioon vajab rahakoti dekrüpteerimiseks salafraasi.</translation> + </message> + <message> + <source>Decrypt wallet</source> + <translation>Dekrüpteeri rahakott</translation> + </message> + <message> + <source>Change passphrase</source> + <translation>Vaheta salafraasi</translation> + </message> + <message> + <source>Enter the old passphrase and new passphrase to the wallet.</source> + <translation>Sisesta vana salafraas ja uus salafraas rahakotti.</translation> + </message> + <message> + <source>Confirm wallet encryption</source> + <translation>Kinnita rahakoti krüpteerimine.</translation> + </message> + <message> + <source>Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR BITCOINS</b>!</source> + <translation>Hoiatus:Kui sa krüpteerid oma rahakoti ja kaotad salafraasi, siis sa<b>KAOTAD OMA BITCOINID</b>!</translation> + </message> + <message> + <source>Are you sure you wish to encrypt your wallet?</source> + <translation>Kas oled kindel, et soovid rahakoti krüpteerida?</translation> + </message> + <message> + <source>Wallet encrypted</source> + <translation>Rahakott krüpteeritud</translation> + </message> + <message> + <source>Wallet encryption failed</source> + <translation>Rahakoti krüpteerimine ebaõnnestus</translation> + </message> + <message> + <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source> + <translation>Rahakoti krüpteerimine ebaõnnestus sisemise tõrke tõttu. Sinu rahakott ei ole krüpteeritud.</translation> + </message> + <message> + <source>The supplied passphrases do not match.</source> + <translation>Sisestatud salafraasid ei kattu.</translation> + </message> + <message> + <source>Wallet unlock failed</source> + <translation>Rahakoti lahtilukustamine ebaõnnestus</translation> + </message> + <message> + <source>The passphrase entered for the wallet decryption was incorrect.</source> + <translation>Rahakoti dekrüpteerimiseks sisestatud salafraas ei ole õige.</translation> + </message> + <message> + <source>Wallet decryption failed</source> + <translation>Rahakoti dekrüpteerimine ebaõnnestus</translation> + </message> + <message> + <source>Wallet passphrase was successfully changed.</source> + <translation>Rahakoti salafraas on edukalt vahetatud.</translation> + </message> + <message> + <source>Warning: The Caps Lock key is on!</source> + <translation>Hoiatus:Klaviatuuri suurtähelukk on peal.</translation> + </message> </context> <context> <name>BanTableModel</name> + <message> + <source>IP/Netmask</source> + <translation>IP/Võrgumask</translation> + </message> </context> <context> <name>BitcoinGUI</name> @@ -95,6 +254,10 @@ <translation>Väljumine</translation> </message> <message> + <source>&About %1</source> + <translation>&Teave %1</translation> + </message> + <message> <source>About &Qt</source> <translation>Teave &Qt kohta</translation> </message> @@ -140,7 +303,7 @@ </message> <message> <source>&Debug window</source> - <translation>&Debugimise aken</translation> + <translation>&Silumise aken</translation> </message> <message> <source>Open debugging and diagnostic console</source> @@ -164,7 +327,7 @@ </message> <message> <source>&Receive</source> - <translation>&Saama</translation> + <translation>&Võta vastu</translation> </message> <message> <source>&Show / Hide</source> @@ -203,28 +366,32 @@ <translation>Vahelehe tööriistariba</translation> </message> <message> + <source>Request payments (generates QR codes and bitcoin: URIs)</source> + <translation>Loo maksepäring (genereerib QR koodid ja bitcoini: URId)</translation> + </message> + <message> + <source>Open a bitcoin: URI or payment request</source> + <translation>Ava bitcoini: URI või maksepäring</translation> + </message> + <message> <source>&Command-line options</source> <translation>Käsurea valikud</translation> </message> <message numerus="yes"> - <source>%n hour(s)</source> - <translation><numerusform>%n tund</numerusform><numerusform>%n tundi</numerusform></translation> - </message> - <message numerus="yes"> - <source>%n day(s)</source> - <translation><numerusform>%n päev</numerusform><numerusform>%n päeva</numerusform></translation> + <source>%n active connection(s) to Bitcoin network</source> + <translation><numerusform>%n aktiivne ühendus Bitcoini võrku</numerusform><numerusform>%n aktiivset ühendust Bitcoini võrku</numerusform></translation> </message> - <message numerus="yes"> - <source>%n week(s)</source> - <translation><numerusform>%n nädal</numerusform><numerusform>%n nädalat</numerusform></translation> + <message> + <source>Indexing blocks on disk...</source> + <translation>Kõvakettal olevate plokkide indekseerimine...</translation> </message> <message> - <source>%1 and %2</source> - <translation>%1 ja %2</translation> + <source>Processing blocks on disk...</source> + <translation>Kõvakettal olevate plokkide töötlemine...</translation> </message> <message numerus="yes"> - <source>%n year(s)</source> - <translation><numerusform>%n aasta</numerusform><numerusform>%n aastat</numerusform></translation> + <source>Processed %n block(s) of transaction history.</source> + <translation><numerusform>Töödeldud %n plokk transaktsioonide ajaloost.</numerusform><numerusform>Töödeldud %n plokki transaktsioonide ajaloost.</numerusform></translation> </message> <message> <source>%1 behind</source> @@ -255,8 +422,12 @@ <translation>Ajakohane</translation> </message> <message> + <source>%1 client</source> + <translation>%1 klient</translation> + </message> + <message> <source>Catching up...</source> - <translation>Jõuan...</translation> + <translation>Jõuan järgi...</translation> </message> <message> <source>Date: %1 @@ -304,7 +475,7 @@ <source>Wallet is <b>encrypted</b> and currently <b>locked</b></source> <translation>Rahakott on <b>krüpteeritud</b> ning hetkel <b>suletud</b></translation> </message> -</context> + </context> <context> <name>CoinControlDialog</name> <message> @@ -312,6 +483,10 @@ <translation>Kogus:</translation> </message> <message> + <source>Bytes:</source> + <translation>Baiti:</translation> + </message> + <message> <source>Amount:</source> <translation>Summa:</translation> </message> @@ -320,18 +495,106 @@ <translation>Tasu:</translation> </message> <message> + <source>Dust:</source> + <translation>Puru:</translation> + </message> + <message> + <source>After Fee:</source> + <translation>Peale tehingutasu:</translation> + </message> + <message> + <source>Change:</source> + <translation>Vahetusraha:</translation> + </message> + <message> + <source>Tree mode</source> + <translation>Puu režiim</translation> + </message> + <message> + <source>List mode</source> + <translation>Loetelu režiim</translation> + </message> + <message> <source>Amount</source> <translation>Kogus</translation> </message> <message> + <source>Received with label</source> + <translation>Vastuvõetud märgisega</translation> + </message> + <message> + <source>Received with address</source> + <translation>Vastuvõetud aadressiga</translation> + </message> + <message> <source>Date</source> <translation>Kuupäev</translation> </message> <message> + <source>Confirmations</source> + <translation>Kinnitused</translation> + </message> + <message> <source>Confirmed</source> <translation>Kinnitatud</translation> </message> - </context> + <message> + <source>Copy address</source> + <translation>Kopeeri aadress</translation> + </message> + <message> + <source>Copy label</source> + <translation>Kopeeri märgis</translation> + </message> + <message> + <source>Copy amount</source> + <translation>Kopeeri summa</translation> + </message> + <message> + <source>Copy transaction ID</source> + <translation>Kopeeri tehingu ID</translation> + </message> + <message> + <source>Copy quantity</source> + <translation>Kopeeri kogus</translation> + </message> + <message> + <source>Copy fee</source> + <translation>Kopeeri tehingutasu</translation> + </message> + <message> + <source>Copy bytes</source> + <translation>Kopeeri baidid</translation> + </message> + <message> + <source>Copy dust</source> + <translation>Kopeeri puru</translation> + </message> + <message> + <source>Copy change</source> + <translation>Kopeeri vahetusraha</translation> + </message> + <message> + <source>(%1 locked)</source> + <translation>(%1 lukustatud)</translation> + </message> + <message> + <source>yes</source> + <translation>jah</translation> + </message> + <message> + <source>no</source> + <translation>ei</translation> + </message> + <message> + <source>(no label)</source> + <translation>(märgis puudub)</translation> + </message> + <message> + <source>(change)</source> + <translation>(vahetusraha)</translation> + </message> +</context> <context> <name>EditAddressDialog</name> <message> @@ -346,6 +609,38 @@ <source>&Address</source> <translation>&Aadress</translation> </message> + <message> + <source>New receiving address</source> + <translation>Uus vastu võttev aadress</translation> + </message> + <message> + <source>New sending address</source> + <translation>Uus saatev aadress</translation> + </message> + <message> + <source>Edit receiving address</source> + <translation>Muuda vastuvõtvat aadressi</translation> + </message> + <message> + <source>Edit sending address</source> + <translation>Muuda saatvat aadressi</translation> + </message> + <message> + <source>The entered address "%1" is not a valid Bitcoin address.</source> + <translation>Sisestatud aadress "%1" ei ole korrektne Bitcoin aadress.</translation> + </message> + <message> + <source>The entered address "%1" is already in the address book.</source> + <translation>Sisestatud aadress "%1" on juba aadressi raamatus.</translation> + </message> + <message> + <source>Could not unlock wallet.</source> + <translation>Rahakoti lahtilukustamine ebaõnnestus.</translation> + </message> + <message> + <source>New key generation failed.</source> + <translation>Uue võtme genereerimine ebaõnnestus.</translation> + </message> </context> <context> <name>FreespaceChecker</name> @@ -372,6 +667,14 @@ <source>command-line options</source> <translation>käsurea valikud</translation> </message> + <message> + <source>UI Options:</source> + <translation>Kasutajaliidese Suvandid:</translation> + </message> + <message> + <source>Show splash screen on startup (default: %u)</source> + <translation>Käivitamisel kuva laadimisekraani (vaikimisi %u)</translation> + </message> </context> <context> <name>Intro</name> @@ -385,6 +688,21 @@ </message> </context> <context> + <name>ModalOverlay</name> + <message> + <source>Form</source> + <translation>Vorm</translation> + </message> + <message> + <source>Last block time</source> + <translation>Viimane ploki aeg</translation> + </message> + <message> + <source>Hide</source> + <translation>Peida</translation> + </message> + </context> +<context> <name>OpenURIDialog</name> <message> <source>Open URI</source> @@ -394,7 +712,15 @@ <source>URI:</source> <translation>URI:</translation> </message> - </context> + <message> + <source>Select payment request file</source> + <translation>Vali maksepäringu fail</translation> + </message> + <message> + <source>Select payment request file to open</source> + <translation>Vali maksepäringu fail mida avada</translation> + </message> +</context> <context> <name>OptionsDialog</name> <message> @@ -450,10 +776,26 @@ <translation>Proxi port (nt 9050)</translation> </message> <message> + <source>IPv4</source> + <translation>IPv4</translation> + </message> + <message> + <source>IPv6</source> + <translation>IPv6</translation> + </message> + <message> + <source>Tor</source> + <translation>Tor</translation> + </message> + <message> <source>&Window</source> <translation>&Aken</translation> </message> <message> + <source>Hide tray icon</source> + <translation>Peida tegumiriba ikoon</translation> + </message> + <message> <source>Show only a tray icon after minimizing the window.</source> <translation>Minimeeri systray alale.</translation> </message> @@ -494,6 +836,10 @@ <translation>vaikeväärtus</translation> </message> <message> + <source>none</source> + <translation>puudub</translation> + </message> + <message> <source>Confirm options reset</source> <translation>Kinnita valikute algseadistamine</translation> </message> @@ -513,6 +859,10 @@ <translation>Kuvatav info ei pruugi olla ajakohane. Ühenduse loomisel süngitakse sinu rahakott automaatselt Bitconi võrgustikuga, kuid see toiming on hetkel lõpetamata.</translation> </message> <message> + <source>Pending:</source> + <translation>Ootel:</translation> + </message> + <message> <source>Immature:</source> <translation>Ebaküps:</translation> </message> @@ -521,11 +871,34 @@ <translation>Mitte aegunud mine'itud jääk</translation> </message> <message> + <source>Total:</source> + <translation>Kokku:</translation> + </message> + <message> <source>Recent transactions</source> <translation>Hiljutised tehingud</translation> </message> </context> <context> + <name>PaymentServer</name> + <message> + <source>Payment request error</source> + <translation>Maksepäringu tõrge</translation> + </message> + <message> + <source>Payment request rejected</source> + <translation>Maksepäring tagasi lükatud</translation> + </message> + <message> + <source>Payment request expired.</source> + <translation>Maksepäring aegunud.</translation> + </message> + <message> + <source>Unverified payment requests to custom payment scripts are unsupported.</source> + <translation>Kinnitamata maksepäringud kohandatud makse scriptidele ei ole toetatud.</translation> + </message> + </context> +<context> <name>PeerTableModel</name> </context> <context> @@ -538,6 +911,40 @@ <source>N/A</source> <translation>N/A</translation> </message> + <message> + <source>%1 ms</source> + <translation>%1 ms</translation> + </message> + <message numerus="yes"> + <source>%n hour(s)</source> + <translation><numerusform>%n tund</numerusform><numerusform>%n tundi</numerusform></translation> + </message> + <message numerus="yes"> + <source>%n day(s)</source> + <translation><numerusform>%n päev</numerusform><numerusform>%n päeva</numerusform></translation> + </message> + <message numerus="yes"> + <source>%n week(s)</source> + <translation><numerusform>%n nädal</numerusform><numerusform>%n nädalat</numerusform></translation> + </message> + <message> + <source>%1 and %2</source> + <translation>%1 ja %2</translation> + </message> + <message numerus="yes"> + <source>%n year(s)</source> + <translation><numerusform>%n aasta</numerusform><numerusform>%n aastat</numerusform></translation> + </message> + </context> +<context> + <name>QObject::QObject</name> + </context> +<context> + <name>QRImageWidget</name> + <message> + <source>Save QR Code</source> + <translation>Salvesta QR Kood</translation> + </message> </context> <context> <name>RPCConsole</name> @@ -562,6 +969,10 @@ <translation>Üldine</translation> </message> <message> + <source>Using BerkeleyDB version</source> + <translation>Kasutab BerkeleyDB versiooni</translation> + </message> + <message> <source>Startup time</source> <translation>Käivitamise hetk</translation> </message> @@ -586,6 +997,10 @@ <translation>Plokkide hetkearv</translation> </message> <message> + <source>Memory usage</source> + <translation>Mälu kasutus</translation> + </message> + <message> <source>Received</source> <translation>Vastuvõetud</translation> </message> @@ -602,6 +1017,14 @@ <translation>Versioon</translation> </message> <message> + <source>Synced Headers</source> + <translation>Sünkroniseeritud Päised</translation> + </message> + <message> + <source>Synced Blocks</source> + <translation>Sünkroniseeritud Plokid</translation> + </message> + <message> <source>Services</source> <translation>Teenused</translation> </message> @@ -619,7 +1042,7 @@ </message> <message> <source>Debug log file</source> - <translation>Debugimise logifail</translation> + <translation>Silumise logifail</translation> </message> <message> <source>Clear console</source> @@ -649,7 +1072,27 @@ <source>%1 GB</source> <translation>%1 GB</translation> </message> - </context> + <message> + <source>Inbound</source> + <translation>Sisenev</translation> + </message> + <message> + <source>Outbound</source> + <translation>Väljuv</translation> + </message> + <message> + <source>Yes</source> + <translation>Jah</translation> + </message> + <message> + <source>No</source> + <translation>Ei</translation> + </message> + <message> + <source>Unknown</source> + <translation>Teadmata</translation> + </message> +</context> <context> <name>ReceiveCoinsDialog</name> <message> @@ -665,6 +1108,10 @@ <translation>&Sõnum:</translation> </message> <message> + <source>Clear all fields of the form.</source> + <translation>Puhasta kõik vormi väljad.</translation> + </message> + <message> <source>Show</source> <translation>Näita</translation> </message> @@ -672,13 +1119,76 @@ <source>Remove</source> <translation>Eemalda</translation> </message> + <message> + <source>Copy label</source> + <translation>Kopeeri märgis</translation> + </message> + <message> + <source>Copy message</source> + <translation>Kopeeri sõnum</translation> + </message> + <message> + <source>Copy amount</source> + <translation>Kopeeri summa</translation> + </message> </context> <context> <name>ReceiveRequestDialog</name> <message> + <source>QR Code</source> + <translation>QR Kood</translation> + </message> + <message> <source>Copy &Address</source> <translation>&Kopeeri Aadress</translation> </message> + <message> + <source>Payment information</source> + <translation>Makse Informatsioon</translation> + </message> + <message> + <source>Address</source> + <translation>Aadress</translation> + </message> + <message> + <source>Amount</source> + <translation>Summa</translation> + </message> + <message> + <source>Label</source> + <translation>Silt</translation> + </message> + <message> + <source>Message</source> + <translation>Sõnum</translation> + </message> + <message> + <source>Resulting URI too long, try to reduce the text for label / message.</source> + <translation>URI liiga pikk, proovi vähendada märke / sõnumi pikkust.</translation> + </message> + </context> +<context> + <name>RecentRequestsTableModel</name> + <message> + <source>Date</source> + <translation>Kuupäev</translation> + </message> + <message> + <source>Label</source> + <translation>Silt</translation> + </message> + <message> + <source>Message</source> + <translation>Sõnum</translation> + </message> + <message> + <source>(no label)</source> + <translation>(märge puudub)</translation> + </message> + <message> + <source>(no message)</source> + <translation>(sõnum puudub)</translation> + </message> </context> <context> <name>SendCoinsDialog</name> @@ -687,6 +1197,14 @@ <translation>Müntide saatmine</translation> </message> <message> + <source>Inputs...</source> + <translation>Sisendid...</translation> + </message> + <message> + <source>automatically selected</source> + <translation>automaatselt valitud</translation> + </message> + <message> <source>Insufficient funds!</source> <translation>Liiga suur summa</translation> </message> @@ -695,6 +1213,10 @@ <translation>Kogus:</translation> </message> <message> + <source>Bytes:</source> + <translation>Baiti:</translation> + </message> + <message> <source>Amount:</source> <translation>Summa:</translation> </message> @@ -703,6 +1225,14 @@ <translation>Tasu:</translation> </message> <message> + <source>After Fee:</source> + <translation>Peale tehingutasu:</translation> + </message> + <message> + <source>Change:</source> + <translation>Vahetusraha:</translation> + </message> + <message> <source>Transaction Fee:</source> <translation>Tehingu tasu:</translation> </message> @@ -711,6 +1241,10 @@ <translation>Vali...</translation> </message> <message> + <source>per kilobyte</source> + <translation>kilobaidi kohta</translation> + </message> + <message> <source>Hide</source> <translation>Peida</translation> </message> @@ -735,6 +1269,14 @@ <translation>Lisa &Saaja</translation> </message> <message> + <source>Clear all fields of the form.</source> + <translation>Puhasta kõik vormi väljad.</translation> + </message> + <message> + <source>Dust:</source> + <translation>Puru:</translation> + </message> + <message> <source>Clear &All</source> <translation>Puhasta &Kõik</translation> </message> @@ -750,6 +1292,58 @@ <source>S&end</source> <translation>S&aada</translation> </message> + <message> + <source>Copy quantity</source> + <translation>Kopeeri kogus</translation> + </message> + <message> + <source>Copy amount</source> + <translation>Kopeeri summa</translation> + </message> + <message> + <source>Copy fee</source> + <translation>Kopeeri tehingutasu</translation> + </message> + <message> + <source>Copy bytes</source> + <translation>Kopeeri baidid</translation> + </message> + <message> + <source>Copy dust</source> + <translation>Kopeeri puru</translation> + </message> + <message> + <source>Copy change</source> + <translation>Kopeeri vahetusraha</translation> + </message> + <message> + <source>Are you sure you want to send?</source> + <translation>Oled kindel, et soovid saata?</translation> + </message> + <message> + <source>added as transaction fee</source> + <translation>lisatud kui tehingutasu</translation> + </message> + <message> + <source>or</source> + <translation>või</translation> + </message> + <message> + <source>The recipient address is not valid. Please recheck.</source> + <translation>Saaja aadress ei ole korrektne. Palun kontrolli üle.</translation> + </message> + <message> + <source>Payment request expired.</source> + <translation>Maksepäring aegunud.</translation> + </message> + <message> + <source>Warning: Invalid Bitcoin address</source> + <translation>Hoiatus: Ebakorrektne Bitcoin aadress</translation> + </message> + <message> + <source>(no label)</source> + <translation>(märgis puudub)</translation> + </message> </context> <context> <name>SendCoinsEntry</name> @@ -766,6 +1360,10 @@ <translation>&Märgis</translation> </message> <message> + <source>Choose previously used address</source> + <translation>Vali eelnevalt kasutatud aadress</translation> + </message> + <message> <source>Alt+A</source> <translation>Alt+A</translation> </message> @@ -778,6 +1376,10 @@ <translation>Alt+P</translation> </message> <message> + <source>S&ubtract fee from amount</source> + <translation>L&ahuta tehingutasu summast</translation> + </message> + <message> <source>Message:</source> <translation>Sõnum:</translation> </message> @@ -787,8 +1389,23 @@ </message> </context> <context> + <name>SendConfirmationDialog</name> + <message> + <source>Yes</source> + <translation>Jah</translation> + </message> +</context> +<context> <name>ShutdownWindow</name> - </context> + <message> + <source>%1 is shutting down...</source> + <translation>%1 lülitub välja...</translation> + </message> + <message> + <source>Do not shut down the computer until this window disappears.</source> + <translation>Ära lülita arvutit välja ennem kui see aken on kadunud.</translation> + </message> +</context> <context> <name>SignVerifyMessageDialog</name> <message> @@ -800,6 +1417,14 @@ <translation>&Allkirjastamise teade</translation> </message> <message> + <source>The Bitcoin address to sign the message with</source> + <translation>Bitcoin aadress millega sõnum allkirjastada</translation> + </message> + <message> + <source>Choose previously used address</source> + <translation>Vali eelnevalt kasutatud aadress</translation> + </message> + <message> <source>Alt+A</source> <translation>Alt+A</translation> </message> @@ -844,6 +1469,10 @@ <translation>&Kinnita Sõnum</translation> </message> <message> + <source>The Bitcoin address the message was signed with</source> + <translation>Bitcoin aadress millega sõnum on allkirjastatud</translation> + </message> + <message> <source>Verify the message to ensure it was signed with the specified Bitcoin address</source> <translation>Kinnita sõnum tõestamaks selle allkirjastatust määratud Bitcoini aadressiga.</translation> </message> @@ -855,6 +1484,54 @@ <source>Reset all verify message fields</source> <translation>Tühjenda kõik sõnumi kinnitamise väljad</translation> </message> + <message> + <source>Click "Sign Message" to generate signature</source> + <translation>Allkirja loomiseks vajuta "Allkirjasta Sõnum"</translation> + </message> + <message> + <source>The entered address is invalid.</source> + <translation>Sisestatud aadress ei ole korrektne</translation> + </message> + <message> + <source>Please check the address and try again.</source> + <translation>Palun kontrolli aadressi ja proovi uuesti.</translation> + </message> + <message> + <source>Wallet unlock was cancelled.</source> + <translation>Rahakoti lahtilukustamine on katkestatud.</translation> + </message> + <message> + <source>Private key for the entered address is not available.</source> + <translation>Sisestatud aadressi privaatvõti pole saadaval.</translation> + </message> + <message> + <source>Message signing failed.</source> + <translation>Sõnumi allkirjastamine ebaõnnestus.</translation> + </message> + <message> + <source>Message signed.</source> + <translation>Sõnum allkirjastatud</translation> + </message> + <message> + <source>The signature could not be decoded.</source> + <translation>Allkirja polnud võimalik dekodeerida.</translation> + </message> + <message> + <source>Please check the signature and try again.</source> + <translation>Palun kontrolli allkirja ja proovi uuesti.</translation> + </message> + <message> + <source>The signature did not match the message digest.</source> + <translation>Allkiri ei vastanud sõnumi krüptoräsile.</translation> + </message> + <message> + <source>Message verification failed.</source> + <translation>Sõnumi verifitseerimine ebaõnnestus.</translation> + </message> + <message> + <source>Message verified.</source> + <translation>Sõnum verifitseeritud.</translation> + </message> </context> <context> <name>SplashScreen</name> @@ -871,16 +1548,190 @@ </message> </context> <context> + <name>TransactionDesc</name> + <message> + <source>%1/unconfirmed</source> + <translation>%1/kinnitamata</translation> + </message> + <message> + <source>%1 confirmations</source> + <translation>%1 kinnitust</translation> + </message> + <message> + <source>Status</source> + <translation>Olek</translation> + </message> + <message> + <source>Date</source> + <translation>Kuupäev</translation> + </message> + <message> + <source>Generated</source> + <translation>Genereeritud</translation> + </message> + <message> + <source>label</source> + <translation>märgis</translation> + </message> + <message> + <source>not accepted</source> + <translation>pole vastu võetud</translation> + </message> + <message> + <source>Transaction fee</source> + <translation>Tehingutasu</translation> + </message> + <message> + <source>Message</source> + <translation>Sõnum</translation> + </message> + <message> + <source>Comment</source> + <translation>Kommentaar</translation> + </message> + <message> + <source>Merchant</source> + <translation>Kaupleja</translation> + </message> + <message> + <source>Inputs</source> + <translation>Sisendid</translation> + </message> + <message> + <source>Amount</source> + <translation>Summa</translation> + </message> + <message> + <source>true</source> + <translation>tõene</translation> + </message> + <message> + <source>false</source> + <translation>väär</translation> + </message> +</context> +<context> <name>TransactionDescDialog</name> <message> <source>This pane shows a detailed description of the transaction</source> <translation>Paan kuvab tehingu detailid</translation> </message> -</context> + </context> +<context> + <name>TransactionTableModel</name> + <message> + <source>Date</source> + <translation>Kuupäev</translation> + </message> + <message> + <source>Type</source> + <translation>Tüüp</translation> + </message> + <message> + <source>Label</source> + <translation>Silt</translation> + </message> + <message> + <source>Unconfirmed</source> + <translation>Kinnitamata</translation> + </message> + <message> + <source>(no label)</source> + <translation>(silt puudub)</translation> + </message> + </context> +<context> + <name>TransactionView</name> + <message> + <source>All</source> + <translation>Kõik</translation> + </message> + <message> + <source>Today</source> + <translation>Täna</translation> + </message> + <message> + <source>This week</source> + <translation>Käesolev nädal</translation> + </message> + <message> + <source>This month</source> + <translation>Käesolev kuu</translation> + </message> + <message> + <source>Last month</source> + <translation>Eelmine kuu</translation> + </message> + <message> + <source>This year</source> + <translation>Käesolev aasta</translation> + </message> + <message> + <source>Range...</source> + <translation>Vahemik...</translation> + </message> + <message> + <source>Min amount</source> + <translation>Minimaalne summa</translation> + </message> + <message> + <source>Copy address</source> + <translation>Kopeeri aadress</translation> + </message> + <message> + <source>Copy label</source> + <translation>Kopeeri märgis</translation> + </message> + <message> + <source>Copy amount</source> + <translation>Kopeeri summa</translation> + </message> + <message> + <source>Copy transaction ID</source> + <translation>Kopeeri tehingu ID</translation> + </message> + <message> + <source>Comma separated file (*.csv)</source> + <translation>Komadega eraldatud väärtuste fail (*.csv)</translation> + </message> + <message> + <source>Date</source> + <translation>Kuupäev</translation> + </message> + <message> + <source>Type</source> + <translation>Tüüp</translation> + </message> + <message> + <source>Label</source> + <translation>Silt</translation> + </message> + <message> + <source>Address</source> + <translation>Aadress</translation> + </message> + <message> + <source>ID</source> + <translation>ID</translation> + </message> + <message> + <source>Exporting Failed</source> + <translation>Eksport ebaõnnestus.</translation> + </message> + </context> <context> <name>UnitDisplayStatusBarControl</name> </context> <context> + <name>WalletFrame</name> + </context> +<context> + <name>WalletModel</name> + </context> +<context> + <name>WalletView</name> + </context> +<context> <name>bitcoin-core</name> <message> <source>Options:</source> @@ -907,10 +1758,6 @@ <translation>Tööta taustal ning aktsepteeri käsklusi</translation> </message> <message> - <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> - <translation>Luba välisühendusi (vaikeväärtus: 1 kui puudub -proxy või -connect)</translation> - </message> - <message> <source>Bitcoin Core</source> <translation>Bitcoini tuumik</translation> </message> @@ -923,18 +1770,10 @@ <translation>Käivita käsklus, kui rahakoti tehing muutub (%s cmd's muudetakse TxID'ks)</translation> </message> <message> - <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source> - <translation>See on test-versioon - kasutamine omal riisikol - ära kasuta mining'uks ega kaupmeeste programmides</translation> - </message> - <message> <source>Block creation options:</source> <translation>Blokeeri loomise valikud:</translation> </message> <message> - <source>Connect only to the specified node(s)</source> - <translation>Ühendu ainult määratud node'i(de)ga</translation> - </message> - <message> <source>Corrupted block database detected</source> <translation>Tuvastati vigane bloki andmebaas</translation> </message> diff --git a/src/qt/locale/bitcoin_et_EE.ts b/src/qt/locale/bitcoin_et_EE.ts new file mode 100644 index 0000000000..d96ffa42f5 --- /dev/null +++ b/src/qt/locale/bitcoin_et_EE.ts @@ -0,0 +1,747 @@ +<TS language="et_EE" version="2.1"> +<context> + <name>AddressBookPage</name> + <message> + <source>Create a new address</source> + <translation>Loo uus aadress</translation> + </message> + <message> + <source>&New</source> + <translation>&Uus</translation> + </message> + <message> + <source>&Copy</source> + <translation>&Kopeeri</translation> + </message> + <message> + <source>Delete the currently selected address from the list</source> + <translation>Kustuta valitud aadress nimekirjast</translation> + </message> + <message> + <source>&Delete</source> + <translation>&Kustuta</translation> + </message> + <message> + <source>&Edit</source> + <translation>&Muuda</translation> + </message> + </context> +<context> + <name>AddressTableModel</name> + <message> + <source>Label</source> + <translation>Silt</translation> + </message> + <message> + <source>Address</source> + <translation>Aadress</translation> + </message> + <message> + <source>(no label)</source> + <translation>(silt puudub)</translation> + </message> +</context> +<context> + <name>AskPassphraseDialog</name> + <message> + <source>Enter passphrase</source> + <translation>Sisesta parool</translation> + </message> + <message> + <source>New passphrase</source> + <translation>Uus parool</translation> + </message> + <message> + <source>Repeat new passphrase</source> + <translation>Korda uut parooli</translation> + </message> + <message> + <source>Encrypt wallet</source> + <translation>Krüpteeri rahakott</translation> + </message> + <message> + <source>Decrypt wallet</source> + <translation>Dekrüpteeri rahakott</translation> + </message> + <message> + <source>Change passphrase</source> + <translation>Muuda parooli</translation> + </message> + <message> + <source>Are you sure you wish to encrypt your wallet?</source> + <translation>Kas oled kindel, et soovid rahakoti krüpteerida?</translation> + </message> + <message> + <source>Wallet encrypted</source> + <translation>Rahakott krüpteeritud</translation> + </message> + <message> + <source>Wallet encryption failed</source> + <translation>Rahakoti krüpteerimine ebaõnnestus</translation> + </message> + <message> + <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source> + <translation>Rahakoti krüpteerimine ebaõnnestus sisemise vea tõttu. Sinu rahakotti ei krüpteeritud.</translation> + </message> + <message> + <source>The supplied passphrases do not match.</source> + <translation>Sisestatud paroolid ei kattu.</translation> + </message> + <message> + <source>Wallet decryption failed</source> + <translation>Rahakoti dekrüpteerimine ebaõnnestus</translation> + </message> + <message> + <source>Wallet passphrase was successfully changed.</source> + <translation>Rahakoti parooli vahetus õnnestus.</translation> + </message> + </context> +<context> + <name>BanTableModel</name> + </context> +<context> + <name>BitcoinGUI</name> + <message> + <source>Synchronizing with network...</source> + <translation>Võrguga sünkroniseerimine...</translation> + </message> + <message> + <source>&Overview</source> + <translation>&Ülevaade</translation> + </message> + <message> + <source>Open &URI...</source> + <translation>Ava &URI...</translation> + </message> + <message> + <source>Reindexing blocks on disk...</source> + <translation>Kõvakettal olevate plokkide reindekseerimine...</translation> + </message> + <message> + <source>Bitcoin</source> + <translation>Bitcoin</translation> + </message> + <message> + <source>Wallet</source> + <translation>Rahakott</translation> + </message> + <message> + <source>&File</source> + <translation>&Fail</translation> + </message> + <message> + <source>&Help</source> + <translation>&Abi</translation> + </message> + <message> + <source>%1 behind</source> + <translation>%1 ajast maas</translation> + </message> + <message> + <source>Transactions after this will not yet be visible.</source> + <translation>Hilisemad transaktsioonid ei ole veel nähtavad.</translation> + </message> + <message> + <source>Error</source> + <translation>Viga</translation> + </message> + <message> + <source>Warning</source> + <translation>Hoiatus</translation> + </message> + <message> + <source>Information</source> + <translation>Informatsioon</translation> + </message> + </context> +<context> + <name>CoinControlDialog</name> + <message> + <source>Amount:</source> + <translation>Kogus</translation> + </message> + <message> + <source>Amount</source> + <translation>Kogus</translation> + </message> + <message> + <source>Date</source> + <translation>Kuupäev</translation> + </message> + <message> + <source>Confirmations</source> + <translation>Kinnitused</translation> + </message> + <message> + <source>Confirmed</source> + <translation>Kinnitatud</translation> + </message> + <message> + <source>Copy address</source> + <translation>Kopeeri aadress</translation> + </message> + <message> + <source>Copy amount</source> + <translation>Kopeeri kogus</translation> + </message> + <message> + <source>Copy transaction ID</source> + <translation>Kopeeri transaktsiooni ID</translation> + </message> + <message> + <source>yes</source> + <translation>jah</translation> + </message> + <message> + <source>no</source> + <translation>ei</translation> + </message> + <message> + <source>(no label)</source> + <translation>(silt puudub)</translation> + </message> + </context> +<context> + <name>EditAddressDialog</name> + <message> + <source>New key generation failed.</source> + <translation>Uue võtme genereerimine ebaõnnestus.</translation> + </message> +</context> +<context> + <name>FreespaceChecker</name> + <message> + <source>name</source> + <translation>nimi</translation> + </message> + </context> +<context> + <name>HelpMessageDialog</name> + <message> + <source>version</source> + <translation>versioon</translation> + </message> + <message> + <source>Command-line options</source> + <translation>Käsurea valikud</translation> + </message> + <message> + <source>Usage:</source> + <translation>Kasutus:</translation> + </message> + <message> + <source>command-line options</source> + <translation>käsurea valikud</translation> + </message> + </context> +<context> + <name>Intro</name> + <message> + <source>Welcome</source> + <translation>Tere tulemast</translation> + </message> + <message> + <source>Error</source> + <translation>Viga</translation> + </message> + </context> +<context> + <name>ModalOverlay</name> + </context> +<context> + <name>OpenURIDialog</name> + </context> +<context> + <name>OptionsDialog</name> + <message> + <source>Options</source> + <translation>Valikud</translation> + </message> + <message> + <source>MB</source> + <translation>MB</translation> + </message> + <message> + <source>&Network</source> + <translation>&Võrk</translation> + </message> + <message> + <source>IPv4</source> + <translation>IPv4</translation> + </message> + <message> + <source>IPv6</source> + <translation>IPv6</translation> + </message> + <message> + <source>Tor</source> + <translation>Tor</translation> + </message> + <message> + <source>&OK</source> + <translation>&OK</translation> + </message> + </context> +<context> + <name>OverviewPage</name> + <message> + <source>Pending:</source> + <translation>Ootel:</translation> + </message> + <message> + <source>Total:</source> + <translation>Kokku:</translation> + </message> + <message> + <source>Recent transactions</source> + <translation>Hiljutised transaktsioonid</translation> + </message> + </context> +<context> + <name>PaymentServer</name> + </context> +<context> + <name>PeerTableModel</name> + </context> +<context> + <name>QObject</name> + <message> + <source>Amount</source> + <translation>Kogus</translation> + </message> + </context> +<context> + <name>QObject::QObject</name> + </context> +<context> + <name>QRImageWidget</name> + <message> + <source>&Save Image...</source> + <translation>&Salvesta Pilt...</translation> + </message> + <message> + <source>&Copy Image</source> + <translation>&Kopeeri Pilt</translation> + </message> + <message> + <source>Save QR Code</source> + <translation>Salvesta QR Kood</translation> + </message> + </context> +<context> + <name>RPCConsole</name> + <message> + <source>&Information</source> + <translation>&Informatsioon</translation> + </message> + <message> + <source>General</source> + <translation>Üldine</translation> + </message> + <message> + <source>Network</source> + <translation>Võrk</translation> + </message> + <message> + <source>Name</source> + <translation>Nimi</translation> + </message> + <message> + <source>Number of connections</source> + <translation>Ühenduste arv</translation> + </message> + <message> + <source>Block chain</source> + <translation>Blokiahel</translation> + </message> + <message> + <source>Memory usage</source> + <translation>Mälu kasutus</translation> + </message> + <message> + <source>Received</source> + <translation>Vastu võetud</translation> + </message> + <message> + <source>Sent</source> + <translation>Saadetud</translation> + </message> + <message> + <source>Direction</source> + <translation>Suund</translation> + </message> + <message> + <source>Version</source> + <translation>Versioon</translation> + </message> + <message> + <source>Services</source> + <translation>Teenused</translation> + </message> + <message> + <source>Ping Time</source> + <translation>Pingi Aeg</translation> + </message> + <message> + <source>&Network Traffic</source> + <translation>&Võrgu Liiklus</translation> + </message> + <message> + <source>Clear console</source> + <translation>Puhasta konsool</translation> + </message> + <message> + <source>never</source> + <translation>mitte kunagi</translation> + </message> + <message> + <source>Inbound</source> + <translation>Sisenev</translation> + </message> + <message> + <source>Outbound</source> + <translation>Väljuv</translation> + </message> + <message> + <source>Yes</source> + <translation>Jah</translation> + </message> + <message> + <source>No</source> + <translation>Ei</translation> + </message> + </context> +<context> + <name>ReceiveCoinsDialog</name> + <message> + <source>&Amount:</source> + <translation>&Kogus:</translation> + </message> + <message> + <source>&Message:</source> + <translation>&Sõnum:</translation> + </message> + <message> + <source>Remove</source> + <translation>Eemalda</translation> + </message> + <message> + <source>Copy message</source> + <translation>Kopeeri sõnum</translation> + </message> + <message> + <source>Copy amount</source> + <translation>Kopeeri kogus</translation> + </message> +</context> +<context> + <name>ReceiveRequestDialog</name> + <message> + <source>QR Code</source> + <translation>QR Kood</translation> + </message> + <message> + <source>&Save Image...</source> + <translation>&Salvesta Pilt...</translation> + </message> + <message> + <source>Address</source> + <translation>Aadress</translation> + </message> + <message> + <source>Amount</source> + <translation>Kogus</translation> + </message> + <message> + <source>Label</source> + <translation>Silt</translation> + </message> + <message> + <source>Message</source> + <translation>Sõnum</translation> + </message> + </context> +<context> + <name>RecentRequestsTableModel</name> + <message> + <source>Date</source> + <translation>Kuupäev</translation> + </message> + <message> + <source>Label</source> + <translation>Silt</translation> + </message> + <message> + <source>Message</source> + <translation>Sõnum</translation> + </message> + <message> + <source>(no label)</source> + <translation>(silt puudub)</translation> + </message> + </context> +<context> + <name>SendCoinsDialog</name> + <message> + <source>Amount:</source> + <translation>Kogus</translation> + </message> + <message> + <source>Choose...</source> + <translation>Vali...</translation> + </message> + <message> + <source>normal</source> + <translation>normaalne</translation> + </message> + <message> + <source>fast</source> + <translation>kiire</translation> + </message> + <message> + <source>Copy amount</source> + <translation>Kopeeri kogus</translation> + </message> + <message> + <source>(no label)</source> + <translation>(silt puudub)</translation> + </message> +</context> +<context> + <name>SendCoinsEntry</name> + <message> + <source>Alt+A</source> + <translation>Alt+A</translation> + </message> + <message> + <source>Alt+P</source> + <translation>Alt+P</translation> + </message> + </context> +<context> + <name>SendConfirmationDialog</name> + <message> + <source>Yes</source> + <translation>Jah</translation> + </message> +</context> +<context> + <name>ShutdownWindow</name> + </context> +<context> + <name>SignVerifyMessageDialog</name> + <message> + <source>Alt+A</source> + <translation>Alt+A</translation> + </message> + <message> + <source>Alt+P</source> + <translation>Alt+P</translation> + </message> + <message> + <source>Signature</source> + <translation>Allkiri</translation> + </message> + <message> + <source>Please check the address and try again.</source> + <translation>Palun kontrolli aadressi ja proovi uuesti.</translation> + </message> + <message> + <source>Message signed.</source> + <translation>Sõnum allkirjastatud.</translation> + </message> + <message> + <source>The signature could not be decoded.</source> + <translation>Allkirja ei õnnestunud dekodeerida.</translation> + </message> + <message> + <source>Please check the signature and try again.</source> + <translation>Palun kontrolli allkirja ja proovi uuesti.</translation> + </message> + <message> + <source>Message verification failed.</source> + <translation>Sõnumi verifitseerimine ebaõnnestus.</translation> + </message> + <message> + <source>Message verified.</source> + <translation>Sõnum verifitseeritud.</translation> + </message> +</context> +<context> + <name>SplashScreen</name> + <message> + <source>[testnet]</source> + <translation>[test võrk]</translation> + </message> +</context> +<context> + <name>TrafficGraphWidget</name> + <message> + <source>KB/s</source> + <translation>KB/s</translation> + </message> +</context> +<context> + <name>TransactionDesc</name> + <message> + <source>Status</source> + <translation>Olek</translation> + </message> + <message> + <source>Date</source> + <translation>Kuupäev</translation> + </message> + <message> + <source>Message</source> + <translation>Sõnum</translation> + </message> + <message> + <source>Comment</source> + <translation>Kommentaar</translation> + </message> + <message> + <source>Transaction ID</source> + <translation>Transaktsiooni ID</translation> + </message> + <message> + <source>Amount</source> + <translation>Kogus</translation> + </message> + </context> +<context> + <name>TransactionDescDialog</name> + </context> +<context> + <name>TransactionTableModel</name> + <message> + <source>Date</source> + <translation>Kuupäev</translation> + </message> + <message> + <source>Type</source> + <translation>Tüüp</translation> + </message> + <message> + <source>Label</source> + <translation>Silt</translation> + </message> + <message> + <source>(no label)</source> + <translation>(silt puudub)</translation> + </message> + </context> +<context> + <name>TransactionView</name> + <message> + <source>All</source> + <translation>Kõik</translation> + </message> + <message> + <source>Today</source> + <translation>Täna</translation> + </message> + <message> + <source>This month</source> + <translation>Käimasolev kuu</translation> + </message> + <message> + <source>Last month</source> + <translation>Eelmine kuu</translation> + </message> + <message> + <source>This year</source> + <translation>Käimasolev aasta</translation> + </message> + <message> + <source>Range...</source> + <translation>Vahemik...</translation> + </message> + <message> + <source>Copy address</source> + <translation>Kopeeri aadress</translation> + </message> + <message> + <source>Copy amount</source> + <translation>Kopeeri summa</translation> + </message> + <message> + <source>Copy transaction ID</source> + <translation>Kopeeri transaktsiooni ID</translation> + </message> + <message> + <source>Confirmed</source> + <translation>Kinnitatud</translation> + </message> + <message> + <source>Date</source> + <translation>Kuupäev</translation> + </message> + <message> + <source>Type</source> + <translation>Tüüp</translation> + </message> + <message> + <source>Label</source> + <translation>Silt</translation> + </message> + <message> + <source>Address</source> + <translation>Aadress</translation> + </message> + <message> + <source>ID</source> + <translation>ID</translation> + </message> + <message> + <source>Range:</source> + <translation>Vahemik:</translation> + </message> + </context> +<context> + <name>UnitDisplayStatusBarControl</name> + </context> +<context> + <name>WalletFrame</name> + </context> +<context> + <name>WalletModel</name> + </context> +<context> + <name>WalletView</name> + <message> + <source>Backup Wallet</source> + <translation>Varunda Rahakott</translation> + </message> + <message> + <source>Wallet Data (*.dat)</source> + <translation>Rahakoti Andmed (*.dat)</translation> + </message> + <message> + <source>Backup Failed</source> + <translation>Varundamine Ebaõnnestus</translation> + </message> + </context> +<context> + <name>bitcoin-core</name> + <message> + <source>Options:</source> + <translation>Valikud:</translation> + </message> + <message> + <source>Bitcoin Core</source> + <translation>Bitcoin Core</translation> + </message> + <message> + <source>Information</source> + <translation>Informatsioon</translation> + </message> + <message> + <source>Warning</source> + <translation>Hoiatus</translation> + </message> + <message> + <source>Error</source> + <translation>Viga</translation> + </message> +</context> +</TS>
\ No newline at end of file diff --git a/src/qt/locale/bitcoin_eu_ES.ts b/src/qt/locale/bitcoin_eu_ES.ts index cbe246f443..f7912f0785 100644 --- a/src/qt/locale/bitcoin_eu_ES.ts +++ b/src/qt/locale/bitcoin_eu_ES.ts @@ -41,6 +41,77 @@ <source>&Delete</source> <translation>&Ezabatu</translation> </message> + <message> + <source>Choose the address to send coins to</source> + <translation>Aukeratu helbidea txanponak bidaltzeko</translation> + </message> + <message> + <source>Choose the address to receive coins with</source> + <translation>Aukeratu helbidea txanponak jasotzeko</translation> + </message> + <message> + <source>C&hoose</source> + <translation>&Aukeratu</translation> + </message> + <message> + <source>Sending addresses</source> + <translation>Helbideak bidaltzen</translation> + </message> + <message> + <source>Receiving addresses</source> + <translation>Helbideak jasotzen</translation> + </message> + <message> + <source>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source> + <translation>Hauek dira zure Bitcoin helbideak dirua bidaltzeko. Beti egiaztatu diru-kantitatea eta jasotzeko helbidea bidali baino lehen.</translation> + </message> + <message> + <source>These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction.</source> + <translation>Hauek dira zure Bitcoin helbideak dirua jasotzeko. Gomendagarria da erabiltzea jasotzeko helbide berri bat operazio bakoitzeko.</translation> + </message> + <message> + <source>&Copy Address</source> + <translation>&Kopiatu helbidea</translation> + </message> + <message> + <source>Copy &Label</source> + <translation>Kopiatu &Etiketa</translation> + </message> + <message> + <source>&Edit</source> + <translation>&Editatu</translation> + </message> + <message> + <source>Export Address List</source> + <translation>Esportatu helbide lista</translation> + </message> + <message> + <source>Comma separated file (*.csv)</source> + <translation>Komaz bereizitako artxiboa (*.csv)</translation> + </message> + <message> + <source>Exporting Failed</source> + <translation>Esportatua okerra</translation> + </message> + <message> + <source>There was an error trying to save the address list to %1. Please try again.</source> + <translation>Errakuntza bat egon da gordetzen %1 helbide listan. Mesedez, saiatu berriro.</translation> + </message> +</context> +<context> + <name>AddressTableModel</name> + <message> + <source>Label</source> + <translation>Etiketa</translation> + </message> + <message> + <source>Address</source> + <translation>Helbidea</translation> + </message> + <message> + <source>(no label)</source> + <translation>(etiketarik ez)</translation> + </message> </context> <context> <name>AskPassphraseDialog</name> @@ -60,7 +131,75 @@ <source>Repeat new passphrase</source> <translation>Errepikatu pasahitz berria</translation> </message> -</context> + <message> + <source>Encrypt wallet</source> + <translation>Enkriptatu zorroa</translation> + </message> + <message> + <source>This operation needs your wallet passphrase to unlock the wallet.</source> + <translation>Eragiketa honek zorroaren pasahitza behar du zorroa desblokeatzeko.</translation> + </message> + <message> + <source>Unlock wallet</source> + <translation>Desblokeatu zorroa</translation> + </message> + <message> + <source>This operation needs your wallet passphrase to decrypt the wallet.</source> + <translation>Eragiketa honek zure zorroaren pasahitza behar du, zorroa desenkriptatzeko.</translation> + </message> + <message> + <source>Decrypt wallet</source> + <translation>Desenkriptatu zorroa</translation> + </message> + <message> + <source>Change passphrase</source> + <translation>Aldatu pasahitza</translation> + </message> + <message> + <source>Confirm wallet encryption</source> + <translation>Berretsi zorroaren enkriptazioa</translation> + </message> + <message> + <source>Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR BITCOINS</b>!</source> + <translation>Abisua: Zuk enkriptatzen baduzu zure diruzorroa eta zure pasahitza galtzen baduzu, <b>BITCOIN GUZTIAK GALDUKO DITUZU</b>!</translation> + </message> + <message> + <source>Are you sure you wish to encrypt your wallet?</source> + <translation>Seguru zaude nahi duzula zure diruzorroa enkriptatu?</translation> + </message> + <message> + <source>Wallet encrypted</source> + <translation>Zorroa enkriptatuta</translation> + </message> + <message> + <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source> + <translation>GARRANTZITSUA: Aurreko seguritate-kopiak ordeztuko dire berriekin, enkriptatutak. Segurtasun arrazoigaitik, aurreko kopiak ezin dira erabili hasiko zarenean zure diruzorro enkriptatu berriarekin.</translation> + </message> + <message> + <source>Wallet encryption failed</source> + <translation>Zorroaren enkriptazioak huts egin du</translation> + </message> + <message> + <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source> + <translation>Zorroaren enkriptazioak huts egin du barne-errore baten ondorioz. Zure zorroa ez da enkriptatu.</translation> + </message> + <message> + <source>The supplied passphrases do not match.</source> + <translation>Eman dituzun pasahitzak ez datoz bat.</translation> + </message> + <message> + <source>Wallet unlock failed</source> + <translation>Zorroaren desblokeoak huts egin du</translation> + </message> + <message> + <source>The passphrase entered for the wallet decryption was incorrect.</source> + <translation>Zorroa desenkriptatzeko sartutako pasahitza okerra da.</translation> + </message> + <message> + <source>Wallet decryption failed</source> + <translation>Zorroaren desenkriptazioak huts egin du</translation> + </message> + </context> <context> <name>BanTableModel</name> </context> @@ -154,7 +293,7 @@ <source>Wallet is <b>encrypted</b> and currently <b>locked</b></source> <translation>Zorroa <b>enkriptatuta</b> eta <b>blokeatuta</b> dago une honetan</translation> </message> -</context> + </context> <context> <name>CoinControlDialog</name> <message> @@ -169,6 +308,18 @@ <source>Date</source> <translation>Data</translation> </message> + <message> + <source>Copy address</source> + <translation>Kopiatu helbidea</translation> + </message> + <message> + <source>Copy label</source> + <translation>Kopiatu etiketa</translation> + </message> + <message> + <source>(no label)</source> + <translation>(etiketarik ez)</translation> + </message> </context> <context> <name>EditAddressDialog</name> @@ -184,6 +335,34 @@ <source>&Address</source> <translation>&Helbidea</translation> </message> + <message> + <source>New receiving address</source> + <translation>Jasotzeko helbide berria</translation> + </message> + <message> + <source>New sending address</source> + <translation>Bidaltzeko helbide berria</translation> + </message> + <message> + <source>Edit receiving address</source> + <translation>Editatu jasotzeko helbidea</translation> + </message> + <message> + <source>Edit sending address</source> + <translation>Editatu bidaltzeko helbidea</translation> + </message> + <message> + <source>The entered address "%1" is already in the address book.</source> + <translation>Sartu berri den helbidea, "%1", helbide-liburuan dago jadanik.</translation> + </message> + <message> + <source>Could not unlock wallet.</source> + <translation>Ezin desblokeatu zorroa.</translation> + </message> + <message> + <source>New key generation failed.</source> + <translation>Gako berriaren sorrerak huts egin du.</translation> + </message> </context> <context> <name>FreespaceChecker</name> @@ -195,6 +374,13 @@ <name>Intro</name> </context> <context> + <name>ModalOverlay</name> + <message> + <source>Form</source> + <translation>Inprimakia</translation> + </message> + </context> +<context> <name>OpenURIDialog</name> </context> <context> @@ -212,6 +398,9 @@ </message> </context> <context> + <name>PaymentServer</name> + </context> +<context> <name>PeerTableModel</name> </context> <context> @@ -222,6 +411,12 @@ </message> </context> <context> + <name>QObject::QObject</name> + </context> +<context> + <name>QRImageWidget</name> + </context> +<context> <name>RPCConsole</name> </context> <context> @@ -238,6 +433,10 @@ <source>&Message:</source> <translation>Mezua</translation> </message> + <message> + <source>Copy label</source> + <translation>Kopiatu etiketa</translation> + </message> </context> <context> <name>ReceiveRequestDialog</name> @@ -245,6 +444,41 @@ <source>Copy &Address</source> <translation>&Kopiatu helbidea</translation> </message> + <message> + <source>Address</source> + <translation>Helbidea</translation> + </message> + <message> + <source>Amount</source> + <translation>Kopurua</translation> + </message> + <message> + <source>Label</source> + <translation>Etiketa</translation> + </message> + <message> + <source>Message</source> + <translation>Mezua</translation> + </message> + </context> +<context> + <name>RecentRequestsTableModel</name> + <message> + <source>Date</source> + <translation>Data</translation> + </message> + <message> + <source>Label</source> + <translation>Etiketa</translation> + </message> + <message> + <source>Message</source> + <translation>Mezua</translation> + </message> + <message> + <source>(no label)</source> + <translation>(etiketarik ez)</translation> + </message> </context> <context> <name>SendCoinsDialog</name> @@ -268,7 +502,19 @@ <source>Confirm the send action</source> <translation>Berretsi bidaltzeko ekintza</translation> </message> - </context> + <message> + <source>Confirm send coins</source> + <translation>Berretsi txanponak bidaltzea</translation> + </message> + <message> + <source>The amount to pay must be larger than 0.</source> + <translation>Ordaintzeko kopurua 0 baino handiagoa izan behar du.</translation> + </message> + <message> + <source>(no label)</source> + <translation>(etiketarik ez)</translation> + </message> +</context> <context> <name>SendCoinsEntry</name> <message> @@ -303,6 +549,13 @@ <source>Pay To:</source> <translation>Ordaindu honi:</translation> </message> + <message> + <source>Enter a label for this address to add it to your address book</source> + <translation>Sartu etiketa bat helbide honetarako, eta gehitu zure helbide-liburuan</translation> + </message> +</context> +<context> + <name>SendConfirmationDialog</name> </context> <context> <name>ShutdownWindow</name> @@ -333,16 +586,238 @@ <name>TrafficGraphWidget</name> </context> <context> + <name>TransactionDesc</name> + <message> + <source>Open until %1</source> + <translation>Zabalik %1 arte</translation> + </message> + <message> + <source>%1/unconfirmed</source> + <translation>%1/konfirmatu gabe</translation> + </message> + <message> + <source>%1 confirmations</source> + <translation>%1 konfirmazioak</translation> + </message> + <message> + <source>, has not been successfully broadcast yet</source> + <translation>, ez da arrakastaz emititu oraindik</translation> + </message> + <message> + <source>Date</source> + <translation>Data</translation> + </message> + <message> + <source>unknown</source> + <translation>ezezaguna</translation> + </message> + <message> + <source>Message</source> + <translation>Mezua</translation> + </message> + <message> + <source>Transaction</source> + <translation>Transakzioaren</translation> + </message> + <message> + <source>Amount</source> + <translation>Kopurua</translation> + </message> + </context> +<context> <name>TransactionDescDialog</name> <message> <source>This pane shows a detailed description of the transaction</source> <translation>Panel honek transakzioaren deskribapen xehea erakusten du</translation> </message> + </context> +<context> + <name>TransactionTableModel</name> + <message> + <source>Date</source> + <translation>Data</translation> + </message> + <message> + <source>Type</source> + <translation>Mota</translation> + </message> + <message> + <source>Label</source> + <translation>Etiketa</translation> + </message> + <message> + <source>Open until %1</source> + <translation>Zabalik %1 arte</translation> + </message> + <message> + <source>Confirmed (%1 confirmations)</source> + <translation>Konfirmatuta (%1 konfirmazio)</translation> + </message> + <message> + <source>This block was not received by any other nodes and will probably not be accepted!</source> + <translation>Bloke hau ez du beste inongo nodorik jaso, eta seguruenik ez da onartuko!</translation> + </message> + <message> + <source>Generated but not accepted</source> + <translation>Sortua, baina ez onartua</translation> + </message> + <message> + <source>Received with</source> + <translation>Jasota honekin: </translation> + </message> + <message> + <source>Sent to</source> + <translation>Hona bidalia: </translation> + </message> + <message> + <source>Payment to yourself</source> + <translation>Ordainketa zeure buruari</translation> + </message> + <message> + <source>Mined</source> + <translation>Bildua</translation> + </message> + <message> + <source>(n/a)</source> + <translation>(n/a)</translation> + </message> + <message> + <source>(no label)</source> + <translation>(etiketarik ez)</translation> + </message> + <message> + <source>Transaction status. Hover over this field to show number of confirmations.</source> + <translation>Transakzioaren egoera. Pasatu sagua gainetik konfirmazio kopurua ikusteko.</translation> + </message> + <message> + <source>Date and time that the transaction was received.</source> + <translation>Transakzioa jasotako data eta ordua.</translation> + </message> + <message> + <source>Type of transaction.</source> + <translation>Transakzio mota.</translation> + </message> + <message> + <source>Amount removed from or added to balance.</source> + <translation>Saldoan kendu edo gehitutako kopurua.</translation> + </message> </context> <context> + <name>TransactionView</name> + <message> + <source>All</source> + <translation>Denak</translation> + </message> + <message> + <source>Today</source> + <translation>Gaur</translation> + </message> + <message> + <source>This week</source> + <translation>Aste honetan</translation> + </message> + <message> + <source>This month</source> + <translation>Hil honetan</translation> + </message> + <message> + <source>Last month</source> + <translation>Azken hilean</translation> + </message> + <message> + <source>This year</source> + <translation>Aurten</translation> + </message> + <message> + <source>Range...</source> + <translation>Muga...</translation> + </message> + <message> + <source>Received with</source> + <translation>Jasota honekin: </translation> + </message> + <message> + <source>Sent to</source> + <translation>Hona bidalia: </translation> + </message> + <message> + <source>To yourself</source> + <translation>Zeure buruari</translation> + </message> + <message> + <source>Mined</source> + <translation>Bildua</translation> + </message> + <message> + <source>Other</source> + <translation>Beste</translation> + </message> + <message> + <source>Enter address or label to search</source> + <translation>Sartu bilatzeko helbide edo etiketa</translation> + </message> + <message> + <source>Min amount</source> + <translation>Kopuru minimoa</translation> + </message> + <message> + <source>Copy address</source> + <translation>Kopiatu helbidea</translation> + </message> + <message> + <source>Copy label</source> + <translation>Kopiatu etiketa</translation> + </message> + <message> + <source>Comma separated file (*.csv)</source> + <translation>Komaz bereizitako artxiboa (*.csv)</translation> + </message> + <message> + <source>Date</source> + <translation>Data</translation> + </message> + <message> + <source>Type</source> + <translation>Mota</translation> + </message> + <message> + <source>Label</source> + <translation>Etiketa</translation> + </message> + <message> + <source>Address</source> + <translation>Helbidea</translation> + </message> + <message> + <source>Exporting Failed</source> + <translation>Esportatua okerra</translation> + </message> + </context> +<context> <name>UnitDisplayStatusBarControl</name> </context> <context> + <name>WalletFrame</name> + </context> +<context> + <name>WalletModel</name> + <message> + <source>Send Coins</source> + <translation>Bidali txanponak</translation> + </message> +</context> +<context> + <name>WalletView</name> + <message> + <source>&Export</source> + <translation>&Esportatu</translation> + </message> + <message> + <source>Export the data in the current tab to a file</source> + <translation>Esportatu datuak uneko fitxategian</translation> + </message> + </context> +<context> <name>bitcoin-core</name> <message> <source>Options:</source> diff --git a/src/qt/locale/bitcoin_fa.ts b/src/qt/locale/bitcoin_fa.ts index 98543ded46..c9cfad0f2a 100644 --- a/src/qt/locale/bitcoin_fa.ts +++ b/src/qt/locale/bitcoin_fa.ts @@ -41,6 +41,49 @@ <source>&Delete</source> <translation>&حذف</translation> </message> + <message> + <source>Choose the address to send coins to</source> + <translation>آدرس مورد نظر برای ارسال کوین ها را انتخاب کنید</translation> + </message> + <message> + <source>Choose the address to receive coins with</source> + <translation>آدرس موردنظر برای دریافت کوین ها را انتخاب کنید.</translation> + </message> + <message> + <source>C&hoose</source> + <translation>انتخاب</translation> + </message> + <message> + <source>Sending addresses</source> + <translation>آدرس های فرستنده</translation> + </message> + <message> + <source>Receiving addresses</source> + <translation>آدرس های گیرنده</translation> + </message> + <message> + <source>Copy &Label</source> + <translation>کپی و برچسب&گذاری</translation> + </message> + <message> + <source>&Edit</source> + <translation>&ویرایش</translation> + </message> + </context> +<context> + <name>AddressTableModel</name> + <message> + <source>Label</source> + <translation>برچسب</translation> + </message> + <message> + <source>Address</source> + <translation>آدرس</translation> + </message> + <message> + <source>(no label)</source> + <translation>(بدون برچسب)</translation> + </message> </context> <context> <name>AskPassphraseDialog</name> @@ -60,6 +103,54 @@ <source>Repeat new passphrase</source> <translation>تکرار گذرواژهٔ جدید</translation> </message> + <message> + <source>Encrypt wallet</source> + <translation>رمزنگاری کیف پول</translation> + </message> + <message> + <source>Unlock wallet</source> + <translation>باز کردن قفل کیف پول</translation> + </message> + <message> + <source>Decrypt wallet</source> + <translation>رمزگشایی کیف پول</translation> + </message> + <message> + <source>Confirm wallet encryption</source> + <translation>تأیید رمزنگاری کیف پول</translation> + </message> + <message> + <source>Are you sure you wish to encrypt your wallet?</source> + <translation>آیا مطمئن هستید که میخواهید کیف پول خود را رمزنگاری کنید؟</translation> + </message> + <message> + <source>Wallet encrypted</source> + <translation>کیف پول رمزنگاری شد</translation> + </message> + <message> + <source>Wallet encryption failed</source> + <translation>رمزنگاری کیف پول با شکست مواجه شد</translation> + </message> + <message> + <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source> + <translation>رمزنگاری کیف پول بنا به یک خطای داخلی با شکست مواجه شد. کیف پول شما رمزنگاری نشد.</translation> + </message> + <message> + <source>Wallet unlock failed</source> + <translation>بازگشایی قفل کیفپول با شکست مواجه شد</translation> + </message> + <message> + <source>Wallet decryption failed</source> + <translation>رمزگشایی کیف پول با شکست مواجه شد</translation> + </message> + <message> + <source>Wallet passphrase was successfully changed.</source> + <translation>گذرواژهٔ کیف پول با موفقیت عوض شد.</translation> + </message> + <message> + <source>Warning: The Caps Lock key is on!</source> + <translation>هشدار: کلید Caps Lock روشن است!</translation> + </message> </context> <context> <name>BanTableModel</name> @@ -131,6 +222,10 @@ <translation>&تنظیمات...</translation> </message> <message> + <source>Modify configuration options for %1</source> + <translation>تغییر تنظیمات %1</translation> + </message> + <message> <source>&Encrypt Wallet...</source> <translation>&رمزنگاری کیف پول...</translation> </message> @@ -235,6 +330,10 @@ <translation>نوارابزار برگهها</translation> </message> <message> + <source>Request payments (generates QR codes and bitcoin: URIs)</source> + <translation>درخواست پرداخت ( تولید کد کیوار و ادرس بیت کوین)</translation> + </message> + <message> <source>Show the list of used sending addresses and labels</source> <translation>نمایش لیست آدرس های ارسال و لیبل ها</translation> </message> @@ -243,6 +342,10 @@ <translation>نمایش لیست آدرس های دریافت و لیبل ها</translation> </message> <message> + <source>Open a bitcoin: URI or payment request</source> + <translation>بازکردن یک بیت کوین: آدرس یا درخواست پرداخت</translation> + </message> + <message> <source>&Command-line options</source> <translation>گزینههای خطفرمان</translation> </message> @@ -251,28 +354,12 @@ <translation><numerusform>%n ارتباط فعال با شبکهٔ بیتکوین</numerusform></translation> </message> <message> - <source>No block source available...</source> - <translation>منبعی برای دریافت بلاک در دسترس نیست...</translation> - </message> - <message numerus="yes"> - <source>%n hour(s)</source> - <translation><numerusform>%n ساعت</numerusform></translation> - </message> - <message numerus="yes"> - <source>%n day(s)</source> - <translation><numerusform>%n روز</numerusform></translation> - </message> - <message numerus="yes"> - <source>%n week(s)</source> - <translation><numerusform>%n هفته</numerusform></translation> - </message> - <message> - <source>%1 and %2</source> - <translation>%1 و %2</translation> + <source>Processing blocks on disk...</source> + <translation>پردازش بلوکها روی دیسک...</translation> </message> <message numerus="yes"> - <source>%n year(s)</source> - <translation><numerusform>%n سال</numerusform></translation> + <source>Processed %n block(s) of transaction history.</source> + <translation><numerusform>پردازش %n بلاک از تاریخچه ی تراکنش ها </numerusform></translation> </message> <message> <source>%1 behind</source> @@ -352,7 +439,7 @@ <source>Wallet is <b>encrypted</b> and currently <b>locked</b></source> <translation>کیف پول <b>رمزنگاری شده</b> است و هماکنون <b>قفل</b> است</translation> </message> -</context> + </context> <context> <name>CoinControlDialog</name> <message> @@ -372,10 +459,6 @@ <translation>مبلغ:</translation> </message> <message> - <source>Priority:</source> - <translation>اولویت:</translation> - </message> - <message> <source>Fee:</source> <translation>هزینه:</translation> </message> @@ -424,8 +507,48 @@ <translation>تأیید شده</translation> </message> <message> - <source>Priority</source> - <translation>اولویت</translation> + <source>Copy label</source> + <translation>کپی برچسب</translation> + </message> + <message> + <source>Copy amount</source> + <translation>کپی مقدار</translation> + </message> + <message> + <source>Copy transaction ID</source> + <translation>کپی شناسهٔ تراکنش</translation> + </message> + <message> + <source>Lock unspent</source> + <translation>قفل کردن خرج نشده ها</translation> + </message> + <message> + <source>Unlock unspent</source> + <translation>بازکردن قفل خرج نشده ها</translation> + </message> + <message> + <source>Copy quantity</source> + <translation>کپی تعداد</translation> + </message> + <message> + <source>(%1 locked)</source> + <translation>(%1 قفل شده)</translation> + </message> + <message> + <source>yes</source> + <translation>بله</translation> + </message> + <message> + <source>no</source> + <translation>خیر</translation> + </message> + <message> + <source>(no label)</source> + <translation>(بدون برچسب)</translation> + </message> + <message> + <source>(change)</source> + <translation>(تغییر)</translation> </message> </context> <context> @@ -442,7 +565,35 @@ <source>&Address</source> <translation>&نشانی</translation> </message> -</context> + <message> + <source>New receiving address</source> + <translation>نشانی گیرنده جدید</translation> + </message> + <message> + <source>New sending address</source> + <translation>نشانی فرستنده جدید</translation> + </message> + <message> + <source>Edit receiving address</source> + <translation>ویرایش آدرس گیرنده</translation> + </message> + <message> + <source>Edit sending address</source> + <translation>ویرایش آدرس قرستنده</translation> + </message> + <message> + <source>The entered address "%1" is not a valid Bitcoin address.</source> + <translation>نشانی وارد شده "%1" یک نشانی معتبر بیتکوین نیست.</translation> + </message> + <message> + <source>The entered address "%1" is already in the address book.</source> + <translation>نشانی وارد شده «%1» در حال حاضر در دفترچه وجود دارد.</translation> + </message> + <message> + <source>Could not unlock wallet.</source> + <translation>نمیتوان کیف پول را رمزگشایی کرد.</translation> + </message> + </context> <context> <name>FreespaceChecker</name> <message> @@ -473,6 +624,10 @@ <translation>نسخه</translation> </message> <message> + <source>(%1-bit)</source> + <translation>(%1-بیت)</translation> + </message> + <message> <source>About %1</source> <translation>درباره %1</translation> </message> @@ -488,6 +643,26 @@ <source>command-line options</source> <translation>گزینههای خط فرمان</translation> </message> + <message> + <source>UI Options:</source> + <translation>گزینههای رابط کاربری:</translation> + </message> + <message> + <source>Set language, for example "de_DE" (default: system locale)</source> + <translation>زبان را تنظیم کنید؛ برای مثال «de_DE» (پیشفرض: زبان سیستم)</translation> + </message> + <message> + <source>Start minimized</source> + <translation>شروع برنامه به صورت کوچکشده</translation> + </message> + <message> + <source>Set SSL root certificates for payment request (default: -system-)</source> + <translation>تنظیم گواهی ریشه SSl برای درخواست پرداخت (پیشفرض: -system-)</translation> + </message> + <message> + <source>Show splash screen on startup (default: %u)</source> + <translation>نمایش پنجرهٔ خوشامدگویی در ابتدای اجرای برنامه (پیشفرض: %u)</translation> + </message> </context> <context> <name>Intro</name> @@ -517,11 +692,38 @@ </message> </context> <context> + <name>ModalOverlay</name> + <message> + <source>Form</source> + <translation>فرم</translation> + </message> + <message> + <source>Last block time</source> + <translation>زمان آخرین بلوک</translation> + </message> + <message> + <source>Hide</source> + <translation>پنهان کردن</translation> + </message> + </context> +<context> <name>OpenURIDialog</name> <message> <source>Open URI</source> <translation>بازکردن آدرس</translation> </message> + <message> + <source>Open payment request from URI or file</source> + <translation>بازکردن درخواست پرداخت از آدرس یا فایل</translation> + </message> + <message> + <source>URI:</source> + <translation>آدرس اینترنتی:</translation> + </message> + <message> + <source>Select payment request file</source> + <translation>انتخاب فایل درخواست پرداخت</translation> + </message> </context> <context> <name>OptionsDialog</name> @@ -534,6 +736,14 @@ <translation>&عمومی</translation> </message> <message> + <source>Automatically start %1 after logging in to the system.</source> + <translation>اجرای خودکار %1 بعد زمان ورود به سیستم.</translation> + </message> + <message> + <source>MB</source> + <translation>مگابایت</translation> + </message> + <message> <source>Accept connections from outside</source> <translation>پذیرش اتصالات از بیرون</translation> </message> @@ -673,6 +883,10 @@ <translation>تراز علیالحساب شما</translation> </message> <message> + <source>Pending:</source> + <translation>در انتظار:</translation> + </message> + <message> <source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source> <translation>مجموع تراکنشهایی که هنوز تأیید نشدهاند؛ و هنوز روی تراز علیالحساب اعمال نشدهاند</translation> </message> @@ -706,12 +920,11 @@ </message> </context> <context> + <name>PaymentServer</name> + </context> +<context> <name>PeerTableModel</name> - <message> - <source>Ping Time</source> - <translation>زمان پینگ</translation> - </message> -</context> + </context> <context> <name>QObject</name> <message> @@ -719,6 +932,10 @@ <translation>مبلغ</translation> </message> <message> + <source>Enter a Bitcoin address (e.g. %1)</source> + <translation>یک آدرس بیتکوین وارد کنید (مثلاً %1)</translation> + </message> + <message> <source>%1 d</source> <translation>%1 روز</translation> </message> @@ -746,7 +963,17 @@ <source>%1 ms</source> <translation>%1 میلیونم ثانیه</translation> </message> -</context> + <message> + <source>%1 and %2</source> + <translation>%1 و %2</translation> + </message> + </context> +<context> + <name>QObject::QObject</name> + </context> +<context> + <name>QRImageWidget</name> + </context> <context> <name>RPCConsole</name> <message> @@ -794,6 +1021,10 @@ <translation>تعداد فعلی بلوکها</translation> </message> <message> + <source>Memory Pool</source> + <translation>استخر حافظه</translation> + </message> + <message> <source>Memory usage</source> <translation>مصرف حافظه</translation> </message> @@ -814,6 +1045,14 @@ <translation>سرویس ها</translation> </message> <message> + <source>Connection Time</source> + <translation>مدت اتصال</translation> + </message> + <message> + <source>Last Send</source> + <translation>ارسال شده آخرین بار</translation> + </message> + <message> <source>Last Receive</source> <translation>آخرین دریافتی</translation> </message> @@ -909,6 +1148,14 @@ <translation>پیام:</translation> </message> <message> + <source>Use this form to request payments. All fields are <b>optional</b>.</source> + <translation>برای درخواست پرداخت از این فرم استفاده کنید.تمام قسمت ها <b>اختیاری<b> هستند.</translation> + </message> + <message> + <source>Clear all fields of the form.</source> + <translation>تمام قسمت های فرم را خالی کن.</translation> + </message> + <message> <source>Clear</source> <translation>پاککردن</translation> </message> @@ -917,9 +1164,21 @@ <translation>نمایش</translation> </message> <message> + <source>Remove the selected entries from the list</source> + <translation>حذف ورودی های انتخابشده از لیست</translation> + </message> + <message> <source>Remove</source> <translation>حذف کردن</translation> </message> + <message> + <source>Copy label</source> + <translation>کپی برچسب</translation> + </message> + <message> + <source>Copy amount</source> + <translation>کپی مقدار</translation> + </message> </context> <context> <name>ReceiveRequestDialog</name> @@ -935,7 +1194,26 @@ <source>&Save Image...</source> <translation>&ذخیره عکس...</translation> </message> -</context> + <message> + <source>Address</source> + <translation>آدرس</translation> + </message> + <message> + <source>Label</source> + <translation>برچسب</translation> + </message> + </context> +<context> + <name>RecentRequestsTableModel</name> + <message> + <source>Label</source> + <translation>برچسب</translation> + </message> + <message> + <source>(no label)</source> + <translation>(بدون برچسب)</translation> + </message> + </context> <context> <name>SendCoinsDialog</name> <message> @@ -943,6 +1221,14 @@ <translation>ارسال سکه</translation> </message> <message> + <source>Inputs...</source> + <translation>ورودیها...</translation> + </message> + <message> + <source>automatically selected</source> + <translation>به طور خودکار انتخاب شدند</translation> + </message> + <message> <source>Insufficient funds!</source> <translation>بود جه نا کافی </translation> </message> @@ -959,10 +1245,6 @@ <translation>مبلغ:</translation> </message> <message> - <source>Priority:</source> - <translation>اولویت:</translation> - </message> - <message> <source>Fee:</source> <translation>هزینه:</translation> </message> @@ -979,10 +1261,22 @@ <translation>هزینهٔ تراکنش:</translation> </message> <message> + <source>Choose...</source> + <translation>انتخاب...</translation> + </message> + <message> + <source>per kilobyte</source> + <translation>در هر کیلوبایت</translation> + </message> + <message> <source>Hide</source> <translation>پنهان کردن</translation> </message> <message> + <source>total at least</source> + <translation>در مجموع حداقل</translation> + </message> + <message> <source>Recommended:</source> <translation>توصیه شده:</translation> </message> @@ -991,10 +1285,6 @@ <translation>سفارشی:</translation> </message> <message> - <source>Confirmation time:</source> - <translation>روز تایید:</translation> - </message> - <message> <source>normal</source> <translation>نرمال</translation> </message> @@ -1011,6 +1301,10 @@ <translation>&دریافتکنندهٔ جدید</translation> </message> <message> + <source>Clear all fields of the form.</source> + <translation>تمام قسمت های فرم را خالی کن.</translation> + </message> + <message> <source>Clear &All</source> <translation>پاکسازی &همه</translation> </message> @@ -1026,6 +1320,18 @@ <source>S&end</source> <translation>&ارسال</translation> </message> + <message> + <source>Copy quantity</source> + <translation>کپی تعداد</translation> + </message> + <message> + <source>Copy amount</source> + <translation>کپی مقدار</translation> + </message> + <message> + <source>(no label)</source> + <translation>(بدون برچسب)</translation> + </message> </context> <context> <name>SendCoinsEntry</name> @@ -1081,7 +1387,10 @@ <source>Memo:</source> <translation>یادداشت:</translation> </message> -</context> + </context> +<context> + <name>SendConfirmationDialog</name> + </context> <context> <name>ShutdownWindow</name> <message> @@ -1167,7 +1476,7 @@ <source>Reset all verify message fields</source> <translation>بازنشانی تمام فیلدهای پیام</translation> </message> -</context> + </context> <context> <name>SplashScreen</name> <message> @@ -1183,16 +1492,62 @@ </message> </context> <context> + <name>TransactionDesc</name> + </context> +<context> <name>TransactionDescDialog</name> <message> <source>This pane shows a detailed description of the transaction</source> <translation>این پانل شامل توصیف کاملی از جزئیات تراکنش است</translation> </message> -</context> + </context> +<context> + <name>TransactionTableModel</name> + <message> + <source>Label</source> + <translation>برچسب</translation> + </message> + <message> + <source>(no label)</source> + <translation>(بدون برچسب)</translation> + </message> + </context> +<context> + <name>TransactionView</name> + <message> + <source>Copy label</source> + <translation>کپی برچسب</translation> + </message> + <message> + <source>Copy amount</source> + <translation>کپی مقدار</translation> + </message> + <message> + <source>Copy transaction ID</source> + <translation>کپی شناسهٔ تراکنش</translation> + </message> + <message> + <source>Label</source> + <translation>برچسب</translation> + </message> + <message> + <source>Address</source> + <translation>آدرس</translation> + </message> + </context> <context> <name>UnitDisplayStatusBarControl</name> </context> <context> + <name>WalletFrame</name> + </context> +<context> + <name>WalletModel</name> + </context> +<context> + <name>WalletView</name> + </context> +<context> <name>bitcoin-core</name> <message> <source>Options:</source> @@ -1219,10 +1574,6 @@ <translation>اجرا در پشت زمینه بهصورت یک سرویس و پذیرش دستورات</translation> </message> <message> - <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> - <translation>پذیرش اتصالات از بیرون (پیش فرض:1 بدون پراکسی یا اتصال)</translation> - </message> - <message> <source>Bitcoin Core</source> <translation> هسته Bitcoin </translation> </message> @@ -1235,18 +1586,10 @@ <translation>هنگامی که یک تراکنش در کیف پولی رخ می دهد، دستور را اجرا کن(%s در دستورات بوسیله ی TxID جایگزین می شود)</translation> </message> <message> - <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source> - <translation>این یک نسخه ی آزمایشی است - با مسئولیت خودتان از آن استفاده کنید - آن را در معدن و بازرگانی بکار نگیرید.</translation> - </message> - <message> <source>Block creation options:</source> <translation>بستن گزینه ایجاد</translation> </message> <message> - <source>Connect only to the specified node(s)</source> - <translation>تنها در گره (های) مشخص شده متصل شوید</translation> - </message> - <message> <source>Connection options:</source> <translation>گزینههای اتصال:</translation> </message> @@ -1335,10 +1678,6 @@ <translation>مقدار تراکنش بسیار کم است</translation> </message> <message> - <source>Transaction amounts must be positive</source> - <translation>مقادیر تراکنش باید مثبت باشد</translation> - </message> - <message> <source>Transaction too large</source> <translation>تراکنش بسیار بزرگ است</translation> </message> @@ -1371,6 +1710,10 @@ <translation>بار گیری آدرس ها</translation> </message> <message> + <source>(default: %s)</source> + <translation>(پیشفرض %s)</translation> + </message> + <message> <source>Invalid -proxy address: '%s'</source> <translation>آدرس پراکسی اشتباه %s</translation> </message> diff --git a/src/qt/locale/bitcoin_fa_IR.ts b/src/qt/locale/bitcoin_fa_IR.ts index 8faa3ce659..1e829aff9e 100644 --- a/src/qt/locale/bitcoin_fa_IR.ts +++ b/src/qt/locale/bitcoin_fa_IR.ts @@ -37,7 +37,10 @@ <source>&Delete</source> <translation>حذف</translation> </message> -</context> + </context> +<context> + <name>AddressTableModel</name> + </context> <context> <name>AskPassphraseDialog</name> <message> @@ -56,7 +59,7 @@ <source>Repeat new passphrase</source> <translation>رمز/پَس فرِیز را دوباره وارد کنید</translation> </message> -</context> + </context> <context> <name>BanTableModel</name> </context> @@ -190,7 +193,7 @@ <source>Wallet is <b>encrypted</b> and currently <b>locked</b></source> <translation>wallet رمزگذاری شد و در حال حاضر قفل است</translation> </message> -</context> + </context> <context> <name>CoinControlDialog</name> <message> @@ -224,7 +227,7 @@ <source>&Address</source> <translation>حساب&</translation> </message> -</context> + </context> <context> <name>FreespaceChecker</name> </context> @@ -247,6 +250,13 @@ </message> </context> <context> + <name>ModalOverlay</name> + <message> + <source>Form</source> + <translation>فرم</translation> + </message> + </context> +<context> <name>OpenURIDialog</name> </context> <context> @@ -288,6 +298,9 @@ </message> </context> <context> + <name>PaymentServer</name> + </context> +<context> <name>PeerTableModel</name> </context> <context> @@ -298,6 +311,12 @@ </message> </context> <context> + <name>QObject::QObject</name> + </context> +<context> + <name>QRImageWidget</name> + </context> +<context> <name>RPCConsole</name> <message> <source>Client version</source> @@ -343,6 +362,9 @@ </message> </context> <context> + <name>RecentRequestsTableModel</name> + </context> +<context> <name>SendCoinsDialog</name> <message> <source>Send Coins</source> @@ -372,7 +394,7 @@ <source>S&end</source> <translation>و ارسال</translation> </message> -</context> + </context> <context> <name>SendCoinsEntry</name> <message> @@ -411,7 +433,10 @@ <source>Memo:</source> <translation>یادداشت:</translation> </message> -</context> + </context> +<context> + <name>SendConfirmationDialog</name> + </context> <context> <name>ShutdownWindow</name> <message> @@ -453,16 +478,34 @@ <name>TrafficGraphWidget</name> </context> <context> + <name>TransactionDesc</name> + </context> +<context> <name>TransactionDescDialog</name> <message> <source>This pane shows a detailed description of the transaction</source> <translation>این بخش جزئیات تراکنش را نشان می دهد</translation> </message> -</context> + </context> +<context> + <name>TransactionTableModel</name> + </context> +<context> + <name>TransactionView</name> + </context> <context> <name>UnitDisplayStatusBarControl</name> </context> <context> + <name>WalletFrame</name> + </context> +<context> + <name>WalletModel</name> + </context> +<context> + <name>WalletView</name> + </context> +<context> <name>bitcoin-core</name> <message> <source>Options:</source> @@ -513,10 +556,6 @@ <translation>لود شدن آدرسها..</translation> </message> <message> - <source>Set minimum block size in bytes (default: %u)</source> - <translation>تنظیم کمینه اندازه بلاک بر حسب بایت (پیش فرض: %u)</translation> - </message> - <message> <source>Set the number of threads to service RPC calls (default: %d)</source> <translation>تنظیم تعداد ریسمان ها برای سرویس دهی فراخوانی های RPC (پیش فرض: %d)</translation> </message> diff --git a/src/qt/locale/bitcoin_fi.ts b/src/qt/locale/bitcoin_fi.ts index b7b3115e25..ef76abc098 100644 --- a/src/qt/locale/bitcoin_fi.ts +++ b/src/qt/locale/bitcoin_fi.ts @@ -41,7 +41,10 @@ <source>&Delete</source> <translation>&Poista</translation> </message> -</context> + </context> +<context> + <name>AddressTableModel</name> + </context> <context> <name>AskPassphraseDialog</name> <message> @@ -60,7 +63,7 @@ <source>Repeat new passphrase</source> <translation>Toista uusi tunnuslause</translation> </message> -</context> + </context> <context> <name>BanTableModel</name> <message> @@ -115,6 +118,10 @@ <translation>&Tietoja %1</translation> </message> <message> + <source>Show information about %1</source> + <translation>Näytä tietoa aiheesta %1</translation> + </message> + <message> <source>About &Qt</source> <translation>Tietoja &Qt</translation> </message> @@ -127,6 +134,10 @@ <translation>&Asetukset...</translation> </message> <message> + <source>Modify configuration options for %1</source> + <translation>Muuta kohteen %1 kokoonpanoasetuksia</translation> + </message> + <message> <source>&Encrypt Wallet...</source> <translation>&Salaa lompakko...</translation> </message> @@ -255,32 +266,16 @@ <translation><numerusform>%n aktiivinen yhteys Bitcoin-verkkoon</numerusform><numerusform>%n aktiivista yhteyttä Bitcoin-verkkoon</numerusform></translation> </message> <message> - <source>No block source available...</source> - <translation>Lohkojen lähdettä ei saatavilla...</translation> - </message> - <message numerus="yes"> - <source>Processed %n block(s) of transaction history.</source> - <translation><numerusform>Prosessoitu %n lohko rahansiirtohistoriasta.</numerusform><numerusform>Prosessoitu %n lohkoa rahansiirtohistoriasta.</numerusform></translation> - </message> - <message numerus="yes"> - <source>%n hour(s)</source> - <translation><numerusform>%n tunti</numerusform><numerusform>%n tuntia</numerusform></translation> - </message> - <message numerus="yes"> - <source>%n day(s)</source> - <translation><numerusform>%n päivä</numerusform><numerusform>%n päivää</numerusform></translation> - </message> - <message numerus="yes"> - <source>%n week(s)</source> - <translation><numerusform>%n viikko</numerusform><numerusform>%n viikkoa</numerusform></translation> + <source>Indexing blocks on disk...</source> + <translation>Ladataan lohkoindeksiä...</translation> </message> <message> - <source>%1 and %2</source> - <translation>%1 ja %2</translation> + <source>Processing blocks on disk...</source> + <translation>Käsitellään lohkoja levyllä...</translation> </message> <message numerus="yes"> - <source>%n year(s)</source> - <translation><numerusform>%n vuosi</numerusform><numerusform>%n vuotta</numerusform></translation> + <source>Processed %n block(s) of transaction history.</source> + <translation><numerusform>Prosessoitu %n lohko rahansiirtohistoriasta.</numerusform><numerusform>Prosessoitu %n lohkoa rahansiirtohistoriasta.</numerusform></translation> </message> <message> <source>%1 behind</source> @@ -311,6 +306,14 @@ <translation>Rahansiirtohistoria on ajan tasalla</translation> </message> <message> + <source>Show the %1 help message to get a list with possible Bitcoin command-line options</source> + <translation>Näytä %1 ohjeet saadaksesi listan mahdollisista Bitcoinin komentorivivalinnoista</translation> + </message> + <message> + <source>%1 client</source> + <translation>%1-asiakas</translation> + </message> + <message> <source>Catching up...</source> <translation>Saavutetaan verkkoa...</translation> </message> @@ -360,7 +363,7 @@ <source>Wallet is <b>encrypted</b> and currently <b>locked</b></source> <translation>Lompakko on <b>salattu</b> ja tällä hetkellä <b>lukittuna</b></translation> </message> -</context> + </context> <context> <name>CoinControlDialog</name> <message> @@ -380,10 +383,6 @@ <translation>Määrä:</translation> </message> <message> - <source>Priority:</source> - <translation>Prioriteetti:</translation> - </message> - <message> <source>Fee:</source> <translation>Palkkio:</translation> </message> @@ -435,11 +434,7 @@ <source>Confirmed</source> <translation>Vahvistettu</translation> </message> - <message> - <source>Priority</source> - <translation>Prioriteetti</translation> - </message> -</context> + </context> <context> <name>EditAddressDialog</name> <message> @@ -462,7 +457,7 @@ <source>&Address</source> <translation>&Osoite</translation> </message> -</context> + </context> <context> <name>FreespaceChecker</name> <message> @@ -497,6 +492,10 @@ <translation>(%1-bit)</translation> </message> <message> + <source>About %1</source> + <translation>Tietoja %1</translation> + </message> + <message> <source>Command-line options</source> <translation>Komentorivi parametrit</translation> </message> @@ -532,7 +531,11 @@ <source>Show splash screen on startup (default: %u)</source> <translation>Näytä aloitusruutu käynnistyksen yhteydessä (oletus: %u)</translation> </message> - </context> + <message> + <source>Reset all settings changed in the GUI</source> + <translation>Nollaa kaikki graafisen käyttöliittymän kautta tehdyt muutokset</translation> + </message> +</context> <context> <name>Intro</name> <message> @@ -540,6 +543,18 @@ <translation>Tervetuloa</translation> </message> <message> + <source>Welcome to %1.</source> + <translation>Tervetuloa %1 pariin.</translation> + </message> + <message> + <source>As this is the first time the program is launched, you can choose where %1 will store its data.</source> + <translation>Tämä on ensimmäinen kerta, kun %1 on käynnistetty, joten voit valita data-hakemiston paikan.</translation> + </message> + <message> + <source>%1 will download and store a copy of the Bitcoin block chain. At least %2GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source> + <translation>%1 lataa ja tallentaa kopion Bitcoinin lohkoketjusta. Vähintään %2Gt dataa tullaan tallentamaan tähän hakemistoon, ja tarve kasvaa ajan myötä. Lompakko tullaan myös tallentamaan tähän hakemistoon.</translation> + </message> + <message> <source>Use the default data directory</source> <translation>Käytä oletuskansiota</translation> </message> @@ -565,6 +580,21 @@ </message> </context> <context> + <name>ModalOverlay</name> + <message> + <source>Form</source> + <translation>Lomake</translation> + </message> + <message> + <source>Last block time</source> + <translation>Viimeisimmän lohkon aika</translation> + </message> + <message> + <source>Hide</source> + <translation>Piilota</translation> + </message> + </context> +<context> <name>OpenURIDialog</name> <message> <source>Open URI</source> @@ -582,7 +612,7 @@ <source>Select payment request file</source> <translation>Valitse maksupyynnön tiedosto</translation> </message> -</context> + </context> <context> <name>OptionsDialog</name> <message> @@ -594,6 +624,14 @@ <translation>&Yleiset</translation> </message> <message> + <source>Automatically start %1 after logging in to the system.</source> + <translation>Käynnistä %1 automaattisesti järjestelmään kirjautumisen jälkeen.</translation> + </message> + <message> + <source>&Start %1 on system login</source> + <translation>&Käynnistä %1 järjestelmään kirjautuessa</translation> + </message> + <message> <source>Size of &database cache</source> <translation>&Tietokannan välimuistin koko</translation> </message> @@ -750,6 +788,10 @@ <translation>&Käyttöliittymän kieli</translation> </message> <message> + <source>The user interface language can be set here. This setting will take effect after restarting %1.</source> + <translation>Tässä voit määritellä käyttöliittymän kielen. Muutokset astuvat voimaan seuraavan kerran, kun %1 käynnistetään.</translation> + </message> + <message> <source>&Unit to show amounts in:</source> <translation>Yksikkö jona bitcoin-määrät näytetään</translation> </message> @@ -874,6 +916,9 @@ </message> </context> <context> + <name>PaymentServer</name> + </context> +<context> <name>PeerTableModel</name> <message> <source>User Agent</source> @@ -883,11 +928,7 @@ <source>Node/Service</source> <translation>Noodi/Palvelu</translation> </message> - <message> - <source>Ping Time</source> - <translation>Vasteaika</translation> - </message> -</context> + </context> <context> <name>QObject</name> <message> @@ -926,7 +967,17 @@ <source>%1 ms</source> <translation>%1 ms</translation> </message> -</context> + <message> + <source>%1 and %2</source> + <translation>%1 ja %2</translation> + </message> + </context> +<context> + <name>QObject::QObject</name> + </context> +<context> + <name>QRImageWidget</name> + </context> <context> <name>RPCConsole</name> <message> @@ -954,6 +1005,10 @@ <translation>Käyttää BerkeleyDB-versiota</translation> </message> <message> + <source>Datadir</source> + <translation>Data-hakemisto</translation> + </message> + <message> <source>Startup time</source> <translation>Käynnistysaika</translation> </message> @@ -1038,6 +1093,18 @@ <translation>Käyttöliittymä</translation> </message> <message> + <source>Open the %1 debug log file from the current data directory. This can take a few seconds for large log files.</source> + <translation>Avaa %1 -debug-loki tämänhetkisestä data-hakemistosta. Tämä voi viedä muutaman sekunnin suurille lokitiedostoille.</translation> + </message> + <message> + <source>Decrease font size</source> + <translation>Pienennä fontin kokoa</translation> + </message> + <message> + <source>Increase font size</source> + <translation>Suurenna fontin kokoa</translation> + </message> + <message> <source>Services</source> <translation>Palvelut</translation> </message> @@ -1114,14 +1181,6 @@ <translation>Tyhjennä konsoli</translation> </message> <message> - <source>&Disconnect Node</source> - <translation>&Katkaise yhteys solmukohtaan</translation> - </message> - <message> - <source>Ban Node for</source> - <translation>Estä solmukohta</translation> - </message> - <message> <source>1 &hour</source> <translation>1 &tunti</translation> </message> @@ -1138,10 +1197,6 @@ <translation>1 &vuosi</translation> </message> <message> - <source>&Unban Node</source> - <translation>&Poista solmukohdan esto</translation> - </message> - <message> <source>Use up and down arrows to navigate history, and <b>Ctrl-L</b> to clear screen.</source> <translation>Ylös- ja alas-nuolet selaavat historiaa ja <b>Ctrl-L</b> tyhjentää ruudun.</translation> </message> @@ -1268,7 +1323,7 @@ <source>Remove</source> <translation>Poista</translation> </message> -</context> + </context> <context> <name>ReceiveRequestDialog</name> <message> @@ -1287,7 +1342,14 @@ <source>&Save Image...</source> <translation>&Tallenna kuva</translation> </message> -</context> + </context> +<context> + <name>RecentRequestsTableModel</name> + <message> + <source>Date</source> + <translation>Aika</translation> + </message> + </context> <context> <name>SendCoinsDialog</name> <message> @@ -1323,10 +1385,6 @@ <translation>Määrä:</translation> </message> <message> - <source>Priority:</source> - <translation>Prioriteetti:</translation> - </message> - <message> <source>Fee:</source> <translation>Palkkio:</translation> </message> @@ -1387,10 +1445,6 @@ <translation>(Älykästä rahansiirtokulua ei ole vielä alustettu. Tähän kuluu yleensä aikaa muutaman lohkon verran...)</translation> </message> <message> - <source>Confirmation time:</source> - <translation>Vahvistusaika:</translation> - </message> - <message> <source>normal</source> <translation>normaali</translation> </message> @@ -1430,7 +1484,7 @@ <source>S&end</source> <translation>&Lähetä</translation> </message> -</context> + </context> <context> <name>SendCoinsEntry</name> <message> @@ -1474,6 +1528,10 @@ <translation>Poista tämä alkio</translation> </message> <message> + <source>The fee will be deducted from the amount being sent. The recipient will receive less bitcoins than you enter in the amount field. If multiple recipients are selected, the fee is split equally.</source> + <translation>Kulu vähennetään lähetettävästä määrästä. Saaja vastaanottaa vähemmän bitcoineja kuin merkitset Määrä-kenttään. Jos saajia on monia, kulu jaetaan tasan.</translation> + </message> + <message> <source>S&ubtract fee from amount</source> <translation>V&ähennä maksukulu määrästä</translation> </message> @@ -1505,10 +1563,17 @@ <source>Memo:</source> <translation>Muistio:</translation> </message> -</context> + </context> +<context> + <name>SendConfirmationDialog</name> + </context> <context> <name>ShutdownWindow</name> <message> + <source>%1 is shutting down...</source> + <translation>%1 sulkeutuu...</translation> + </message> + <message> <source>Do not shut down the computer until this window disappears.</source> <translation>Älä sammuta tietokonetta ennenkuin tämä ikkuna katoaa.</translation> </message> @@ -1591,7 +1656,7 @@ <source>Reset all verify message fields</source> <translation>Tyhjennä kaikki varmista-viesti-kentät</translation> </message> -</context> + </context> <context> <name>SplashScreen</name> <message> @@ -1607,12 +1672,33 @@ </message> </context> <context> + <name>TransactionDesc</name> + <message> + <source>Date</source> + <translation>Aika</translation> + </message> + </context> +<context> <name>TransactionDescDialog</name> <message> <source>This pane shows a detailed description of the transaction</source> <translation>Tämä ruutu näyttää yksityiskohtaisen tiedon rahansiirrosta</translation> </message> -</context> + </context> +<context> + <name>TransactionTableModel</name> + <message> + <source>Date</source> + <translation>Aika</translation> + </message> + </context> +<context> + <name>TransactionView</name> + <message> + <source>Date</source> + <translation>Aika</translation> + </message> + </context> <context> <name>UnitDisplayStatusBarControl</name> <message> @@ -1621,6 +1707,19 @@ </message> </context> <context> + <name>WalletFrame</name> + </context> +<context> + <name>WalletModel</name> + </context> +<context> + <name>WalletView</name> + <message> + <source>&Export</source> + <translation>&Vie</translation> + </message> + </context> +<context> <name>bitcoin-core</name> <message> <source>Options:</source> @@ -1655,10 +1754,6 @@ <translation>Karsinta: viime lompakon synkronisointi menee karsitun datan taakse. Sinun tarvitsee ajaa -reindex (lataa koko lohkoketju uudelleen tapauksessa jossa karsiva noodi)</translation> </message> <message> - <source>Reduce storage requirements by pruning (deleting) old blocks. This mode is incompatible with -txindex and -rescan. Warning: Reverting this setting requires re-downloading the entire blockchain. (default: 0 = disable pruning blocks, >%u = target size in MiB to use for block files)</source> - <translation>Vähennä levytilan tarvetta karsimalla (poistamalla) vanhoja lohkoja. Tämä tila ei ole yhteensopiva -txindex ja -rescan -parametrien kanssa. Varoitus: Tämän asetuksen peruutus vaatii koko lohkoketjun uudelleenlataamisen. (oletus: 0 = poista karsinta käytöstä, >%u = kohdekoko muodossa MiB jota käytetään lohkotiedostoille) </translation> - </message> - <message> <source>Rescans are not possible in pruned mode. You will need to use -reindex which will download the whole blockchain again.</source> <translation>Uudelleenskannaukset eivät ole mahdollisia karsivassa tilassa. Sinun täytyy käyttää -reindex joka lataa koko lohkoketjun uudelleen.</translation> </message> @@ -1683,48 +1778,52 @@ <translation>HTTP-palvelinta ei voitu käynnistää. Katso debug-lokista lisätietoja.</translation> </message> <message> - <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> - <translation>Hyväksy yhteyksiä ulkopuolelta (vakioasetus: 1 jos -proxy tai -connect ei määritelty)</translation> - </message> - <message> <source>Bitcoin Core</source> <translation>Bitcoin-ydin</translation> </message> <message> - <source>-fallbackfee is set very high! This is the transaction fee you may pay when fee estimates are not available.</source> - <translation>-fallbackfee on asetettu erittäin suureksi! Tämä on rahansiirtokulu jonka voit maksaa kun arvioitu rahansirtokulu ei ole saatavilla.</translation> + <source>The %s developers</source> + <translation>%s kehittäjät</translation> </message> <message> <source>Bind to given address and always listen on it. Use [host]:port notation for IPv6</source> <translation>Kytkeydy annettuun osoitteeseen ja pidä linja aina auki. Käytä [host]:portin merkintätapaa IPv6:lle.</translation> </message> <message> + <source>Cannot obtain a lock on data directory %s. %s is probably already running.</source> + <translation>Ei voida lukita data-hakemistoa %s. %s on luultavasti jo käynnissä.</translation> + </message> + <message> <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source> <translation>Suorita käsky kun lompakossa rahansiirto muuttuu (%s cmd on vaihdettu TxID kanssa)</translation> </message> <message> + <source>Please check that your computer's date and time are correct! If your clock is wrong, %s will not work properly.</source> + <translation>Tarkistathan että tietokoneesi päivämäärä ja kellonaika ovat oikeassa! Jos kellosi on väärässä, %s ei toimi oikein.</translation> + </message> + <message> + <source>Please contribute if you find %s useful. Visit %s for further information about the software.</source> + <translation>Ole hyvä ja avusta, jos %s on mielestäsi hyödyllinen. Vieraile %s saadaksesi lisää tietoa ohjelmistosta.</translation> + </message> + <message> <source>Set the number of script verification threads (%u to %d, 0 = auto, <0 = leave that many cores free, default: %d)</source> <translation>Aseta script varmistuksen threadien lukumäärä (%u - %d, 0= auto, <0 = jätä näin monta ydintä vapaaksi, oletus: %d)</translation> </message> <message> - <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source> - <translation>Tämä on esi-julkaistu testiversio - Käytä omalla riskillä - Ei saa käytää louhimiseen tai kauppasovelluksiin.</translation> + <source>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</source> + <translation>Lohkotietokanta sisältää lohkon, joka vaikuttaa olevan tulevaisuudesta. Tämä saattaa johtua tietokoneesi virheellisesti asetetuista aika-asetuksista. Rakenna lohkotietokanta uudelleen vain jos olet varma, että tietokoneesi päivämäärä ja aika ovat oikein.</translation> </message> <message> <source>Use UPnP to map the listening port (default: 1 when listening and no -proxy)</source> <translation>Käytä UPnP:ta kuuntelevan portin kartoitukseen (oletus: 1 kun kuunnellaan ja -proxy ei käytössä)</translation> </message> <message> - <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source> - <translation>Varoitus: Tietoverkko ei ole sovussa! Luohijat näyttävät kokevan virhetilanteita.</translation> - </message> - <message> - <source>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</source> - <translation>Varoitus: Olemme vertaisverkon kanssa ristiriidassa! Sinun tulee päivittää tai toisten solmujen tulee päivitää.</translation> + <source>You need to rebuild the database using -reindex-chainstate to change -txindex</source> + <translation>Sinun tulee uudelleenrakentaa tietokanta käyttäen -reindex-chainstate vaihtaaksesi -txindex</translation> </message> <message> - <source>Whitelist peers connecting from the given netmask or IP address. Can be specified multiple times.</source> - <translation>Salli vertaisten yhdistää annetusta verkkomaskista tai IP-osoitteesta. Voidaan määrittää useampia kertoja.</translation> + <source>%s corrupt, salvage failed</source> + <translation>%s korruptoitunut, korjaaminen epäonnistui</translation> </message> <message> <source>-maxmempool must be at least %d MB</source> @@ -1735,18 +1834,26 @@ <translation><category> voi olla:</translation> </message> <message> + <source>Attempt to recover private keys from a corrupt wallet on startup</source> + <translation>Yritä palauttaa yksityiset avaimet korruptoituneesta lompakosta käynnistyksen yhteydessä</translation> + </message> + <message> <source>Block creation options:</source> <translation>Lohkon luonnin asetukset:</translation> </message> <message> - <source>Connect only to the specified node(s)</source> - <translation>Yhidstä ainoastaan määrättyihin noodeihin</translation> + <source>Cannot resolve -%s address: '%s'</source> + <translation>-%s -osoitteen '%s' selvittäminen epäonnistui</translation> </message> <message> <source>Connection options:</source> <translation>Yhteyden valinnat:</translation> </message> <message> + <source>Copyright (C) %i-%i</source> + <translation>Tekijänoikeus (C) %i-%i</translation> + </message> + <message> <source>Corrupted block database detected</source> <translation>Vioittunut lohkotietokanta havaittu</translation> </message> @@ -1775,6 +1882,18 @@ <translation>Virhe alustaessa lompakon tietokantaympäristöä %s!</translation> </message> <message> + <source>Error loading %s</source> + <translation>Virhe ladattaessa %s</translation> + </message> + <message> + <source>Error loading %s: Wallet corrupted</source> + <translation>Virhe ladattaessa %s: Lompakko vioittunut</translation> + </message> + <message> + <source>Error loading %s: Wallet requires newer version of %s</source> + <translation>Virhe ladattaessa %s: Tarvitset uudemman %s -version</translation> + </message> + <message> <source>Error loading block database</source> <translation>Virhe avattaessa lohkoketjua</translation> </message> @@ -1803,6 +1922,22 @@ <translation>Virheellinen -onion osoite: '%s'</translation> </message> <message> + <source>Invalid amount for -%s=<amount>: '%s'</source> + <translation>Virheellinen määrä -%s=<amount>: '%s'</translation> + </message> + <message> + <source>Invalid amount for -fallbackfee=<amount>: '%s'</source> + <translation>Virheellinen määrä -fallbackfee=<amount>: '%s'</translation> + </message> + <message> + <source>Loading banlist...</source> + <translation>Ladataan kieltolistaa...</translation> + </message> + <message> + <source>Location of the auth cookie (default: data dir)</source> + <translation>Todennusevästeen sijainti (oletus: datahakemisto)</translation> + </message> + <message> <source>Not enough file descriptors available.</source> <translation>Ei tarpeeksi tiedostomerkintöjä vapaana.</translation> </message> @@ -1811,6 +1946,14 @@ <translation>Yhdistä vain solmukohtiin <net>-verkossa (ipv4, ipv6 tai onion)</translation> </message> <message> + <source>Print this help message and exit</source> + <translation>Näytä tämä ohjeviesti ja poistu</translation> + </message> + <message> + <source>Print version and exit</source> + <translation>Näytä versio ja poistu.</translation> + </message> + <message> <source>Prune mode is incompatible with -txindex.</source> <translation>Karsittu tila ei ole yhteensopiva -txindex:n kanssa.</translation> </message> @@ -1827,6 +1970,22 @@ <translation>Aseta lompakkotiedosto (data-hakemiston sisällä)</translation> </message> <message> + <source>The source code is available from %s.</source> + <translation>Lähdekoodi löytyy %s.</translation> + </message> + <message> + <source>Unsupported argument -benchmark ignored, use -debug=bench.</source> + <translation>Argumenttia -benchmark ei tueta, käytä -debug=bench.</translation> + </message> + <message> + <source>Unsupported argument -debugnet ignored, use -debug=net.</source> + <translation>Argumenttia -debugnet ei tueta, käytä -debug=net.</translation> + </message> + <message> + <source>Unsupported argument -tor found, use -onion.</source> + <translation>Argumenttia -tor ei tueta, käytä -onion.</translation> + </message> + <message> <source>Use UPnP to map the listening port (default: %u)</source> <translation>Käytä UPnP:ta kuuntelevan portin kartoittamiseen (oletus: %u)</translation> </message> @@ -1843,6 +2002,10 @@ <translation>Lompakko %s sijaitsee data-hakemiston ulkopuolella %s</translation> </message> <message> + <source>Wallet needed to be rewritten: restart %s to complete</source> + <translation>Lompakko tarvitsee uudelleenkirjoittaa: käynnistä %s uudelleen</translation> + </message> + <message> <source>Wallet options:</source> <translation>Lompakon valinnat:</translation> </message> @@ -1855,6 +2018,10 @@ <translation>Paljasta omat IP-osoitteet (oletus: 1 kun kuunnellaan ja -externalip tai -proxy ei ole käytössä)</translation> </message> <message> + <source>Error: Listening for incoming connections failed (listen returned error %s)</source> + <translation>Virhe: Saapuvien yhteyksien kuuntelu epäonnistui (kuuntelu palautti virheen %s)</translation> + </message> + <message> <source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source> <translation>Aja komento kun olennainen hälytys vastaanotetaan tai nähdään todella pitkä haara (%s komennossa korvataan viestillä)</translation> </message> @@ -1863,6 +2030,10 @@ <translation>Aseta maksimikoko korkea prioriteetti/pieni palkkio rahansiirtoihin tavuissa (oletus: %d)</translation> </message> <message> + <source>The transaction amount is too small to send after the fee has been deducted</source> + <translation>Siirtomäärä on liian pieni lähetettäväksi kulun vähentämisen jälkeen.</translation> + </message> + <message> <source>(default: %u)</source> <translation>(oletus: %u)</translation> </message> @@ -1871,6 +2042,10 @@ <translation>Hyväksy julkisia REST-pyyntöjä (oletus: %u)</translation> </message> <message> + <source>Automatically create Tor hidden service (default: %d)</source> + <translation>Luo Tor-salattu palvelu automaattisesti (oletus: %d)</translation> + </message> + <message> <source>Connect through SOCKS5 proxy</source> <translation>Yhdistä SOCKS5 proxin kautta</translation> </message> @@ -1879,14 +2054,30 @@ <translation>Virheitä tietokantaa luettaessa, ohjelma pysäytetään.</translation> </message> <message> + <source>Imports blocks from external blk000??.dat file on startup</source> + <translation>Tuo lohkot ulkoisesta blk000??.dat -tiedostosta käynnistettäessä</translation> + </message> + <message> <source>Information</source> <translation>Tietoa</translation> </message> <message> + <source>Invalid amount for -paytxfee=<amount>: '%s' (must be at least %s)</source> + <translation>Kelvoton määrä argumentille -paytxfee=<amount>: '%s' (pitää olla vähintään %s)</translation> + </message> + <message> + <source>Invalid netmask specified in -whitelist: '%s'</source> + <translation>Kelvoton verkkopeite määritelty argumentissa -whitelist: '%s'</translation> + </message> + <message> <source>Keep at most <n> unconnectable transactions in memory (default: %u)</source> <translation>Pidä enimmillään <n> yhdistämiskelvotonta rahansiirtoa muistissa (oletus: %u)</translation> </message> <message> + <source>Need to specify a port with -whitebind: '%s'</source> + <translation>Pitää määritellä portti argumentilla -whitebind: '%s'</translation> + </message> + <message> <source>Node relay options:</source> <translation>Välityssolmukohdan asetukset:</translation> </message> @@ -1935,10 +2126,6 @@ <translation>Siirtosumma liian pieni</translation> </message> <message> - <source>Transaction amounts must be positive</source> - <translation>Siirtosumman tulee olla positiivinen</translation> - </message> - <message> <source>Transaction too large for fee policy</source> <translation>Rahansiirto on liian suuri maksukulukäytännölle</translation> </message> @@ -1991,10 +2178,6 @@ <translation>-maxtxfee on asetettu erittäin suureksi! Tämänkokoisia kuluja saatetaan maksaa yhdessä rahansiirrossa.</translation> </message> <message> - <source>-paytxfee is set very high! This is the transaction fee you will pay if you send a transaction.</source> - <translation>-paytxfee on asetettu erittäin suureksi! Tämä on rahansiirtokulu, jonka maksat, mikäli lähetät rahansiirron.</translation> - </message> - <message> <source>Do not keep transactions in the mempool longer than <n> hours (default: %u)</source> <translation>Älä pidä rahansiirtoja muistivarannoissa kauemmin kuin <n> tuntia (oletus: %u)</translation> </message> @@ -2003,6 +2186,10 @@ <translation>Kuinka läpikäyvä lohkojen -checkblocks -todennus on (0-4, oletus: %u)</translation> </message> <message> + <source>Output debugging information (default: %u, supplying <category> is optional)</source> + <translation>Tulosta debuggaustieto (oletus: %u, annettu <category> valinnainen)</translation> + </message> + <message> <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: %s)</source> <translation>Käytä erillistä SOCKS5-proxyä tavoittaaksesi vertaisia Tor-piilopalveluiden kautta (oletus: %s)</translation> </message> @@ -2067,8 +2254,8 @@ <translation>Aseta avainaltaan kooksi <n> (oletus: %u)</translation> </message> <message> - <source>Set minimum block size in bytes (default: %u)</source> - <translation>Aseta pienin mahdollinen lohkokoko tavuina (oletus: %u)</translation> + <source>Set maximum BIP141 block weight (default: %d)</source> + <translation>Aseta suurin BIP141-lohkopaino (oletus: %d)</translation> </message> <message> <source>Set the number of threads to service RPC calls (default: %d)</source> diff --git a/src/qt/locale/bitcoin_fr.ts b/src/qt/locale/bitcoin_fr.ts index 0b538d7664..2180023159 100644 --- a/src/qt/locale/bitcoin_fr.ts +++ b/src/qt/locale/bitcoin_fr.ts @@ -41,6 +41,77 @@ <source>&Delete</source> <translation>&Supprimer</translation> </message> + <message> + <source>Choose the address to send coins to</source> + <translation>Choisir l'adresse à laquelle envoyer des pièces</translation> + </message> + <message> + <source>Choose the address to receive coins with</source> + <translation>Choisir l'adresse avec laquelle recevoir des pîèces</translation> + </message> + <message> + <source>C&hoose</source> + <translation>C&hoisir</translation> + </message> + <message> + <source>Sending addresses</source> + <translation>Adresses d'envoi</translation> + </message> + <message> + <source>Receiving addresses</source> + <translation>Adresses de réception</translation> + </message> + <message> + <source>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source> + <translation>Voici vos adresses Bitcoin pour envoyer des paiements. Vérifiez toujours le montant et l'adresse du destinataire avant d'envoyer des pièces.</translation> + </message> + <message> + <source>These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction.</source> + <translation>Voici vos adresses Bitcoin pour recevoir des paiements. Il est recommandé d'utiliser une nouvelle adresse de réception pour chaque transaction.</translation> + </message> + <message> + <source>&Copy Address</source> + <translation>&Copier l'adresse</translation> + </message> + <message> + <source>Copy &Label</source> + <translation>Copier l'é&tiquette</translation> + </message> + <message> + <source>&Edit</source> + <translation>&Modifier</translation> + </message> + <message> + <source>Export Address List</source> + <translation>Exporter la liste d'adresses</translation> + </message> + <message> + <source>Comma separated file (*.csv)</source> + <translation>Valeurs séparées par des virgules (*.csv)</translation> + </message> + <message> + <source>Exporting Failed</source> + <translation>Échec d'exportation</translation> + </message> + <message> + <source>There was an error trying to save the address list to %1. Please try again.</source> + <translation>Une erreur est survenue lors de l'enregistrement de la liste d'adresses vers %1. Veuillez ressayer plus tard.</translation> + </message> +</context> +<context> + <name>AddressTableModel</name> + <message> + <source>Label</source> + <translation>Étiquette</translation> + </message> + <message> + <source>Address</source> + <translation>Adresse</translation> + </message> + <message> + <source>(no label)</source> + <translation>(aucune étiquette)</translation> + </message> </context> <context> <name>AskPassphraseDialog</name> @@ -60,6 +131,94 @@ <source>Repeat new passphrase</source> <translation>Répéter la phrase de passe</translation> </message> + <message> + <source>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>.</source> + <translation>Saisissez la nouvelle phrase de passe du porte-monnaie.<br/>Veuillez utiliser une phrase de passe composée de <b>dix caractères aléatoires ou plus</b>, ou de <b>huit mots ou plus</b>.</translation> + </message> + <message> + <source>Encrypt wallet</source> + <translation>Chiffrer le porte-monnaie</translation> + </message> + <message> + <source>This operation needs your wallet passphrase to unlock the wallet.</source> + <translation>Cette opération nécessite votre phrase de passe pour déverrouiller le porte-monnaie.</translation> + </message> + <message> + <source>Unlock wallet</source> + <translation>Déverrouiller le porte-monnaie</translation> + </message> + <message> + <source>This operation needs your wallet passphrase to decrypt the wallet.</source> + <translation>Cette opération nécessite votre phrase de passe pour déchiffrer le porte-monnaie.</translation> + </message> + <message> + <source>Decrypt wallet</source> + <translation>Déchiffrer le porte-monnaie</translation> + </message> + <message> + <source>Change passphrase</source> + <translation>Changer la phrase de passe</translation> + </message> + <message> + <source>Enter the old passphrase and new passphrase to the wallet.</source> + <translation>Saisir l'ancienne puis la nouvelle phrase de passe du porte-monnaie.</translation> + </message> + <message> + <source>Confirm wallet encryption</source> + <translation>Confirmer le chiffrement du porte-monnaie</translation> + </message> + <message> + <source>Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR BITCOINS</b>!</source> + <translation>Avertissement : si vous chiffrez votre porte-monnaie et perdez votre phrase de passe, vous <b>PERDREZ TOUS VOS BITCOINS</b> !</translation> + </message> + <message> + <source>Are you sure you wish to encrypt your wallet?</source> + <translation>Voulez-vous vraiment chiffrer votre porte-monnaie ?</translation> + </message> + <message> + <source>Wallet encrypted</source> + <translation>Le porte-monnaie est chiffré</translation> + </message> + <message> + <source>%1 will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your bitcoins from being stolen by malware infecting your computer.</source> + <translation>%1 va maintenant se fermer pour terminer le processus de chiffrement. Souvenez-vous que le chiffrement de votre porte-monnaie ne peut pas protéger entièrement vos bitcoins contre le vol par des logiciels malveillants qui infecteraient votre ordinateur.</translation> + </message> + <message> + <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source> + <translation>IMPORTANT : toutes les sauvegardes précédentes du fichier de votre porte-monnaie devraient être remplacées par le fichier du porte-monnaie chiffré nouvellement généré. Pour des raisons de sécurité, les sauvegardes précédentes de votre fichier de porte-monnaie non chiffré deviendront inutilisables dès que vous commencerez à utiliser le nouveau porte-monnaie chiffré.</translation> + </message> + <message> + <source>Wallet encryption failed</source> + <translation>Échec de chiffrement du porte-monnaie</translation> + </message> + <message> + <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source> + <translation>Le chiffrement du porte-monnaie a échoué en raison d'une erreur interne. Votre porte-monnaie n'a pas été chiffré.</translation> + </message> + <message> + <source>The supplied passphrases do not match.</source> + <translation>Les phrases de passe saisies ne correspondent pas.</translation> + </message> + <message> + <source>Wallet unlock failed</source> + <translation>Échec de déverrouillage du porte-monnaie</translation> + </message> + <message> + <source>The passphrase entered for the wallet decryption was incorrect.</source> + <translation>La phrase de passe saisie pour déchiffrer le porte-monnaie était erronée.</translation> + </message> + <message> + <source>Wallet decryption failed</source> + <translation>Échec de déchiffrement du porte-monnaie</translation> + </message> + <message> + <source>Wallet passphrase was successfully changed.</source> + <translation>La phrase de passe du porte-monnaie a été modifiée avec succès.</translation> + </message> + <message> + <source>Warning: The Caps Lock key is on!</source> + <translation>Avertissement : la touche Verr. Maj. est activée !</translation> + </message> </context> <context> <name>BanTableModel</name> @@ -76,11 +235,11 @@ <name>BitcoinGUI</name> <message> <source>Sign &message...</source> - <translation>&Signer le message...</translation> + <translation>Signer un &message...</translation> </message> <message> <source>Synchronizing with network...</source> - <translation>Synchronisation avec le réseau en cours…</translation> + <translation>Synchronisation avec le réseau…</translation> </message> <message> <source>&Overview</source> @@ -100,7 +259,7 @@ </message> <message> <source>Browse transaction history</source> - <translation>Parcourir l'historique des transactions</translation> + <translation>Parcourir l'historique transactionnel</translation> </message> <message> <source>E&xit</source> @@ -156,7 +315,23 @@ </message> <message> <source>Open &URI...</source> - <translation>Ouvrir un &URI...</translation> + <translation>Ouvrir une &URI...</translation> + </message> + <message> + <source>Click to disable network activity.</source> + <translation>Cliquer pour désactiver l'activité réseau.</translation> + </message> + <message> + <source>Network activity disabled.</source> + <translation>L'activité réseau est désactivée.</translation> + </message> + <message> + <source>Click to enable network activity again.</source> + <translation>Cliquer pour réactiver l'activité réseau.</translation> + </message> + <message> + <source>Syncing Headers (%1%)...</source> + <translation>Synchronisation des en-têtes (%1)...</translation> </message> <message> <source>Reindexing blocks on disk...</source> @@ -204,15 +379,15 @@ </message> <message> <source>&Show / Hide</source> - <translation>&Afficher / Cacher</translation> + <translation>&Afficher / cacher</translation> </message> <message> <source>Show or hide the main Window</source> - <translation>Afficher ou masquer la fenêtre principale</translation> + <translation>Afficher ou cacher la fenêtre principale</translation> </message> <message> <source>Encrypt the private keys that belong to your wallet</source> - <translation>Chiffrer les clefs privées de votre porte-monnaie</translation> + <translation>Chiffrer les clés privées qui appartiennent à votre porte-monnaie</translation> </message> <message> <source>Sign messages with your Bitcoin addresses to prove you own them</source> @@ -220,7 +395,7 @@ </message> <message> <source>Verify messages to ensure they were signed with specified Bitcoin addresses</source> - <translation>Vérifier les messages pour vous assurer qu'ils ont été signés avec les adresses Bitcoin spécifiées</translation> + <translation>Vérifier les messages pour s'assurer qu'ils ont été signés avec les adresses Bitcoin spécifiées</translation> </message> <message> <source>&File</source> @@ -228,7 +403,7 @@ </message> <message> <source>&Settings</source> - <translation>&Réglages</translation> + <translation>&Paramètres</translation> </message> <message> <source>&Help</source> @@ -240,7 +415,7 @@ </message> <message> <source>Request payments (generates QR codes and bitcoin: URIs)</source> - <translation>Demander des paiements (génère des codes QR et des URIs bitcoin:)</translation> + <translation>Demander des paiements (génère des codes QR et des URI bitcoin:)</translation> </message> <message> <source>Show the list of used sending addresses and labels</source> @@ -252,7 +427,7 @@ </message> <message> <source>Open a bitcoin: URI or payment request</source> - <translation>Ouvrir un URI bitcoin: ou une demande de paiement</translation> + <translation>Ouvrir une URI bitcoin: ou une demande de paiement</translation> </message> <message> <source>&Command-line options</source> @@ -270,37 +445,13 @@ <source>Processing blocks on disk...</source> <translation>Traitement des blocs sur le disque...</translation> </message> - <message> - <source>No block source available...</source> - <translation>Aucune source de blocs disponible...</translation> - </message> <message numerus="yes"> <source>Processed %n block(s) of transaction history.</source> <translation><numerusform>%n bloc d'historique transactionnel a été traité</numerusform><numerusform>%n blocs d'historique transactionnel ont été traités</numerusform></translation> </message> - <message numerus="yes"> - <source>%n hour(s)</source> - <translation><numerusform>%n heure</numerusform><numerusform>%n heures</numerusform></translation> - </message> - <message numerus="yes"> - <source>%n day(s)</source> - <translation><numerusform>%n jour</numerusform><numerusform>%n jours</numerusform></translation> - </message> - <message numerus="yes"> - <source>%n week(s)</source> - <translation><numerusform>%n semaine</numerusform><numerusform>%n semaines</numerusform></translation> - </message> - <message> - <source>%1 and %2</source> - <translation>%1 et %2</translation> - </message> - <message numerus="yes"> - <source>%n year(s)</source> - <translation><numerusform>%n an</numerusform><numerusform>%n ans</numerusform></translation> - </message> <message> <source>%1 behind</source> - <translation>%1 en retard</translation> + <translation>en retard de %1</translation> </message> <message> <source>Last received block was generated %1 ago.</source> @@ -308,7 +459,7 @@ </message> <message> <source>Transactions after this will not yet be visible.</source> - <translation>Les transactions après ceci ne sont pas encore visibles.</translation> + <translation>Les transactions suivantes ne seront pas déjà visibles.</translation> </message> <message> <source>Error</source> @@ -335,8 +486,12 @@ <translation>Client %1</translation> </message> <message> + <source>Connecting to peers...</source> + <translation>Connexion aux pairs...</translation> + </message> + <message> <source>Catching up...</source> - <translation>Rattrapage en cours…</translation> + <translation>Rattrapage…</translation> </message> <message> <source>Date: %1 @@ -377,6 +532,14 @@ <translation>Transaction entrante</translation> </message> <message> + <source>HD key generation is <b>enabled</b></source> + <translation>La génération de clé HD est <b>activée</b></translation> + </message> + <message> + <source>HD key generation is <b>disabled</b></source> + <translation>La génération de clé HD est <b>désactivée</b></translation> + </message> + <message> <source>Wallet is <b>encrypted</b> and currently <b>unlocked</b></source> <translation>Le porte-monnaie est <b>chiffré</b> et est actuellement <b>déverrouillé</b></translation> </message> @@ -384,6 +547,10 @@ <source>Wallet is <b>encrypted</b> and currently <b>locked</b></source> <translation>Le porte-monnaie est <b>chiffré</b> et actuellement <b>verrouillé</b></translation> </message> + <message> + <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> + <translation>Une erreur fatale est survenue. Bitcoin ne peut plus continuer en toute sécurité et va s'arrêter.</translation> + </message> </context> <context> <name>CoinControlDialog</name> @@ -404,10 +571,6 @@ <translation>Montant :</translation> </message> <message> - <source>Priority:</source> - <translation>Priorité :</translation> - </message> - <message> <source>Fee:</source> <translation>Frais :</translation> </message> @@ -425,7 +588,7 @@ </message> <message> <source>(un)select all</source> - <translation>Tout (dé)sélectionner</translation> + <translation>Tout (des)sélectionner</translation> </message> <message> <source>Tree mode</source> @@ -460,8 +623,84 @@ <translation>Confirmée</translation> </message> <message> - <source>Priority</source> - <translation>Priorité</translation> + <source>Copy address</source> + <translation>Copier l’adresse</translation> + </message> + <message> + <source>Copy label</source> + <translation>Copier l’étiquette</translation> + </message> + <message> + <source>Copy amount</source> + <translation>Copier le montant</translation> + </message> + <message> + <source>Copy transaction ID</source> + <translation>Copier l'ID de la transaction</translation> + </message> + <message> + <source>Lock unspent</source> + <translation>Verrouiller les transactions non dépensées</translation> + </message> + <message> + <source>Unlock unspent</source> + <translation>Déverrouiller les transactions non dépensées</translation> + </message> + <message> + <source>Copy quantity</source> + <translation>Copier la quantité</translation> + </message> + <message> + <source>Copy fee</source> + <translation>Copier les frais</translation> + </message> + <message> + <source>Copy after fee</source> + <translation>Copier après les frais</translation> + </message> + <message> + <source>Copy bytes</source> + <translation>Copier les octets</translation> + </message> + <message> + <source>Copy dust</source> + <translation>Copier la poussière</translation> + </message> + <message> + <source>Copy change</source> + <translation>Copier la monnaie</translation> + </message> + <message> + <source>(%1 locked)</source> + <translation>(%1 verrouillée)</translation> + </message> + <message> + <source>yes</source> + <translation>oui</translation> + </message> + <message> + <source>no</source> + <translation>non</translation> + </message> + <message> + <source>This label turns red if any recipient receives an amount smaller than the current dust threshold.</source> + <translation>Cette étiquette devient rouge si un destinataire reçoit un montant inférieur au seuil actuel de poussière.</translation> + </message> + <message> + <source>Can vary +/- %1 satoshi(s) per input.</source> + <translation>Peut varier +/- %1 satoshi(s) par entrée.</translation> + </message> + <message> + <source>(no label)</source> + <translation>(aucune étiquette)</translation> + </message> + <message> + <source>change from %1 (%2)</source> + <translation>monnaie de %1 (%2)</translation> + </message> + <message> + <source>(change)</source> + <translation>(monnaie)</translation> </message> </context> <context> @@ -472,7 +711,7 @@ </message> <message> <source>&Label</source> - <translation>&Étiquette</translation> + <translation>É&tiquette</translation> </message> <message> <source>The label associated with this address list entry</source> @@ -480,12 +719,44 @@ </message> <message> <source>The address associated with this address list entry. This can only be modified for sending addresses.</source> - <translation>L'adresse associée à cette entrée de la liste d'adresses. Ceci ne peut être modifié que pour les adresses d'envoi.</translation> + <translation>L'adresse associée à cette entrée de la liste d'adresses. Cela ne peut être modifié que pour les adresses d'envoi.</translation> </message> <message> <source>&Address</source> <translation>&Adresse</translation> </message> + <message> + <source>New receiving address</source> + <translation>Nouvelle adresse de réception</translation> + </message> + <message> + <source>New sending address</source> + <translation>Nouvelle adresse d’envoi</translation> + </message> + <message> + <source>Edit receiving address</source> + <translation>Modifier l’adresse de réception</translation> + </message> + <message> + <source>Edit sending address</source> + <translation>Modifier l’adresse d'envoi</translation> + </message> + <message> + <source>The entered address "%1" is not a valid Bitcoin address.</source> + <translation>L'adresse saisie « %1 » n'est pas une adresse Bitcoin valide.</translation> + </message> + <message> + <source>The entered address "%1" is already in the address book.</source> + <translation>L’adresse saisie « %1 » est déjà présente dans le carnet d'adresses.</translation> + </message> + <message> + <source>Could not unlock wallet.</source> + <translation>Impossible de déverrouiller le porte-monnaie.</translation> + </message> + <message> + <source>New key generation failed.</source> + <translation>Échec de génération de la nouvelle clé.</translation> + </message> </context> <context> <name>FreespaceChecker</name> @@ -499,7 +770,7 @@ </message> <message> <source>Directory already exists. Add %1 if you intend to create a new directory here.</source> - <translation>Le répertoire existe déjà. Ajoutez %1 si vous voulez créer un nouveau répertoire ici.</translation> + <translation>Le répertoire existe déjà. Ajouter %1 si vous comptez créer un nouveau répertoire ici.</translation> </message> <message> <source>Path already exists, and is not a directory.</source> @@ -605,18 +876,69 @@ </message> <message numerus="yes"> <source>(of %n GB needed)</source> - <translation><numerusform>(sur %n Go nécessaire)</numerusform><numerusform>(sur %n Go nécessaires)</numerusform></translation> + <translation><numerusform>(sur %n Go requis)</numerusform><numerusform>(sur %n Go requis)</numerusform></translation> + </message> +</context> +<context> + <name>ModalOverlay</name> + <message> + <source>Form</source> + <translation>Formulaire</translation> + </message> + <message> + <source>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 bitcoin network, as detailed below.</source> + <translation>Les transactions récentes ne sont peut-être pas encore visibles, et par conséquent, le solde de votre porte-monnaie est peut-être erroné. Cette information sera juste une fois que votre porte-monnaie aura fini de se synchroniser avec le réseau Bitcoin, tel que décrit ci-dessous. </translation> + </message> + <message> + <source>Attempting to spend bitcoins that are affected by not-yet-displayed transactions will not be accepted by the network.</source> + <translation>Toute tentative de dépense de bitcoins affectés par des transactions qui ne sont pas encore affichées ne sera pas acceptée par le réseau.</translation> + </message> + <message> + <source>Number of blocks left</source> + <translation>Nombre de blocs restants</translation> + </message> + <message> + <source>Unknown...</source> + <translation>Inconnu...</translation> + </message> + <message> + <source>Last block time</source> + <translation>Horodatage du dernier bloc</translation> + </message> + <message> + <source>Progress</source> + <translation>Progression</translation> + </message> + <message> + <source>Progress increase per hour</source> + <translation>Avancement de la progression par heure</translation> + </message> + <message> + <source>calculating...</source> + <translation>calcul en cours...</translation> + </message> + <message> + <source>Estimated time left until synced</source> + <translation>Temps estimé avant la fin de la synchronisation</translation> + </message> + <message> + <source>Hide</source> + <translation>Cacher</translation> + </message> + <message> + <source>Unknown. Syncing Headers (%1)...</source> + <translation>Inconnu. Synchronisation des en-têtes (%1)...</translation> </message> </context> <context> <name>OpenURIDialog</name> <message> <source>Open URI</source> - <translation>Ouvrir un URI</translation> + <translation>Ouvrir une URI</translation> </message> <message> <source>Open payment request from URI or file</source> - <translation>Ouvrir une demande de paiement à partir d'un URI ou d'un fichier</translation> + <translation>Ouvrir une demande de paiement à partir d'une URI ou d'un fichier</translation> </message> <message> <source>URI:</source> @@ -626,6 +948,10 @@ <source>Select payment request file</source> <translation>Choisir le fichier de demande de paiement</translation> </message> + <message> + <source>Select payment request file to open</source> + <translation>Choisir le fichier de demande de paiement à ouvrir</translation> + </message> </context> <context> <name>OptionsDialog</name> @@ -635,7 +961,7 @@ </message> <message> <source>&Main</source> - <translation>Réglages &principaux</translation> + <translation>&Principaux</translation> </message> <message> <source>Automatically start %1 after logging in to the system.</source> @@ -655,7 +981,7 @@ </message> <message> <source>Number of script &verification threads</source> - <translation>Nombre d'exétrons de &vérification de script</translation> + <translation>Nombre de fils de &vérification de script</translation> </message> <message> <source>Accept connections from outside</source> @@ -667,7 +993,7 @@ </message> <message> <source>IP address of the proxy (e.g. IPv4: 127.0.0.1 / IPv6: ::1)</source> - <translation>Adresse IP du mandataire (par ex. IPv4 : 127.0.0.1 / IPv6 : ::1)</translation> + <translation>Adresse IP du mandataire (p. ex. IPv4 : 127.0.0.1 / IPv6 : ::1)</translation> </message> <message> <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Exit in the menu.</source> @@ -675,7 +1001,7 @@ </message> <message> <source>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 |.</source> - <translation>URL de tiers (par ex. un explorateur de blocs) apparaissant dans l'onglet des transactions comme éléments du menu contextuel. %s dans l'URL est remplacé par le hachage de la transaction. Les URL multiples sont séparées par une barre verticale |.</translation> + <translation>URL de tiers (p. ex. un explorateur de blocs) apparaissant dans l'onglet des transactions comme éléments du menu contextuel. %s dans l'URL est remplacé par le hachage de la transaction. Les URL multiples sont séparées par une barre verticale |.</translation> </message> <message> <source>Third party transaction URLs</source> @@ -691,7 +1017,7 @@ </message> <message> <source>&Reset Options</source> - <translation>&Réinitialisation des options</translation> + <translation>&Réinitialiser les options</translation> </message> <message> <source>&Network</source> @@ -711,11 +1037,11 @@ </message> <message> <source>Enable coin &control features</source> - <translation>Activer les fonctions de &contrôle des pièces </translation> + <translation>Activer les fonctions de &contrôle des pièces</translation> </message> <message> <source>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.</source> - <translation>Si vous désactivé la dépense de la monnaie non confirmée, la monnaie d'une transaction ne peut pas être utilisée tant que cette transaction n'a pas reçu au moins une confirmation. Ceci affecte aussi comment votre solde est calculé.</translation> + <translation>Si vous désactivé la dépense de la monnaie non confirmée, la monnaie d'une transaction ne peut pas être utilisée tant que cette transaction n'a pas reçu au moins une confirmation. Celai affecte aussi le calcul de votre solde.</translation> </message> <message> <source>&Spend unconfirmed change</source> @@ -723,7 +1049,7 @@ </message> <message> <source>Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled.</source> - <translation>Ouvrir le port du client Bitcoin automatiquement sur le routeur. Ceci ne fonctionne que si votre routeur supporte l'UPnP et si la fonctionnalité est activée.</translation> + <translation>Ouvrir automatiquement le port du client Bitcoin sur le routeur. Cela ne fonctionne que si votre routeur prend en charge l'UPnP et si la fonction est activée.</translation> </message> <message> <source>Map port using &UPnP</source> @@ -739,7 +1065,7 @@ </message> <message> <source>Proxy &IP:</source> - <translation>&IP du serveur mandataire :</translation> + <translation>&IP du mandataire :</translation> </message> <message> <source>&Port:</source> @@ -747,7 +1073,7 @@ </message> <message> <source>Port of the proxy (e.g. 9050)</source> - <translation>Port du serveur mandataire (par ex. 9050)</translation> + <translation>Port du mandataire (p. ex. 9050)</translation> </message> <message> <source>Used for reaching peers via:</source> @@ -791,11 +1117,11 @@ </message> <message> <source>Show only a tray icon after minimizing the window.</source> - <translation>Afficher uniquement une icône système après minimisation.</translation> + <translation>N'afficher qu'une icône dans la zone de notification après minimisation.</translation> </message> <message> <source>&Minimize to the tray instead of the taskbar</source> - <translation>&Minimiser dans la barre système au lieu de la barre des tâches</translation> + <translation>&Minimiser dans la zone de notification au lieu de la barre des tâches</translation> </message> <message> <source>M&inimize on close</source> @@ -819,7 +1145,7 @@ </message> <message> <source>Choose the default subdivision unit to show in the interface and when sending coins.</source> - <translation>Choisissez la sous-unité par défaut pour l'affichage dans l'interface et lors de l'envoi de pièces.</translation> + <translation>Choisir la sous-unité par défaut d'affichage dans l'interface et lors d'envoi de pièces.</translation> </message> <message> <source>Whether to show coin control features or not.</source> @@ -847,7 +1173,7 @@ </message> <message> <source>Client restart required to activate changes.</source> - <translation>Le redémarrage du client est nécessaire pour activer les changements.</translation> + <translation>Le redémarrage du client est exigé pour activer les changements.</translation> </message> <message> <source>Client will be shut down. Do you want to proceed?</source> @@ -882,7 +1208,7 @@ </message> <message> <source>Your current spendable balance</source> - <translation>Votre solde actuel pouvant être dépensé</translation> + <translation>Votre solde actuel disponible</translation> </message> <message> <source>Pending:</source> @@ -890,7 +1216,7 @@ </message> <message> <source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source> - <translation>Total des transactions qui doivent encore être confirmées et qu'il n'est pas encore possible de dépenser</translation> + <translation>Total des transactions qui doivent encore être confirmées et qui ne sont pas prises en compte dans le solde disponible</translation> </message> <message> <source>Immature:</source> @@ -938,6 +1264,97 @@ </message> </context> <context> + <name>PaymentServer</name> + <message> + <source>Payment request error</source> + <translation>Erreur de demande de paiement</translation> + </message> + <message> + <source>Cannot start bitcoin: click-to-pay handler</source> + <translation>Impossible de démarrer le gestionnaire de cliquer-pour-payer bitcoin:</translation> + </message> + <message> + <source>URI handling</source> + <translation>Gestion des URI</translation> + </message> + <message> + <source>Payment request fetch URL is invalid: %1</source> + <translation>L'URL de récupération de la demande de paiement est invalide : %1</translation> + </message> + <message> + <source>Invalid payment address %1</source> + <translation>Adresse de paiement invalide %1</translation> + </message> + <message> + <source>URI cannot be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters.</source> + <translation>L'URI ne peut pas être analysée ! Cela peut être causé par une adresse Bitcoin invalide ou par des paramètres d'URI mal formés.</translation> + </message> + <message> + <source>Payment request file handling</source> + <translation>Gestion des fichiers de demande de paiement</translation> + </message> + <message> + <source>Payment request file cannot be read! This can be caused by an invalid payment request file.</source> + <translation>Le fichier de demande de paiement ne peut pas être lu ! Cela peut être causé par un fichier de demande de paiement invalide.</translation> + </message> + <message> + <source>Payment request rejected</source> + <translation>Demande de paiement rejetée</translation> + </message> + <message> + <source>Payment request network doesn't match client network.</source> + <translation>Le réseau de la demande de paiement ne correspond pas au réseau du client.</translation> + </message> + <message> + <source>Payment request expired.</source> + <translation>La demande de paiement a expiré</translation> + </message> + <message> + <source>Payment request is not initialized.</source> + <translation>La demande de paiement n'est pas initialisée.</translation> + </message> + <message> + <source>Unverified payment requests to custom payment scripts are unsupported.</source> + <translation>Les demandes de paiements non vérifiées vers des scripts de paiement personnalisés ne sont pas prises en charge.</translation> + </message> + <message> + <source>Invalid payment request.</source> + <translation>Demande de paiement invalide.</translation> + </message> + <message> + <source>Requested payment amount of %1 is too small (considered dust).</source> + <translation>Le paiement demandé d'un montant de %1 est trop faible (considéré comme de la poussière).</translation> + </message> + <message> + <source>Refund from %1</source> + <translation>Remboursement de %1</translation> + </message> + <message> + <source>Payment request %1 is too large (%2 bytes, allowed %3 bytes).</source> + <translation>La demande de paiement %1 est trop grande (%2 octets, %3 octets permis).</translation> + </message> + <message> + <source>Error communicating with %1: %2</source> + <translation>Erreur de communication avec %1 : %2</translation> + </message> + <message> + <source>Payment request cannot be parsed!</source> + <translation>La demande de paiement ne peut pas être analysée !</translation> + </message> + <message> + <source>Bad response from server %1</source> + <translation>Mauvaise réponse du serveur %1</translation> + </message> + <message> + <source>Network request error</source> + <translation>Erreur de demande réseau</translation> + </message> + <message> + <source>Payment acknowledged</source> + <translation>Le paiement a été confirmé</translation> + </message> +</context> +<context> <name>PeerTableModel</name> <message> <source>User Agent</source> @@ -948,8 +1365,12 @@ <translation>Nœud/service</translation> </message> <message> - <source>Ping Time</source> - <translation>Temps de ping</translation> + <source>NodeId</source> + <translation>NodeId</translation> + </message> + <message> + <source>Ping</source> + <translation>Ping</translation> </message> </context> <context> @@ -990,6 +1411,72 @@ <source>%1 ms</source> <translation>%1 ms</translation> </message> + <message numerus="yes"> + <source>%n second(s)</source> + <translation><numerusform>%n seconde</numerusform><numerusform>%n secondes</numerusform></translation> + </message> + <message numerus="yes"> + <source>%n minute(s)</source> + <translation><numerusform>%n minute</numerusform><numerusform>%n minutes</numerusform></translation> + </message> + <message numerus="yes"> + <source>%n hour(s)</source> + <translation><numerusform>%n heure</numerusform><numerusform>%n heures</numerusform></translation> + </message> + <message numerus="yes"> + <source>%n day(s)</source> + <translation><numerusform>%n jour</numerusform><numerusform>%n jours</numerusform></translation> + </message> + <message numerus="yes"> + <source>%n week(s)</source> + <translation><numerusform>%n semaine</numerusform><numerusform>%n semaines</numerusform></translation> + </message> + <message> + <source>%1 and %2</source> + <translation>%1 et %2</translation> + </message> + <message numerus="yes"> + <source>%n year(s)</source> + <translation><numerusform>%n an</numerusform><numerusform>%n ans</numerusform></translation> + </message> + <message> + <source>%1 didn't yet exit safely...</source> + <translation>%1 ne s'est pas encore arrêté en toute sécurité...</translation> + </message> +</context> +<context> + <name>QObject::QObject</name> + <message> + <source>Error: Specified data directory "%1" does not exist.</source> + <translation>Erreur : le répertoire de données indiqué « %1 » n'existe pas.</translation> + </message> + <message> + <source>Error: Cannot parse configuration file: %1. Only use key=value syntax.</source> + <translation>Erreur : impossible d'analyser le fichier de configuration : %1. N’utiliser que la syntaxe clef=valeur.</translation> + </message> + <message> + <source>Error: %1</source> + <translation>Erreur : %1</translation> + </message> +</context> +<context> + <name>QRImageWidget</name> + <message> + <source>&Save Image...</source> + <translation>&Enregistrer l'image...</translation> + </message> + <message> + <source>&Copy Image</source> + <translation>&Copier l'image</translation> + </message> + <message> + <source>Save QR Code</source> + <translation>Enregistrer le code QR</translation> + </message> + <message> + <source>PNG Image (*.png)</source> + <translation>Image PNG (*.png)</translation> + </message> </context> <context> <name>RPCConsole</name> @@ -1107,7 +1594,7 @@ </message> <message> <source>Open the %1 debug log file from the current data directory. This can take a few seconds for large log files.</source> - <translation>Ouvrir le journal de débogage de %1 depuis le répertoire de données actuel. Ceci peut prendre quelques secondes pour les journaux de grande taille.</translation> + <translation>Ouvrir le fichier journal de débogage de %1 à partir du répertoire de données actuel. Cela peut prendre quelques secondes pour les fichiers journaux de grande taille.</translation> </message> <message> <source>Decrease font size</source> @@ -1143,13 +1630,17 @@ </message> <message> <source>The duration of a currently outstanding ping.</source> - <translation>La durée d'un ping actuellement en cours.</translation> + <translation>La durée d'un ping en cours.</translation> </message> <message> <source>Ping Wait</source> <translation>Attente du ping</translation> </message> <message> + <source>Min Ping</source> + <translation>Ping min.</translation> + </message> + <message> <source>Time Offset</source> <translation>Décalage temporel</translation> </message> @@ -1171,7 +1662,7 @@ </message> <message> <source>&Clear</source> - <translation>&Nettoyer</translation> + <translation>&Effacer</translation> </message> <message> <source>Totals</source> @@ -1187,19 +1678,11 @@ </message> <message> <source>Debug log file</source> - <translation>Journal de débogage</translation> + <translation>Fichier journal de débogage</translation> </message> <message> <source>Clear console</source> - <translation>Nettoyer la console</translation> - </message> - <message> - <source>&Disconnect Node</source> - <translation>&Déconnecter le nœud</translation> - </message> - <message> - <source>Ban Node for</source> - <translation>Bannir le nœud pendant</translation> + <translation>Effacer la console</translation> </message> <message> <source>1 &hour</source> @@ -1218,8 +1701,16 @@ <translation>1 &an</translation> </message> <message> - <source>&Unban Node</source> - <translation>&Réhabiliter le nœud</translation> + <source>&Disconnect</source> + <translation>&Déconnecter</translation> + </message> + <message> + <source>Ban for</source> + <translation>Bannir pendant</translation> + </message> + <message> + <source>&Unban</source> + <translation>&Réhabiliter</translation> </message> <message> <source>Welcome to the %1 RPC console.</source> @@ -1227,13 +1718,21 @@ </message> <message> <source>Use up and down arrows to navigate history, and <b>Ctrl-L</b> to clear screen.</source> - <translation>Utiliser les touches de curseur pour naviguer dans l'historique et <b>Ctrl-L</b> pour effacer l'écran.</translation> + <translation>Utiliser les touches de déplacement pour naviguer dans l'historique et <b>Ctrl-L</b> pour effacer l'écran.</translation> </message> <message> <source>Type <b>help</b> for an overview of available commands.</source> <translation>Taper <b>help</b> pour afficher une vue générale des commandes proposées.</translation> </message> <message> + <source>WARNING: Scammers have been active, telling users to type commands here, stealing their wallet contents. Do not use this console without fully understanding the ramification of a command.</source> + <translation>AVERTISSEMENT : des fraudeurs sont réputés être à l'oeuvre, demandant aux utilisateurs de taper des commandes ici, et dérobant le contenu de leurs porte-monnaie. Ne pas utiliser cette console sans une compréhension parfaite des conséquences d'une commande.</translation> + </message> + <message> + <source>Network activity disabled</source> + <translation>L'activité réseau est désactivée.</translation> + </message> + <message> <source>%1 B</source> <translation>%1 o</translation> </message> @@ -1298,7 +1797,7 @@ </message> <message> <source>Reuse one of the previously used receiving addresses. Reusing addresses has security and privacy issues. Do not use this unless re-generating a payment request made before.</source> - <translation>Réutilise une adresse de réception précédemment utilisée. Réutiliser une adresse pose des problèmes de sécurité et de vie privée. N'utilisez pas cette option sauf si vous générez à nouveau une demande de paiement déjà faite.</translation> + <translation>Réutiliser une adresse de réception utilisée précédemment. Réutiliser une adresse comporte des problèmes de sécurité et de confidentialité. À ne pas utiliser, sauf pour générer une demande de paiement faite au préalable.</translation> </message> <message> <source>R&euse an existing receiving address (not recommended)</source> @@ -1306,19 +1805,19 @@ </message> <message> <source>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 Bitcoin network.</source> - <translation>Un message optionnel à joindre à la demande de paiement qui sera affiché à l'ouverture de celle-ci. Note : le message ne sera pas envoyé avec le paiement par le réseau Bitcoin.</translation> + <translation>Un message facultatif à joindre à la demande de paiement et qui sera affiché à l'ouverture de celle-ci. Note : le message ne sera pas envoyé avec le paiement par le réseau Bitcoin.</translation> </message> <message> <source>An optional label to associate with the new receiving address.</source> - <translation>Un étiquette optionnelle à associer à la nouvelle adresse de réception</translation> + <translation>Un étiquette facultative à associer à la nouvelle adresse de réception.</translation> </message> <message> <source>Use this form to request payments. All fields are <b>optional</b>.</source> - <translation>Utiliser ce formulaire pour demander des paiements. Tous les champs sont <b>optionnels</b>.</translation> + <translation>Utiliser ce formulaire pour demander des paiements. Tous les champs sont <b>facultatifs</b>.</translation> </message> <message> <source>An optional amount to request. Leave this empty or zero to not request a specific amount.</source> - <translation>Un montant optionnel à demander. Laisser ceci vide ou à zéro pour ne pas demander de montant spécifique.</translation> + <translation>Un montant facultatif à demander. Ne rien saisir ou un zéro pour ne pas demander de montant spécifique.</translation> </message> <message> <source>Clear all fields of the form.</source> @@ -1334,11 +1833,11 @@ </message> <message> <source>&Request payment</source> - <translation>&Demande de paiement</translation> + <translation>&Demander un paiement</translation> </message> <message> <source>Show the selected request (does the same as double clicking an entry)</source> - <translation>Afficher la demande choisie (identique à un double-clic sur une entrée)</translation> + <translation>Afficher la demande choisie (comme double-cliquer sur une entrée)</translation> </message> <message> <source>Show</source> @@ -1346,11 +1845,27 @@ </message> <message> <source>Remove the selected entries from the list</source> - <translation>Enlever les entrées sélectionnées de la liste</translation> + <translation>Retirer les entrées sélectionnées de la liste</translation> </message> <message> <source>Remove</source> - <translation>Enlever</translation> + <translation>Retirer</translation> + </message> + <message> + <source>Copy URI</source> + <translation>Copier l'URI</translation> + </message> + <message> + <source>Copy label</source> + <translation>Copier l’étiquette</translation> + </message> + <message> + <source>Copy message</source> + <translation>Copier le message</translation> + </message> + <message> + <source>Copy amount</source> + <translation>Copier le montant</translation> </message> </context> <context> @@ -1369,7 +1884,74 @@ </message> <message> <source>&Save Image...</source> - <translation>&Sauvegarder l'image...</translation> + <translation>&Enregistrer l'image...</translation> + </message> + <message> + <source>Request payment to %1</source> + <translation>Demande de paiement à %1</translation> + </message> + <message> + <source>Payment information</source> + <translation>Informations de paiement</translation> + </message> + <message> + <source>URI</source> + <translation>URI</translation> + </message> + <message> + <source>Address</source> + <translation>Adresse</translation> + </message> + <message> + <source>Amount</source> + <translation>Montant</translation> + </message> + <message> + <source>Label</source> + <translation>Étiquette</translation> + </message> + <message> + <source>Message</source> + <translation>Message</translation> + </message> + <message> + <source>Resulting URI too long, try to reduce the text for label / message.</source> + <translation>L'URI résultante est trop longue. Essayez de réduire le texte de l'étiquette ou du message.</translation> + </message> + <message> + <source>Error encoding URI into QR Code.</source> + <translation>Erreur d'encodage de l'URI en code QR.</translation> + </message> +</context> +<context> + <name>RecentRequestsTableModel</name> + <message> + <source>Date</source> + <translation>Date</translation> + </message> + <message> + <source>Label</source> + <translation>Étiquette</translation> + </message> + <message> + <source>Message</source> + <translation>Message</translation> + </message> + <message> + <source>(no label)</source> + <translation>(aucune étiquette)</translation> + </message> + <message> + <source>(no message)</source> + <translation>(aucun message)</translation> + </message> + <message> + <source>(no amount requested)</source> + <translation>(aucun montant demandé)</translation> + </message> + <message> + <source>Requested</source> + <translation>Demandée</translation> </message> </context> <context> @@ -1407,10 +1989,6 @@ <translation>Montant :</translation> </message> <message> - <source>Priority:</source> - <translation>Priorité :</translation> - </message> - <message> <source>Fee:</source> <translation>Frais :</translation> </message> @@ -1424,11 +2002,11 @@ </message> <message> <source>If this is activated, but the change address is empty or invalid, change will be sent to a newly generated address.</source> - <translation>Si ceci est actif mais l'adresse de monnaie rendue est vide ou invalide, la monnaie sera envoyée vers une adresse nouvellement générée.</translation> + <translation>Si cette option est activée et l'adresse de monnaie est vide ou invalide, la monnaie sera envoyée vers une adresse nouvellement générée.</translation> </message> <message> <source>Custom change address</source> - <translation>Adresse personnalisée de monnaie rendue</translation> + <translation>Adresse personnalisée de monnaie</translation> </message> <message> <source>Transaction Fee:</source> @@ -1460,7 +2038,7 @@ </message> <message> <source>Paying only the minimum fee is just fine as long as there is less transaction volume than space in the blocks. But be aware that this can end up in a never confirming transaction once there is more demand for bitcoin transactions than the network can process.</source> - <translation>Il est correct de payer les frais minimum tant que le volume transactionnel est inférieur à l'espace dans les blocs. Mais soyez conscient que ceci pourrait résulter en une transaction n'étant jamais confirmée une fois qu'il y aura plus de transactions que le réseau ne pourra en traiter.</translation> + <translation>Il est correct de payer les frais minimum tant que le volume transactionnel est inférieur à l'espace dans les blocs. Mais soyez conscient que cela pourrait résulter en une transaction n'étant jamais confirmée une fois qu'il y aura plus de transactions que le réseau ne pourra en traiter.</translation> </message> <message> <source>(read the tooltip)</source> @@ -1476,11 +2054,7 @@ </message> <message> <source>(Smart fee not initialized yet. This usually takes a few blocks...)</source> - <translation>(Les frais intelligents ne sont pas encore initialisés. Ceci prend habituellement quelques blocs...)</translation> - </message> - <message> - <source>Confirmation time:</source> - <translation>Temps de confirmation :</translation> + <translation>(Les frais intelligents ne sont pas encore initialisés. Cela prend habituellement quelques blocs...)</translation> </message> <message> <source>normal</source> @@ -1507,8 +2081,12 @@ <translation>Poussière :</translation> </message> <message> + <source>Confirmation time target:</source> + <translation>Estimation du délai de confirmation :</translation> + </message> + <message> <source>Clear &All</source> - <translation>&Tout nettoyer</translation> + <translation>&Tout effacer</translation> </message> <message> <source>Balance:</source> @@ -1522,6 +2100,126 @@ <source>S&end</source> <translation>E&nvoyer</translation> </message> + <message> + <source>Copy quantity</source> + <translation>Copier la quantité</translation> + </message> + <message> + <source>Copy amount</source> + <translation>Copier le montant</translation> + </message> + <message> + <source>Copy fee</source> + <translation>Copier les frais</translation> + </message> + <message> + <source>Copy after fee</source> + <translation>Copier après les frais</translation> + </message> + <message> + <source>Copy bytes</source> + <translation>Copier les octets</translation> + </message> + <message> + <source>Copy dust</source> + <translation>Copier la poussière</translation> + </message> + <message> + <source>Copy change</source> + <translation>Copier la monnaie</translation> + </message> + <message> + <source>%1 to %2</source> + <translation>%1 à %2</translation> + </message> + <message> + <source>Are you sure you want to send?</source> + <translation>Voulez-vous vraiment envoyer ?</translation> + </message> + <message> + <source>added as transaction fee</source> + <translation>ajoutés comme frais de transaction</translation> + </message> + <message> + <source>Total Amount %1</source> + <translation>Montant total %1</translation> + </message> + <message> + <source>or</source> + <translation>ou</translation> + </message> + <message> + <source>Confirm send coins</source> + <translation>Confirmer l’envoi de pièces</translation> + </message> + <message> + <source>The recipient address is not valid. Please recheck.</source> + <translation>L'adresse du destinataire est invalide. Veuillez la revérifier.</translation> + </message> + <message> + <source>The amount to pay must be larger than 0.</source> + <translation>Le montant à payer doit être supérieur à 0.</translation> + </message> + <message> + <source>The amount exceeds your balance.</source> + <translation>Le montant dépasse votre solde.</translation> + </message> + <message> + <source>The total exceeds your balance when the %1 transaction fee is included.</source> + <translation>Le montant dépasse votre solde lorsque les frais de transaction de %1 sont inclus.</translation> + </message> + <message> + <source>Duplicate address found: addresses should only be used once each.</source> + <translation>Adresse identique trouvée : chaque adresse ne devrait être utilisée qu'une fois.</translation> + </message> + <message> + <source>Transaction creation failed!</source> + <translation>Échec de création de la transaction !</translation> + </message> + <message> + <source>The transaction was rejected with the following reason: %1</source> + <translation>La transaction a été rejetée pour la raison suivante: %1</translation> + </message> + <message> + <source>A fee higher than %1 is considered an absurdly high fee.</source> + <translation>Des frais supérieurs à %1 sont considérés comme ridiculement élevés.</translation> + </message> + <message> + <source>Payment request expired.</source> + <translation>La demande de paiement a expiré</translation> + </message> + <message numerus="yes"> + <source>%n block(s)</source> + <translation><numerusform>%n bloc</numerusform><numerusform>%n blocs</numerusform></translation> + </message> + <message> + <source>Pay only the required fee of %1</source> + <translation>Payer seulement les frais exigés de %1</translation> + </message> + <message numerus="yes"> + <source>Estimated to begin confirmation within %n block(s).</source> + <translation><numerusform>Il est estimé que la confirmation commencera dans %n bloc.</numerusform><numerusform>Il est estimé que la confirmation commencera dans %n blocs.</numerusform></translation> + </message> + <message> + <source>Warning: Invalid Bitcoin address</source> + <translation>Avertissement : adresse Bitcoin invalide</translation> + </message> + <message> + <source>Warning: Unknown change address</source> + <translation>Avertissement : adresse de monnaie inconnue</translation> + </message> + <message> + <source>Confirm custom change address</source> + <translation>Confimer l'adresse personnalisée de monnaie</translation> + </message> + <message> + <source>The address you selected for change is not part of this wallet. Any or all funds in your wallet may be sent to this address. Are you sure?</source> + <translation>L'adresse que vous avez sélectionnée pour la monnaie ne fait pas partie de ce porte-monnaie. Les fonds de ce porte-monnaie peuvent en partie ou en totalité être envoyés vers cette adresse. Êtes-vous certain ?</translation> + </message> + <message> + <source>(no label)</source> + <translation>(aucune étiquette)</translation> + </message> </context> <context> <name>SendCoinsEntry</name> @@ -1555,7 +2253,7 @@ </message> <message> <source>Paste address from clipboard</source> - <translation>Coller l'adresse depuis le presse-papiers</translation> + <translation>Coller l'adresse du presse-papiers</translation> </message> <message> <source>Alt+P</source> @@ -1563,7 +2261,7 @@ </message> <message> <source>Remove this entry</source> - <translation>Enlever cette entrée</translation> + <translation>Retirer cette entrée</translation> </message> <message> <source>The fee will be deducted from the amount being sent. The recipient will receive less bitcoins than you enter in the amount field. If multiple recipients are selected, the fee is split equally.</source> @@ -1591,7 +2289,7 @@ </message> <message> <source>A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source> - <translation>Un message qui était joint à l'URI Bitcoin et qui sera stocké avec la transaction pour référence. Note : ce message ne sera pas envoyé par le réseau Bitcoin.</translation> + <translation>Un message qui était joint à l'URI bitcoin: et qui sera stocké avec la transaction pour référence. Note : ce message ne sera pas envoyé par le réseau Bitcoin.</translation> </message> <message> <source>Pay To:</source> @@ -1601,6 +2299,17 @@ <source>Memo:</source> <translation>Mémo :</translation> </message> + <message> + <source>Enter a label for this address to add it to your address book</source> + <translation>Saisir une étiquette pour cette adresse afin de l’ajouter à votre carnet d’adresses</translation> + </message> +</context> +<context> + <name>SendConfirmationDialog</name> + <message> + <source>Yes</source> + <translation>Oui</translation> + </message> </context> <context> <name>ShutdownWindow</name> @@ -1610,14 +2319,14 @@ </message> <message> <source>Do not shut down the computer until this window disappears.</source> - <translation>Ne pas fermer l'ordinateur jusqu'à la disparition de cette fenêtre.</translation> + <translation>Ne pas éteindre l'ordinateur jusqu'à la disparition de cette fenêtre.</translation> </message> </context> <context> <name>SignVerifyMessageDialog</name> <message> <source>Signatures - Sign / Verify a Message</source> - <translation>Signatures - Signer / Vérifier un message</translation> + <translation>Signatures - Signer / vérifier un message</translation> </message> <message> <source>&Sign Message</source> @@ -1625,7 +2334,7 @@ </message> <message> <source>You can sign messages/agreements with your addresses to prove you can receive bitcoins 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.</source> - <translation>Vous pouvez signer des messages/accords avec vos adresses pour prouver que vous pouvez recevoir des bitcoins à ces dernières. Faites attention de ne rien signer de vague ou au hasard, car des attaques d'hameçonnage pourraient essayer de vous faire signer avec votre identité afin de l'usurper. Ne signez que des déclarations entièrement détaillées et avec lesquelles vous êtes d'accord.</translation> + <translation>Vous pouvez signer des messages ou des accords avec vos adresses pour prouver que vous pouvez recevoir des bitcoins à ces dernières. Faites attention de ne rien signer de vague ou au hasard, car des attaques d'hameçonnage pourraient essayer de vous faire signer avec votre identité afin de l'usurper. Ne signez que des déclarations entièrement détaillées et avec lesquelles vous êtes d'accord.</translation> </message> <message> <source>The Bitcoin address to sign the message with</source> @@ -1633,7 +2342,7 @@ </message> <message> <source>Choose previously used address</source> - <translation>Choisir une adresse précédemment utilisée</translation> + <translation>Choisir une adresse déjà utilisée</translation> </message> <message> <source>Alt+A</source> @@ -1641,7 +2350,7 @@ </message> <message> <source>Paste address from clipboard</source> - <translation>Coller une adresse depuis le presse-papiers</translation> + <translation>Coller une adresse du presse-papiers</translation> </message> <message> <source>Alt+P</source> @@ -1661,7 +2370,7 @@ </message> <message> <source>Sign the message to prove you own this Bitcoin address</source> - <translation>Signer le message pour prouver que vous détenez cette adresse Bitcoin</translation> + <translation>Signer le message afin de prouver que vous détenez cette adresse Bitcoin</translation> </message> <message> <source>Sign &Message</source> @@ -1673,7 +2382,7 @@ </message> <message> <source>Clear &All</source> - <translation>&Tout nettoyer</translation> + <translation>&Tout effacer</translation> </message> <message> <source>&Verify Message</source> @@ -1681,7 +2390,7 @@ </message> <message> <source>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!</source> - <translation>Saisissez ci-dessous l'adresse de destinataire, le message (assurez-vous de copier exactement les retours à la ligne, les espaces, les tabulations, etc.) et la signature pour vérifier le message. Faites attention à ne pas déduire davantage de la signature que ce qui est contenu dans le message signé même, pour éviter d'être trompé par une attaque d'homme du milieu. Notez que ceci ne fait que prouver que le signataire reçoit l'adresse et ne peut pas prouver la provenance d'une transaction.</translation> + <translation>Saisir ci-dessous l'adresse du destinataire, le message (s'assurer de copier fidèlement les retours à la ligne, les espaces, les tabulations, etc.) et la signature pour vérifier le message. Faire attention à ne pas déduire davantage de la signature que ce qui est contenu dans le message signé même, pour éviter d'être trompé par une attaque d'homme du milieu. Prendre en compte que cela ne fait que prouver que le signataire reçoit l'adresse et ne peut pas prouver la provenance d'une transaction !</translation> </message> <message> <source>The Bitcoin address the message was signed with</source> @@ -1689,7 +2398,7 @@ </message> <message> <source>Verify the message to ensure it was signed with the specified Bitcoin address</source> - <translation>Vérifier le message pour vous assurer qu'il a bien été signé par l'adresse Bitcoin spécifiée</translation> + <translation>Vérifier le message pour s'assurer qu'il a été signé avec l'adresse Bitcoin spécifiée</translation> </message> <message> <source>Verify &Message</source> @@ -1699,6 +2408,58 @@ <source>Reset all verify message fields</source> <translation>Réinitialiser tous les champs de vérification de message</translation> </message> + <message> + <source>Click "Sign Message" to generate signature</source> + <translation>Cliquez sur « Signer le message » pour générer la signature</translation> + </message> + <message> + <source>The entered address is invalid.</source> + <translation>L'adresse saisie est invalide.</translation> + </message> + <message> + <source>Please check the address and try again.</source> + <translation>Veuillez vérifier l'adresse et ressayer.</translation> + </message> + <message> + <source>The entered address does not refer to a key.</source> + <translation>L'adresse saisie ne fait pas référence à une clé.</translation> + </message> + <message> + <source>Wallet unlock was cancelled.</source> + <translation>Le déverrouillage du porte-monnaie a été annulé.</translation> + </message> + <message> + <source>Private key for the entered address is not available.</source> + <translation>La clé privée n'est pas disponible pour l'adresse saisie.</translation> + </message> + <message> + <source>Message signing failed.</source> + <translation>Échec de signature du message.</translation> + </message> + <message> + <source>Message signed.</source> + <translation>Le message a été signé.</translation> + </message> + <message> + <source>The signature could not be decoded.</source> + <translation>La signature n'a pu être décodée.</translation> + </message> + <message> + <source>Please check the signature and try again.</source> + <translation>Veuillez vérifier la signature et ressayer.</translation> + </message> + <message> + <source>The signature did not match the message digest.</source> + <translation>La signature ne correspond pas au condensé du message.</translation> + </message> + <message> + <source>Message verification failed.</source> + <translation>Échec de vérification du message.</translation> + </message> + <message> + <source>Message verified.</source> + <translation>Le message a été vérifié.</translation> + </message> </context> <context> <name>SplashScreen</name> @@ -1715,11 +2476,460 @@ </message> </context> <context> + <name>TransactionDesc</name> + <message numerus="yes"> + <source>Open for %n more block(s)</source> + <translation><numerusform>Ouvert pendant encore %n bloc</numerusform><numerusform>Ouvert pendant encore %n blocs</numerusform></translation> + </message> + <message> + <source>Open until %1</source> + <translation>Ouvert jusqu'à %1</translation> + </message> + <message> + <source>conflicted with a transaction with %1 confirmations</source> + <translation>est en conflit avec une transaction ayant %1 confirmations</translation> + </message> + <message> + <source>%1/offline</source> + <translation>%1/hors ligne</translation> + </message> + <message> + <source>0/unconfirmed, %1</source> + <translation>0/non confirmées, %1</translation> + </message> + <message> + <source>in memory pool</source> + <translation>dans la réserve de mémoire</translation> + </message> + <message> + <source>not in memory pool</source> + <translation>pas dans la réserve de mémoire</translation> + </message> + <message> + <source>abandoned</source> + <translation>abandonnée</translation> + </message> + <message> + <source>%1/unconfirmed</source> + <translation>%1/non confirmée</translation> + </message> + <message> + <source>%1 confirmations</source> + <translation>%1 confirmations</translation> + </message> + <message> + <source>Status</source> + <translation>État</translation> + </message> + <message> + <source>, has not been successfully broadcast yet</source> + <translation>, n’a pas encore été diffusée avec succès</translation> + </message> + <message numerus="yes"> + <source>, broadcast through %n node(s)</source> + <translation><numerusform>, diffusée par %n nœud</numerusform><numerusform>, diffusée par %n nœuds</numerusform></translation> + </message> + <message> + <source>Date</source> + <translation>Date</translation> + </message> + <message> + <source>Source</source> + <translation>Source</translation> + </message> + <message> + <source>Generated</source> + <translation>Générée</translation> + </message> + <message> + <source>From</source> + <translation>De</translation> + </message> + <message> + <source>unknown</source> + <translation>inconnue</translation> + </message> + <message> + <source>To</source> + <translation>À</translation> + </message> + <message> + <source>own address</source> + <translation>votre adresse</translation> + </message> + <message> + <source>watch-only</source> + <translation>juste-regarder</translation> + </message> + <message> + <source>label</source> + <translation>étiquette</translation> + </message> + <message> + <source>Credit</source> + <translation>Crédit</translation> + </message> + <message numerus="yes"> + <source>matures in %n more block(s)</source> + <translation><numerusform>arrivera à maturité dans %n bloc</numerusform><numerusform>arrivera à maturité dans %n blocs</numerusform></translation> + </message> + <message> + <source>not accepted</source> + <translation>refusée</translation> + </message> + <message> + <source>Debit</source> + <translation>Débit</translation> + </message> + <message> + <source>Total debit</source> + <translation>Débit total</translation> + </message> + <message> + <source>Total credit</source> + <translation>Crédit total</translation> + </message> + <message> + <source>Transaction fee</source> + <translation>Frais de transaction</translation> + </message> + <message> + <source>Net amount</source> + <translation>Montant net</translation> + </message> + <message> + <source>Message</source> + <translation>Message</translation> + </message> + <message> + <source>Comment</source> + <translation>Commentaire</translation> + </message> + <message> + <source>Transaction ID</source> + <translation>ID de la transaction</translation> + </message> + <message> + <source>Transaction total size</source> + <translation>Taille totale de la transaction</translation> + </message> + <message> + <source>Output index</source> + <translation>Index de sorties</translation> + </message> + <message> + <source>Merchant</source> + <translation>Marchand</translation> + </message> + <message> + <source>Generated coins must mature %1 blocks before they can be spent. When you generated this block, it was broadcast to the network to be added to the block chain. If it fails to get into the chain, its state will change to "not accepted" and it won't be spendable. This may occasionally happen if another node generates a block within a few seconds of yours.</source> + <translation>Les pièces générées doivent mûrir pendant %1 blocs avant de pouvoir être dépensées. Lorsque ce bloc a été généré, il a été diffusé sur le réseau pour être ajouté à la chaîne de blocs. Si son intégration à la chaîne échoue, son état sera modifié en « refusée » et il ne sera pas possible de le dépenser. Cela peut arriver occasionnellement si un autre nœud génère un bloc à quelques secondes du vôtre.</translation> + </message> + <message> + <source>Debug information</source> + <translation>Informations de débogage</translation> + </message> + <message> + <source>Transaction</source> + <translation>Transaction</translation> + </message> + <message> + <source>Inputs</source> + <translation>Entrées</translation> + </message> + <message> + <source>Amount</source> + <translation>Montant</translation> + </message> + <message> + <source>true</source> + <translation>vrai</translation> + </message> + <message> + <source>false</source> + <translation>faux</translation> + </message> +</context> +<context> <name>TransactionDescDialog</name> <message> <source>This pane shows a detailed description of the transaction</source> <translation>Ce panneau affiche une description détaillée de la transaction</translation> </message> + <message> + <source>Details for %1</source> + <translation>Détails de %1</translation> + </message> +</context> +<context> + <name>TransactionTableModel</name> + <message> + <source>Date</source> + <translation>Date</translation> + </message> + <message> + <source>Type</source> + <translation>Type</translation> + </message> + <message> + <source>Label</source> + <translation>Étiquette</translation> + </message> + <message numerus="yes"> + <source>Open for %n more block(s)</source> + <translation><numerusform>Ouvert pendant encore %n bloc</numerusform><numerusform>Ouvert pendant encore %n blocs</numerusform></translation> + </message> + <message> + <source>Open until %1</source> + <translation>Ouvert jusqu'à %1</translation> + </message> + <message> + <source>Offline</source> + <translation>Hors ligne</translation> + </message> + <message> + <source>Unconfirmed</source> + <translation>Non confirmée</translation> + </message> + <message> + <source>Abandoned</source> + <translation>Abandonnée</translation> + </message> + <message> + <source>Confirming (%1 of %2 recommended confirmations)</source> + <translation>Confirmation (%1 sur %2 confirmations recommandées)</translation> + </message> + <message> + <source>Confirmed (%1 confirmations)</source> + <translation>Confirmée (%1 confirmations)</translation> + </message> + <message> + <source>Conflicted</source> + <translation>En conflit</translation> + </message> + <message> + <source>Immature (%1 confirmations, will be available after %2)</source> + <translation>Immature (%1 confirmations, sera disponible après %2)</translation> + </message> + <message> + <source>This block was not received by any other nodes and will probably not be accepted!</source> + <translation>Ce bloc n’a été reçu par aucun autre nœud et ne sera probablement pas accepté !</translation> + </message> + <message> + <source>Generated but not accepted</source> + <translation>Générée mais refusée</translation> + </message> + <message> + <source>Received with</source> + <translation>Reçue avec</translation> + </message> + <message> + <source>Received from</source> + <translation>Reçue de</translation> + </message> + <message> + <source>Sent to</source> + <translation>Envoyée à</translation> + </message> + <message> + <source>Payment to yourself</source> + <translation>Paiement à vous-même</translation> + </message> + <message> + <source>Mined</source> + <translation>Miné</translation> + </message> + <message> + <source>watch-only</source> + <translation>juste-regarder</translation> + </message> + <message> + <source>(n/a)</source> + <translation>(n.d)</translation> + </message> + <message> + <source>(no label)</source> + <translation>(aucune étiquette)</translation> + </message> + <message> + <source>Transaction status. Hover over this field to show number of confirmations.</source> + <translation>État de la transaction. Survoler ce champ avec la souris pour afficher le nombre de confirmations.</translation> + </message> + <message> + <source>Date and time that the transaction was received.</source> + <translation>Date et heure de réception de la transaction.</translation> + </message> + <message> + <source>Type of transaction.</source> + <translation>Type de transaction.</translation> + </message> + <message> + <source>Whether or not a watch-only address is involved in this transaction.</source> + <translation>Une adresse juste-regarder est-elle ou non impliquée dans cette transaction.</translation> + </message> + <message> + <source>User-defined intent/purpose of the transaction.</source> + <translation>Intention/but de la transaction défini par l'utilisateur.</translation> + </message> + <message> + <source>Amount removed from or added to balance.</source> + <translation>Le montant a été ajouté ou soustrait du solde.</translation> + </message> +</context> +<context> + <name>TransactionView</name> + <message> + <source>All</source> + <translation>Toutes</translation> + </message> + <message> + <source>Today</source> + <translation>Aujourd’hui</translation> + </message> + <message> + <source>This week</source> + <translation>Cette semaine</translation> + </message> + <message> + <source>This month</source> + <translation>Ce mois</translation> + </message> + <message> + <source>Last month</source> + <translation>Le mois dernier</translation> + </message> + <message> + <source>This year</source> + <translation>Cette année</translation> + </message> + <message> + <source>Range...</source> + <translation>Plage…</translation> + </message> + <message> + <source>Received with</source> + <translation>Reçue avec</translation> + </message> + <message> + <source>Sent to</source> + <translation>Envoyée à</translation> + </message> + <message> + <source>To yourself</source> + <translation>À vous-même</translation> + </message> + <message> + <source>Mined</source> + <translation>Miné </translation> + </message> + <message> + <source>Other</source> + <translation>Autres </translation> + </message> + <message> + <source>Enter address or label to search</source> + <translation>Saisir une adresse ou une étiquette à rechercher</translation> + </message> + <message> + <source>Min amount</source> + <translation>Montant min.</translation> + </message> + <message> + <source>Abandon transaction</source> + <translation>Abandonner la transaction</translation> + </message> + <message> + <source>Copy address</source> + <translation>Copier l’adresse</translation> + </message> + <message> + <source>Copy label</source> + <translation>Copier l’étiquette </translation> + </message> + <message> + <source>Copy amount</source> + <translation>Copier le montant </translation> + </message> + <message> + <source>Copy transaction ID</source> + <translation>Copier l'ID de la transaction</translation> + </message> + <message> + <source>Copy raw transaction</source> + <translation>Copier la transaction brute</translation> + </message> + <message> + <source>Copy full transaction details</source> + <translation>Copier tous les détails de la transaction</translation> + </message> + <message> + <source>Edit label</source> + <translation>Modifier l’étiquette </translation> + </message> + <message> + <source>Show transaction details</source> + <translation>Afficher les détails de la transaction</translation> + </message> + <message> + <source>Export Transaction History</source> + <translation>Exporter l'historique transactionnel</translation> + </message> + <message> + <source>Comma separated file (*.csv)</source> + <translation>Valeurs séparées par des virgules (*.csv)</translation> + </message> + <message> + <source>Confirmed</source> + <translation>Confirmée</translation> + </message> + <message> + <source>Watch-only</source> + <translation>Juste-regarder</translation> + </message> + <message> + <source>Date</source> + <translation>Date </translation> + </message> + <message> + <source>Type</source> + <translation>Type </translation> + </message> + <message> + <source>Label</source> + <translation>Étiquette</translation> + </message> + <message> + <source>Address</source> + <translation>Adresse</translation> + </message> + <message> + <source>ID</source> + <translation>ID </translation> + </message> + <message> + <source>Exporting Failed</source> + <translation>Échec d'exportation</translation> + </message> + <message> + <source>There was an error trying to save the transaction history to %1.</source> + <translation>Une erreur est survenue lors de l'enregistrement de l'historique transactionnel vers %1.</translation> + </message> + <message> + <source>Exporting Successful</source> + <translation>L'exportation est réussie</translation> + </message> + <message> + <source>The transaction history was successfully saved to %1.</source> + <translation>L'historique transactionnel a été enregistré avec succès vers %1.</translation> + </message> + <message> + <source>Range:</source> + <translation>Plage :</translation> + </message> + <message> + <source>to</source> + <translation>à </translation> + </message> </context> <context> <name>UnitDisplayStatusBarControl</name> @@ -1729,6 +2939,55 @@ </message> </context> <context> + <name>WalletFrame</name> + <message> + <source>No wallet has been loaded.</source> + <translation>Aucun porte-monnaie n'a été chargé.</translation> + </message> +</context> +<context> + <name>WalletModel</name> + <message> + <source>Send Coins</source> + <translation>Envoyer des pièces</translation> + </message> +</context> +<context> + <name>WalletView</name> + <message> + <source>&Export</source> + <translation>&Exporter</translation> + </message> + <message> + <source>Export the data in the current tab to a file</source> + <translation>Exporter les données de l'onglet actuel vers un fichier</translation> + </message> + <message> + <source>Backup Wallet</source> + <translation>Sauvegarder le porte-monnaie</translation> + </message> + <message> + <source>Wallet Data (*.dat)</source> + <translation>Données du porte-monnaie (*.dat)</translation> + </message> + <message> + <source>Backup Failed</source> + <translation>Échec de la sauvegarde</translation> + </message> + <message> + <source>There was an error trying to save the wallet data to %1.</source> + <translation>Une erreur est survenue lors de l'enregistrement des données du porte-monnaie vers %1.</translation> + </message> + <message> + <source>Backup Successful</source> + <translation>La sauvegarde est réussie</translation> + </message> + <message> + <source>The wallet data was successfully saved to %1.</source> + <translation>Les données du porte-monnaie ont été enregistrées avec succès vers %1</translation> + </message> +</context> +<context> <name>bitcoin-core</name> <message> <source>Options:</source> @@ -1748,7 +3007,19 @@ </message> <message> <source>Accept command line and JSON-RPC commands</source> - <translation>Accepter les commandes de JSON-RPC et de la ligne de commande</translation> + <translation>Accepter les commandes JSON-RPC et en ligne de commande</translation> + </message> + <message> + <source>Accept connections from outside (default: 1 if no -proxy or -connect/-noconnect)</source> + <translation>Accepter des connexions de l'extérieur (par défaut : 1 si aucun -proxy ou -connect/-noconnect)</translation> + </message> + <message> + <source>Connect only to the specified node(s); -noconnect or -connect=0 alone to disable automatic connections</source> + <translation>Se connecter seulement aux nœuds précisés ; -noconnect ou -connect=0 seul pour désactiver les connexions automatiques</translation> + </message> + <message> + <source>Distributed under the MIT software license, see the accompanying file %s or %s</source> + <translation>Distribué sous la licence MIT d'utilisation d'un logiciel. Consulter le fichier joint %s ou %s</translation> </message> <message> <source>If <category> is not supplied or if <category> = 1, output all debugging information.</source> @@ -1763,10 +3034,6 @@ <translation>É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é)</translation> </message> <message> - <source>Reduce storage requirements by pruning (deleting) old blocks. This mode is incompatible with -txindex and -rescan. Warning: Reverting this setting requires re-downloading the entire blockchain. (default: 0 = disable pruning blocks, >%u = target size in MiB to use for block files)</source> - <translation>Réduire les exigences de stockage en élaguant (supprimant) les anciens blocs. Ce mode est incompatible avec -txindex et -rescan. Avertissement : ramener ce paramètre à sa valeur antérieure exige un nouveau téléchargement de la chaîne de blocs en entier (par défaut : 0 = désactiver l'élagage des blocs, >%u = taille cible en Mio à utiliser pour les fichiers de blocs).</translation> - </message> - <message> <source>Rescans are not possible in pruned mode. You will need to use -reindex which will download the whole blockchain again.</source> <translation>Les rebalayages sont impossibles en mode élagage. Vous devrez utiliser -reindex, ce qui téléchargera de nouveau la chaîne de blocs en entier.</translation> </message> @@ -1791,16 +3058,12 @@ <translation>Impossible de démarrer le serveur HTTP. Voir le journal de débogage pour plus de détails.</translation> </message> <message> - <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> - <translation>Accepter les connexions entrantes (par défaut : 1 si aucun -proxy ou -connect )</translation> - </message> - <message> <source>Bitcoin Core</source> <translation>Bitcoin Core</translation> </message> <message> - <source>-fallbackfee is set very high! This is the transaction fee you may pay when fee estimates are not available.</source> - <translation>La valeur -fallbackfee est très élevée ! Elle représente les frais de transaction que vous pourriez acquitter si aucune estimation de frais n'est proposée.</translation> + <source>The %s developers</source> + <translation>Les développeurs de %s</translation> </message> <message> <source>A fee rate (in %s/kB) that will be used when fee estimation has insufficient data (default: %s)</source> @@ -1812,25 +3075,33 @@ </message> <message> <source>Bind to given address and always listen on it. Use [host]:port notation for IPv6</source> - <translation>Se lier à l'adresse donnée et toujours l'écouter. Utilisez la notation [host]:port pour l'IPv6</translation> + <translation>Se lier à l'adresse donnée et toujours l'écouter. Utiliser la notation [host]:port pour l'IPv6</translation> </message> <message> - <source>Delete all wallet transactions and only recover those parts of the blockchain through -rescan on startup</source> - <translation>Supprimer toutes les transactions du porte-monnaie et ne récupérer que ces parties de la chaîne de blocs avec -rescan au démarrage</translation> + <source>Cannot obtain a lock on data directory %s. %s is probably already running.</source> + <translation>Impossible d’obtenir un verrou sur le répertoire de données %s. %s fonctionne probablement déjà.</translation> </message> <message> - <source>Distributed under the MIT software license, see the accompanying file COPYING or <http://www.opensource.org/licenses/mit-license.php>.</source> - <translation>Distribué sous la licence MIT d'utilisation d'un logiciel. Consultez le fichier joint COPYING ou <http://www.opensource.org/licenses/mit-license.php>.</translation> + <source>Delete all wallet transactions and only recover those parts of the blockchain through -rescan on startup</source> + <translation>Supprimer toutes les transactions du porte-monnaie et ne récupérer que ces parties de la chaîne de blocs avec -rescan au démarrage</translation> </message> <message> <source>Error loading %s: You can't enable HD on a already existing non-HD wallet</source> <translation>Erreur de chargement de %s : vous ne pouvez pas activer HD sur un porte-monnaie non HD existant</translation> </message> <message> + <source>Error reading %s! All keys read correctly, but transaction data or address book entries might be missing or incorrect.</source> + <translation>Erreur de lecture de %s ! Toutes les clés ont été lues correctement, mais les données transactionnelles ou les entrées du carnet d'adresses sont peut-être manquantes ou incorrectes.</translation> + </message> + <message> <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source> <translation>Exécuter la commande lorsqu'une transaction de porte-monnaie change (%s dans la commande est remplacée par TxID)</translation> </message> <message> + <source>If this block is in the chain assume that it and its ancestors are valid and potentially skip their script verification (0 to verify all, default: %s, testnet: %s)</source> + <translation>Si ce bloc est dans la chaîne, supposer qu'il est valide, ainsi que ces ancêtres, et ignorer potentiellement la vérification de leur script (0 pour tout vérifier, valeur par défaut : %s, réseau de test : %s)</translation> + </message> + <message> <source>Maximum allowed median peer time offset adjustment. Local perspective of time may be influenced by peers forward or backward by this amount. (default: %u seconds)</source> <translation>Réglage moyen maximal autorisé de décalage de l'heure d'un pair. La perspective locale du temps peut être influencée par les pairs, en avance ou en retard, de cette valeur. (Par défaut : %u secondes)</translation> </message> @@ -1839,12 +3110,24 @@ <translation>Frais totaux maximaux (en %s) à utiliser en une seule transaction de porte-monnaie ou transaction brute ; les définir trop bas pourrait interrompre les grosses transactions (par défaut : %s)</translation> </message> <message> + <source>Please check that your computer's date and time are correct! If your clock is wrong, %s will not work properly.</source> + <translation>Veuillez vérifier que l'heure et la date de votre ordinateur sont justes ! Si votre horloge n'est pas à l'heure, %s ne fonctionnera pas correctement.</translation> + </message> + <message> <source>Please contribute if you find %s useful. Visit %s for further information about the software.</source> <translation>Si vous trouvez %s utile, vous pouvez y contribuer. Vous trouverez davantage d'informations à propos du logiciel sur %s.</translation> </message> <message> + <source>Reduce storage requirements by enabling pruning (deleting) of old blocks. This allows the pruneblockchain RPC to be called to delete specific blocks, and enables automatic pruning of old blocks if a target size in MiB is provided. This mode is incompatible with -txindex and -rescan. Warning: Reverting this setting requires re-downloading the entire blockchain. (default: 0 = disable pruning blocks, 1 = allow manual pruning via RPC, >%u = automatically prune block files to stay under the specified target size in MiB)</source> + <translation>Réduire les exigences de stockage en activant l'élagage (suppression) des anciens blocs. Cela permet d'appeler le RPC « pruneblockchain » pour supprimer des blocs précis et active l'élagage automatique des anciens blocs si une taille cible en Mio est fournie. Ce mode n'est pas compatible avec -txindex et -rescan. Avertissement : ramener ce paramètre à sa valeur antérieure exige de retélécharger l'intégralité de la chaîne de blocs (par défaut : 0 = désactiver l'élagage des blocs, 1 = permettre l'élagage manuel par RPC, >%u = élaguer automatiquement les fichiers de blocs pour rester en deçà de la taille cible précisée en Mio).</translation> + </message> + <message> + <source>Set lowest fee rate (in %s/kB) for transactions to be included in block creation. (default: %s)</source> + <translation>Définir le taux minimal de frais (en %s/ko) pour les transactions à inclure dans la création de blocs (par défaut : %s)</translation> + </message> + <message> <source>Set the number of script verification threads (%u to %d, 0 = auto, <0 = leave that many cores free, default: %d)</source> - <translation>Définir le nombre d'exétrons de vérification des scripts (%u à %d, 0 = auto, < 0 = laisser ce nombre de cœurs inutilisés, par défaut : %d)</translation> + <translation>Définir le nombre de fils de vérification des scripts (%u à %d, 0 = auto, < 0 = laisser ce nombre de cœurs inutilisés, par défaut : %d)</translation> </message> <message> <source>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</source> @@ -1852,7 +3135,7 @@ </message> <message> <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source> - <translation>Ceci est une pré-version de test - l'utiliser à vos risques et périls - ne pas l'utiliser pour miner ou pour des applications marchandes</translation> + <translation>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</translation> </message> <message> <source>Unable to rewind the database to a pre-fork state. You will need to redownload the blockchain</source> @@ -1860,19 +3143,23 @@ </message> <message> <source>Use UPnP to map the listening port (default: 1 when listening and no -proxy)</source> - <translation>Utiliser l'UPnP pour mapper le port d'écoute (par défaut : 1 lors de l'écoute et pas de mandataire -proxy)</translation> + <translation>Utiliser l'UPnP pour mapper le port d'écoute (par défaut : 1 en écoute et sans -proxy)</translation> </message> <message> - <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source> - <translation>Avertissement : le réseau ne semble pas totalement d'accord ! Quelques mineurs semblent éprouver des difficultés.</translation> + <source>Username and hashed password for JSON-RPC connections. The field <userpw> comes in the format: <USERNAME>:<SALT>$<HASH>. A canonical python script is included in share/rpcuser. The client then connects normally using the rpcuser=<USERNAME>/rpcpassword=<PASSWORD> pair of arguments. This option can be specified multiple times</source> + <translation>Nom d'utilisateur et mot de passe haché pour les connexions JSON-RPC. Le champ <userpw> est au format : <USERNAME>:<SALT>$<HASH>. Un script python canonique est inclus dans share/rpcuser. Le client se connecte ensuite normalement en utilisant la paire d'arguments rpcuser=<USERNAME>/rpcpassword=<PASSWORD>. Cette option peut être spécifiée plusieurs fois.</translation> </message> <message> - <source>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</source> - <translation>Avertissement : nous ne semblons pas être en accord complet avec nos pairs ! Vous pourriez avoir besoin d'effectuer une mise à niveau, ou d'autres nœuds du réseau pourraient avoir besoin d'effectuer une mise à niveau.</translation> + <source>Wallet will not create transactions that violate mempool chain limits (default: %u)</source> + <translation>Un porte-monnaie ne créera aucune transaction qui enfreint les limites de chaîne de la réserve de mémoire (par défaut : %u)</translation> </message> <message> - <source>Whitelist peers connecting from the given netmask or IP address. Can be specified multiple times.</source> - <translation>Pairs de la liste blanche se connectant à partir du masque réseau ou de l'IP donné. Peut être spécifié plusieurs fois.</translation> + <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source> + <translation>Avertissement : le réseau ne semble pas totalement d'accord ! Certains mineurs semblent éprouver des problèmes.</translation> + </message> + <message> + <source>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</source> + <translation>Avertissement : nous ne semblons pas être en accord complet avec nos pairs ! Une mise à niveau pourrait être nécessaire pour vous ou pour d'autres nœuds du réseau.</translation> </message> <message> <source>You need to rebuild the database using -reindex-chainstate to change -txindex</source> @@ -1896,23 +3183,23 @@ </message> <message> <source>Attempt to recover private keys from a corrupt wallet on startup</source> - <translation>Tenter de récupérer les clefs privées d'un porte-monnaie corrompu lors du démarrage</translation> + <translation>Tenter de récupérer les clés privées d'un porte-monnaie corrompu lors du démarrage</translation> </message> <message> <source>Block creation options:</source> - <translation>Options de création de bloc :</translation> + <translation>Options de création de blocs :</translation> </message> <message> <source>Cannot resolve -%s address: '%s'</source> <translation>Impossible de résoudre l'adresse -%s : « %s »</translation> </message> <message> - <source>Change index out of range</source> - <translation>L'index de changement est hors échelle</translation> + <source>Chain selection options:</source> + <translation>Options de sélection de la chaîne :</translation> </message> <message> - <source>Connect only to the specified node(s)</source> - <translation>Ne se connecter qu'au(x) nœud(s) spécifié(s)</translation> + <source>Change index out of range</source> + <translation>L'index de changement est hors échelle</translation> </message> <message> <source>Connection options:</source> @@ -1924,7 +3211,7 @@ </message> <message> <source>Corrupted block database detected</source> - <translation>Base corrompue de données des blocs détectée</translation> + <translation>Une base de données de blocs corrompue a été détectée</translation> </message> <message> <source>Debugging/Testing options:</source> @@ -1936,7 +3223,7 @@ </message> <message> <source>Do you want to rebuild the block database now?</source> - <translation>Voulez-vous reconstruire la base de données des blocs maintenant ?</translation> + <translation>Voulez-vous reconstruire la base de données de blocs maintenant ?</translation> </message> <message> <source>Enable publish hash block in <address></source> @@ -1955,24 +3242,28 @@ <translation>Activer la publication de la transaction brute dans <address></translation> </message> <message> + <source>Enable transaction replacement in the memory pool (default: %u)</source> + <translation>Activer le remplacement de transactions dans la réserve de mémoire (par défaut : %u)</translation> + </message> + <message> <source>Error initializing block database</source> - <translation>Erreur lors de l'initialisation de la base de données des blocs</translation> + <translation>Erreur d'initialisation de la base de données de blocs</translation> </message> <message> <source>Error initializing wallet database environment %s!</source> - <translation>Erreur lors de l'initialisation de l'environnement de la base de données du porte-monnaie %s !</translation> + <translation>Erreur d'initialisation de l'environnement de la base de données du porte-monnaie %s !</translation> </message> <message> <source>Error loading %s</source> - <translation>Erreur lors du chargement de %s</translation> + <translation>Erreur de chargement de %s</translation> </message> <message> <source>Error loading %s: Wallet corrupted</source> - <translation>Erreur lors du chargement de %s : porte-monnaie corrompu</translation> + <translation>Erreur de chargement de %s : porte-monnaie corrompu</translation> </message> <message> <source>Error loading %s: Wallet requires newer version of %s</source> - <translation>Erreur lors du chargement de %s : le porte-monnaie exige une version plus récente de %s</translation> + <translation>Erreur de chargement de %s : le porte-monnaie exige une version plus récente de %s</translation> </message> <message> <source>Error loading %s: You can't disable HD on a already existing HD wallet</source> @@ -1980,11 +3271,11 @@ </message> <message> <source>Error loading block database</source> - <translation>Erreur du chargement de la base de données des blocs</translation> + <translation>Erreur de chargement de la base de données de blocs</translation> </message> <message> <source>Error opening block database</source> - <translation>Erreur lors de l'ouverture de la base de données des blocs</translation> + <translation>Erreur d'ouverture de la base de données de blocs</translation> </message> <message> <source>Error: Disk space is low!</source> @@ -1992,7 +3283,7 @@ </message> <message> <source>Failed to listen on any port. Use -listen=0 if you want this.</source> - <translation>Échec de l'écoute sur un port quelconque. Utilisez -listen=0 si vous voulez ceci.</translation> + <translation>Échec d'écoute sur un port quelconque. Utiliser -listen=0 si vous le voulez.</translation> </message> <message> <source>Importing...</source> @@ -2000,7 +3291,11 @@ </message> <message> <source>Incorrect or no genesis block found. Wrong datadir for network?</source> - <translation>Bloc de genèse incorrect ou introuvable. Mauvais répertoire de données pour le réseau ?</translation> + <translation>Bloc de genèse incorrect ou introuvable. Mauvais datadir pour le réseau ?</translation> + </message> + <message> + <source>Initialization sanity check failed. %s is shutting down.</source> + <translation>L'initialisation du test de cohérence a échoué. %s est en cours de fermeture. </translation> </message> <message> <source>Invalid -onion address: '%s'</source> @@ -2027,10 +3322,6 @@ <translation>Emplacement du fichier témoin auth (par défaut : data dir)</translation> </message> <message> - <source>Minimum bytes per sigop in transactions we relay and mine (default: %u)</source> - <translation>Octets minimaux par sigop dans les transactions que nous relayons et minons (par défaut : %u)</translation> - </message> - <message> <source>Not enough file descriptors available.</source> <translation>Pas assez de descripteurs de fichiers proposés.</translation> </message> @@ -2068,11 +3359,7 @@ </message> <message> <source>Set database cache size in megabytes (%d to %d, default: %d)</source> - <translation>Définir la taille du cache de la base de données en mégaoctets (%d to %d, default: %d)</translation> - </message> - <message> - <source>Set maximum block cost (default: %d)</source> - <translation>Définir le coût maximal de bloc (par défaut : %d)</translation> + <translation>Définir la taille du cache de la base de données en mégaoctets (%d à %d, default: %d)</translation> </message> <message> <source>Set maximum block size in bytes (default: %d)</source> @@ -2087,6 +3374,10 @@ <translation>Le code source est disponible sur %s.</translation> </message> <message> + <source>Unable to bind to %s on this computer. %s is probably already running.</source> + <translation>Impossible de se lier à %s sur cet ordinateur. %s fonctionne probablement déjà.</translation> + </message> + <message> <source>Unsupported argument -benchmark ignored, use -debug=bench.</source> <translation>Argument non pris en charge -benchmark ignoré, utiliser -debug=bench.</translation> </message> @@ -2103,16 +3394,20 @@ <translation>Utiliser l'UPnP pour mapper le port d'écoute (par défaut : %u)</translation> </message> <message> + <source>Use the test chain</source> + <translation>Utiliser la chaîne de test</translation> + </message> + <message> <source>User Agent comment (%s) contains unsafe characters.</source> <translation>Le commentaire d'agent utilisateur (%s) contient des caractères dangereux.</translation> </message> <message> <source>Verifying blocks...</source> - <translation>Vérification des blocs en cours...</translation> + <translation>Vérification des blocs... </translation> </message> <message> <source>Verifying wallet...</source> - <translation>Vérification du porte-monnaie en cours...</translation> + <translation>Vérification du porte-monnaie...</translation> </message> <message> <source>Wallet %s resides outside data directory %s</source> @@ -2123,6 +3418,10 @@ <translation>Options de débogage/de test du porte-monnaie :</translation> </message> <message> + <source>Wallet needed to be rewritten: restart %s to complete</source> + <translation>Le porte-monnaie devait être réécrit : redémarrer %s pour terminer l'opération.</translation> + </message> + <message> <source>Wallet options:</source> <translation>Options du porte-monnaie :</translation> </message> @@ -2152,7 +3451,7 @@ </message> <message> <source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source> - <translation>Exécuter une commande lorsqu'une alerte pertinente est reçue ou si nous voyons une bifurcation vraiment étendue (%s dans la commande est remplacé par le message)</translation> + <translation>Exécuter une commande lorsqu'une alerte pertinente est reçue, ou si nous voyons une bifurcation vraiment étendue (%s dans la commande est remplacé par le message)</translation> </message> <message> <source>Fees (in %s/kB) smaller than this are considered zero fee for relaying, mining and transaction creation (default: %s)</source> @@ -2171,28 +3470,20 @@ <translation>Quantité maximale de données dans les transactions du porteur de données que nous relayons et minons (par défaut : %u)</translation> </message> <message> - <source>Query for peer addresses via DNS lookup, if low on addresses (default: 1 unless -connect)</source> - <translation>Demander les adresses des pairs par recherche DNS si l'on manque d'adresses (par défaut : 1 sauf si -connect)</translation> - </message> - <message> <source>Randomize credentials for every proxy connection. This enables Tor stream isolation (default: %u)</source> - <translation>Aléer les authentifiants pour chaque connexion mandataire. Ceci active l'isolement de flux de Tor (par défaut : %u) </translation> + <translation>Aléer les authentifiants pour chaque connexion mandataire. Cela active l'isolement de flux de Tor (par défaut : %u) </translation> </message> <message> <source>Set maximum size of high-priority/low-fee transactions in bytes (default: %d)</source> - <translation>Définir la taille maximale en octets des transactions prioritaires/à frais modiques (par défaut : %d)</translation> + <translation>Définir la taille maximale en octets des transactions à priorité élevée et frais modiques (par défaut : %d)</translation> </message> <message> <source>The transaction amount is too small to send after the fee has been deducted</source> <translation>Le montant de la transaction est trop bas pour être envoyé une fois que les frais ont été déduits</translation> </message> <message> - <source>This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit <https://www.openssl.org/> and cryptographic software written by Eric Young and UPnP software written by Thomas Bernard.</source> - <translation>Ce produit comprend des logiciels développés par le projet OpenSSL pour être utilisés dans la boîte à outils OpenSSL <https://www.openssl.org/> et un logiciel cryptographique écrit par Eric Young, ainsi qu'un logiciel UPnP écrit par Thomas Bernard.</translation> - </message> - <message> <source>Use hierarchical deterministic key generation (HD) after BIP32. Only has effect during wallet creation/first start</source> - <translation>Utiliser une génération de clef hiérarchique déterministe (HD) après BIP32. N'a d'effet que lors de la création/premier lancement du porte-monnaie</translation> + <translation>Utiliser une génération de clé hiérarchique déterministe (HD) après BIP32. N'a d'effet que lors de la création ou du lancement intitial du porte-monnaie</translation> </message> <message> <source>Whitelisted peers cannot be DoS banned and their transactions are always relayed, even if they are already in the mempool, useful e.g. for a gateway</source> @@ -2200,7 +3491,7 @@ </message> <message> <source>You need to rebuild the database using -reindex to go back to unpruned mode. This will redownload the entire blockchain</source> - <translation>Vous devez reconstruire la base de données en utilisant -reindex afin de revenir au mode sans élagage. Ceci retéléchargera complètement la chaîne de blocs.</translation> + <translation>Vous devez reconstruire la base de données en utilisant -reindex afin de revenir au mode sans élagage. Cela retéléchargera complètement la chaîne de blocs.</translation> </message> <message> <source>(default: %u)</source> @@ -2224,7 +3515,7 @@ </message> <message> <source>Imports blocks from external blk000??.dat file on startup</source> - <translation>Importe des blocs depuis un fichier blk000??.dat externe lors du démarrage</translation> + <translation>Importe des blocs à partir d'un fichier blk000??.dat externe lors du démarrage</translation> </message> <message> <source>Information</source> @@ -2264,7 +3555,7 @@ </message> <message> <source>Send trace/debug info to console instead of debug.log file</source> - <translation>Envoyer les informations de débogage/trace à la console au lieu du fichier debug.log</translation> + <translation>Envoyer les infos de débogage/trace à la console au lieu du fichier debug.log</translation> </message> <message> <source>Send transactions as zero-fee transactions if possible (default: %u)</source> @@ -2276,11 +3567,11 @@ </message> <message> <source>Shrink debug.log file on client startup (default: 1 when no -debug)</source> - <translation>Réduire le fichier debug.log lors du démarrage du client (par défaut : 1 lorsque -debug n'est pas présent)</translation> + <translation>Réduire le fichier debug.log lors du démarrage du client (par défaut : 1 sans -debug)</translation> </message> <message> <source>Signing transaction failed</source> - <translation>La signature de la transaction a échoué</translation> + <translation>Échec de signature de la transaction</translation> </message> <message> <source>The transaction amount is too small to pay the fee</source> @@ -2300,11 +3591,7 @@ </message> <message> <source>Transaction amount too small</source> - <translation>Montant de la transaction trop bas</translation> - </message> - <message> - <source>Transaction amounts must be positive</source> - <translation>Les montants de transaction doivent être positifs</translation> + <translation>Le montant de la transaction est trop bas</translation> </message> <message> <source>Transaction too large for fee policy</source> @@ -2312,7 +3599,7 @@ </message> <message> <source>Transaction too large</source> - <translation>Transaction trop volumineuse</translation> + <translation>La transaction est trop grosse</translation> </message> <message> <source>Unable to bind to %s on this computer (bind returned error %s)</source> @@ -2364,25 +3651,29 @@ </message> <message> <source>(1 = keep tx meta data e.g. account owner and payment request information, 2 = drop tx meta data)</source> - <translation>(1 = conserver les métadonnées de transmission, par ex. les informations du propriétaire du compte et de la demande de paiement, 2 = abandonner les métadonnées de transmission)</translation> + <translation>(1 = conserver les métadonnées de transmission, p. ex. les informations du propriétaire du compte et de demande de paiement, 2 = abandonner les métadonnées de transmission)</translation> </message> <message> <source>-maxtxfee is set very high! Fees this large could be paid on a single transaction.</source> - <translation>-maxtxfee est défini très haut ! Des frais aussi élevés pourraient être payés en une seule transaction.</translation> - </message> - <message> - <source>-paytxfee is set very high! This is the transaction fee you will pay if you send a transaction.</source> - <translation>-paytxfee est réglé sur un montant très élevé ! Il s'agit des frais de transaction que vous payerez si vous envoyez une transaction.</translation> + <translation>La valeur -maxtxfee est très élevée ! Des frais aussi élevés pourraient être payés en une seule transaction.</translation> </message> <message> <source>Do not keep transactions in the mempool longer than <n> hours (default: %u)</source> <translation>Ne pas conserver de transactions dans la réserve de mémoire plus de <n> heures (par défaut : %u)</translation> </message> <message> + <source>Equivalent bytes per sigop in transactions for relay and mining (default: %u)</source> + <translation>Octets équivalents par sigop dans les transactions pour relayer et miner (par défaut : %u)</translation> + </message> + <message> <source>Fees (in %s/kB) smaller than this are considered zero fee for transaction creation (default: %s)</source> <translation>Les frais (en %s/Ko) inférieurs à ce seuil sont considérés comme étant nuls pour la création de transactions (par défaut : %s)</translation> </message> <message> + <source>Force relay of transactions from whitelisted peers even if they violate local relay policy (default: %d)</source> + <translation>Forcer le relais de transactions des pairs de la liste blanche même s'ils transgressent la politique locale de relais (par défaut : %d)</translation> + </message> + <message> <source>How thorough the block verification of -checkblocks is (0-4, default: %u)</source> <translation>Degré de profondeur de la vérification des blocs -checkblocks (0-4, par défaut : %u)</translation> </message> @@ -2396,13 +3687,29 @@ </message> <message> <source>Output debugging information (default: %u, supplying <category> is optional)</source> - <translation>Extraire les informations de débogage (par défaut : %u, fournir <category> est optionnel)</translation> + <translation>Extraire les informations de débogage (par défaut : %u, fournir <category> est facultatif)</translation> + </message> + <message> + <source>Query for peer addresses via DNS lookup, if low on addresses (default: 1 unless -connect/-noconnect)</source> + <translation>Requête d'adresses de paires par recherche DNS, si il y a peu d'adresses (par défaut : 1 sauf si -connect/-noconnect)</translation> + </message> + <message> + <source>Sets the serialization of raw transaction or block hex returned in non-verbose mode, non-segwit(0) or segwit(1) (default: %d)</source> + <translation>Définit la sérialisation de la transaction brute ou les données hexa de bloc retournées en mode non-verbose, non-segwit(0) ou segwit(1) (par défaut : %d)</translation> </message> <message> <source>Support filtering of blocks and transaction with bloom filters (default: %u)</source> <translation>Prendre en charge le filtrage des blocs et des transactions avec les filtres bloom (par défaut : %u)</translation> </message> <message> + <source>This is the transaction fee you may pay when fee estimates are not available.</source> + <translation>Il s'agit des frais de transaction que vous pourriez payer si aucune estimation de frais n'est proposée.</translation> + </message> + <message> + <source>This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit %s and cryptographic software written by Eric Young and UPnP software written by Thomas Bernard.</source> + <translation>Ce produit comprend des logiciels développés par le Projet OpenSSL pour être utilisés dans la boîte à outils OpenSSL %s, et un logiciel cryptographique écrit par Eric Young, ainsi qu'un logiciel UPnP écrit par Thomas Bernard.</translation> + </message> + <message> <source>Total length of network version string (%i) exceeds maximum length (%i). Reduce the number or size of uacomments.</source> <translation>La taille totale de la chaîne de version de réseau (%i) dépasse la longueur maximale (%i). Réduire le nombre ou la taille des commentaires uacomments.</translation> </message> @@ -2423,10 +3730,6 @@ <translation>Utiliser un serveur mandataire SOCKS5 séparé pour atteindre les pairs par les services cachés de Tor (par défaut : %s)</translation> </message> <message> - <source>Username and hashed password for JSON-RPC connections. The field <userpw> comes in the format: <USERNAME>:<SALT>$<HASH>. A canonical python script is included in share/rpcuser. This option can be specified multiple times</source> - <translation>Nom d'utilisateur et mot de passe haché pour les connexions JSON-RPC. Le champ <userpw> vient au format : <USERNAME>:<SALT>$<HASH>. Un script python canonique est inclus dans share/rpcuser. Cette option peut être spécifiée plusieurs fois.</translation> - </message> - <message> <source>Warning: Unknown block versions being mined! It's possible unknown rules are in effect</source> <translation>Avertissement : des versions de blocs inconnues sont minées ! Il est possible que des règles inconnues soient en vigeur</translation> </message> @@ -2435,6 +3738,14 @@ <translation>Avertissement : le fichier du porte-monnaie est corrompu, les données ont été récupérées ! Le fichier %s original a été enregistré en tant que %s dans %s ; si votre solde ou vos transactions sont incorrects, vous devriez restaurer une sauvegarde.</translation> </message> <message> + <source>Whitelist peers connecting from the given IP address (e.g. 1.2.3.4) or CIDR notated network (e.g. 1.2.3.0/24). Can be specified multiple times.</source> + <translation>Pairs de la liste blanche se connectant à partir de l'adresse IP donnée (p. ex. 1.2.3.4) ou du réseau noté CIDR (p. ex. 1.2.3.0/24). Peut être spécifié plusieurs fois.</translation> + </message> + <message> + <source>%s is set very high!</source> + <translation>La valeur %s est très élevée !</translation> + </message> + <message> <source>(default: %s)</source> <translation>(par défaut : %s)</translation> </message> @@ -2455,6 +3766,10 @@ <translation>Adresse -proxy invalide : « %s »</translation> </message> <message> + <source>Keypool ran out, please call keypoolrefill first</source> + <translation>La réserve de clés est épuisée, veuillez d'abord appeler « keypoolrefill »</translation> + </message> + <message> <source>Listen for JSON-RPC connections on <port> (default: %u or testnet: %u)</source> <translation>Écouter les connexions JSON-RPC sur <port> (par défaut : %u ou tesnet : %u)</translation> </message> @@ -2491,16 +3806,20 @@ <translation>Relayer les multisignatures non-P2SH (par défaut : %u)</translation> </message> <message> + <source>Send transactions with full-RBF opt-in enabled (default: %u)</source> + <translation>Envoyer des transactions avec « RBF opt-in » complet activé (par défaut : %u)</translation> + </message> + <message> <source>Set key pool size to <n> (default: %u)</source> - <translation>Définir la taille de la réserve de clefs à <n> (par défaut : %u)</translation> + <translation>Définir la taille de la réserve de clés à <n> (par défaut : %u)</translation> </message> <message> - <source>Set minimum block size in bytes (default: %u)</source> - <translation>Définir la taille de bloc minimale en octets (par défaut : %u)</translation> + <source>Set maximum BIP141 block weight (default: %d)</source> + <translation>Définir le poids maximal de bloc BIP141 (par défaut : %d)</translation> </message> <message> <source>Set the number of threads to service RPC calls (default: %d)</source> - <translation>Définir le nombre d'exétrons pour desservir les appels RPC (par défaut : %d)</translation> + <translation>Définir le nombre de fils pour les appels RPC (par défaut : %d)</translation> </message> <message> <source>Specify configuration file (default: %s)</source> @@ -2519,12 +3838,40 @@ <translation>Dépenser la monnaie non confirmée lors de l'envoi de transactions (par défaut : %u)</translation> </message> <message> + <source>Starting network threads...</source> + <translation>Démarrage des processus réseau...</translation> + </message> + <message> + <source>The wallet will avoid paying less than the minimum relay fee.</source> + <translation>Le porte-monnaie évitera de payer moins que les frais minimaux de relais. </translation> + </message> + <message> + <source>This is the minimum transaction fee you pay on every transaction.</source> + <translation>Il s'agit des frais minimaux que vous payez pour chaque transaction. </translation> + </message> + <message> + <source>This is the transaction fee you will pay if you send a transaction.</source> + <translation>Il s'agit des frais minimaux que vous payez si vous envoyez une transaction.</translation> + </message> + <message> <source>Threshold for disconnecting misbehaving peers (default: %u)</source> <translation>Seuil de déconnexion des pairs présentant un mauvais comportement (par défaut : %u)</translation> </message> <message> + <source>Transaction amounts must not be negative</source> + <translation>Les montants transactionnels ne doivent pas être négatifs</translation> + </message> + <message> + <source>Transaction has too long of a mempool chain</source> + <translation>La chaîne de la réserve de mémoire de la transaction est trop longue</translation> + </message> + <message> + <source>Transaction must have at least one recipient</source> + <translation>La transaction doit comporter au moins un destinataire</translation> + </message> + <message> <source>Unknown network specified in -onlynet: '%s'</source> - <translation>Réseau inconnu spécifié sur -onlynet : « %s »</translation> + <translation>Réseau inconnu spécifié dans -onlynet : « %s »</translation> </message> <message> <source>Insufficient funds</source> diff --git a/src/qt/locale/bitcoin_fr_CA.ts b/src/qt/locale/bitcoin_fr_CA.ts index fca1e62883..02701cbf1d 100644 --- a/src/qt/locale/bitcoin_fr_CA.ts +++ b/src/qt/locale/bitcoin_fr_CA.ts @@ -13,7 +13,10 @@ <source>&Delete</source> <translation>&Supprimer</translation> </message> -</context> + </context> +<context> + <name>AddressTableModel</name> + </context> <context> <name>AskPassphraseDialog</name> <message> @@ -28,7 +31,7 @@ <source>Repeat new passphrase</source> <translation>Répéter Mot de Passe</translation> </message> -</context> + </context> <context> <name>BanTableModel</name> </context> @@ -52,7 +55,7 @@ <source>&Address</source> <translation>Addresse</translation> </message> -</context> + </context> <context> <name>FreespaceChecker</name> </context> @@ -67,6 +70,9 @@ </message> </context> <context> + <name>ModalOverlay</name> + </context> +<context> <name>OpenURIDialog</name> </context> <context> @@ -76,12 +82,21 @@ <name>OverviewPage</name> </context> <context> + <name>PaymentServer</name> + </context> +<context> <name>PeerTableModel</name> </context> <context> <name>QObject</name> </context> <context> + <name>QObject::QObject</name> + </context> +<context> + <name>QRImageWidget</name> + </context> +<context> <name>RPCConsole</name> </context> <context> @@ -91,12 +106,18 @@ <name>ReceiveRequestDialog</name> </context> <context> + <name>RecentRequestsTableModel</name> + </context> +<context> <name>SendCoinsDialog</name> </context> <context> <name>SendCoinsEntry</name> </context> <context> + <name>SendConfirmationDialog</name> + </context> +<context> <name>ShutdownWindow</name> </context> <context> @@ -109,12 +130,30 @@ <name>TrafficGraphWidget</name> </context> <context> + <name>TransactionDesc</name> + </context> +<context> <name>TransactionDescDialog</name> </context> <context> + <name>TransactionTableModel</name> + </context> +<context> + <name>TransactionView</name> + </context> +<context> <name>UnitDisplayStatusBarControl</name> </context> <context> + <name>WalletFrame</name> + </context> +<context> + <name>WalletModel</name> + </context> +<context> + <name>WalletView</name> + </context> +<context> <name>bitcoin-core</name> </context> </TS>
\ No newline at end of file diff --git a/src/qt/locale/bitcoin_fr_FR.ts b/src/qt/locale/bitcoin_fr_FR.ts index a6f6ac4fd1..4d02aa5114 100644 --- a/src/qt/locale/bitcoin_fr_FR.ts +++ b/src/qt/locale/bitcoin_fr_FR.ts @@ -41,7 +41,10 @@ <source>&Delete</source> <translation>&Supprimer</translation> </message> -</context> + </context> +<context> + <name>AddressTableModel</name> + </context> <context> <name>AskPassphraseDialog</name> <message> @@ -60,7 +63,7 @@ <source>Repeat new passphrase</source> <translation>Répétez la phrase de passe</translation> </message> -</context> + </context> <context> <name>BanTableModel</name> <message> @@ -259,30 +262,6 @@ <translation>Indexation des blocs sur le disque...</translation> </message> <message> - <source>No block source available...</source> - <translation>Aucun bloc source disponible</translation> - </message> - <message numerus="yes"> - <source>%n hour(s)</source> - <translation><numerusform>%n heure</numerusform><numerusform>%n heures</numerusform></translation> - </message> - <message numerus="yes"> - <source>%n day(s)</source> - <translation><numerusform>%n jour</numerusform><numerusform>%n jours</numerusform></translation> - </message> - <message numerus="yes"> - <source>%n week(s)</source> - <translation><numerusform>%n semaine</numerusform><numerusform>%n semaines</numerusform></translation> - </message> - <message> - <source>%1 and %2</source> - <translation>%1 et %2</translation> - </message> - <message numerus="yes"> - <source>%n year(s)</source> - <translation><numerusform>%n an</numerusform><numerusform>%n années</numerusform></translation> - </message> - <message> <source>%1 behind</source> <translation>en retard de %1</translation> </message> @@ -364,7 +343,7 @@ <source>Wallet is <b>encrypted</b> and currently <b>locked</b></source> <translation>Le porte-monnaie est <b>chiffré</b> et est actuellement <b>verrouillé</b></translation> </message> -</context> + </context> <context> <name>CoinControlDialog</name> <message> @@ -384,10 +363,6 @@ <translation>Montant :</translation> </message> <message> - <source>Priority:</source> - <translation>Priorité:</translation> - </message> - <message> <source>Fee:</source> <translation>Frais:</translation> </message> @@ -439,11 +414,7 @@ <source>Confirmed</source> <translation>Confirmée</translation> </message> - <message> - <source>Priority</source> - <translation>Priorité</translation> - </message> -</context> + </context> <context> <name>EditAddressDialog</name> <message> @@ -458,7 +429,7 @@ <source>&Address</source> <translation>&Adresse</translation> </message> -</context> + </context> <context> <name>FreespaceChecker</name> <message> @@ -549,6 +520,17 @@ </message> </context> <context> + <name>ModalOverlay</name> + <message> + <source>Form</source> + <translation>Formulaire</translation> + </message> + <message> + <source>Hide</source> + <translation>Cacher</translation> + </message> + </context> +<context> <name>OpenURIDialog</name> <message> <source>Open URI</source> @@ -566,7 +548,7 @@ <source>Select payment request file</source> <translation>Sélectionner un fichier de demande de paiement</translation> </message> -</context> + </context> <context> <name>OptionsDialog</name> <message> @@ -754,6 +736,9 @@ </message> </context> <context> + <name>PaymentServer</name> + </context> +<context> <name>PeerTableModel</name> <message> <source>User Agent</source> @@ -763,11 +748,7 @@ <source>Node/Service</source> <translation>Nœud/Service </translation> </message> - <message> - <source>Ping Time</source> - <translation>Temps du ping</translation> - </message> -</context> + </context> <context> <name>QObject</name> <message> @@ -806,7 +787,17 @@ <source>%1 ms</source> <translation>%1 ms</translation> </message> -</context> + <message> + <source>%1 and %2</source> + <translation>%1 et %2</translation> + </message> + </context> +<context> + <name>QObject::QObject</name> + </context> +<context> + <name>QRImageWidget</name> + </context> <context> <name>RPCConsole</name> <message> @@ -1064,7 +1055,7 @@ <source>Remove</source> <translation>Retirer</translation> </message> -</context> + </context> <context> <name>ReceiveRequestDialog</name> <message> @@ -1083,7 +1074,10 @@ <source>&Save Image...</source> <translation>&Sauvegarder image</translation> </message> -</context> + </context> +<context> + <name>RecentRequestsTableModel</name> + </context> <context> <name>SendCoinsDialog</name> <message> @@ -1115,10 +1109,6 @@ <translation>Montant :</translation> </message> <message> - <source>Priority:</source> - <translation>Priorité:</translation> - </message> - <message> <source>Fee:</source> <translation>Frais:</translation> </message> @@ -1155,10 +1145,6 @@ <translation>Recommandé: </translation> </message> <message> - <source>Confirmation time:</source> - <translation>Temps de confirmation:</translation> - </message> - <message> <source>normal</source> <translation>normal</translation> </message> @@ -1190,6 +1176,10 @@ <source>Confirm the send action</source> <translation>Confirmer l'action d'envoi</translation> </message> + <message> + <source>S&end</source> + <translation>E&voyer</translation> + </message> </context> <context> <name>SendCoinsEntry</name> @@ -1241,7 +1231,10 @@ <source>Memo:</source> <translation>Memo:</translation> </message> -</context> + </context> +<context> + <name>SendConfirmationDialog</name> + </context> <context> <name>ShutdownWindow</name> </context> @@ -1311,16 +1304,34 @@ </message> </context> <context> + <name>TransactionDesc</name> + </context> +<context> <name>TransactionDescDialog</name> <message> <source>This pane shows a detailed description of the transaction</source> <translation>Ce panneau affiche une description détaillée de la transaction</translation> </message> -</context> + </context> +<context> + <name>TransactionTableModel</name> + </context> +<context> + <name>TransactionView</name> + </context> <context> <name>UnitDisplayStatusBarControl</name> </context> <context> + <name>WalletFrame</name> + </context> +<context> + <name>WalletModel</name> + </context> +<context> + <name>WalletView</name> + </context> +<context> <name>bitcoin-core</name> <message> <source>Options:</source> @@ -1420,10 +1431,6 @@ Importation ...</translation> <translation>Montant de la transaction trop bas</translation> </message> <message> - <source>Transaction amounts must be positive</source> - <translation>Les montants de la transaction doivent être positif</translation> - </message> - <message> <source>Transaction too large for fee policy</source> <translation>Montant de la transaction trop élevé pour la politique de frais</translation> </message> diff --git a/src/qt/locale/bitcoin_gl.ts b/src/qt/locale/bitcoin_gl.ts index 9aa7b55096..ff0804d79b 100644 --- a/src/qt/locale/bitcoin_gl.ts +++ b/src/qt/locale/bitcoin_gl.ts @@ -37,7 +37,10 @@ <source>&Delete</source> <translation>&Borrar</translation> </message> -</context> + </context> +<context> + <name>AddressTableModel</name> + </context> <context> <name>AskPassphraseDialog</name> <message> @@ -56,7 +59,7 @@ <source>Repeat new passphrase</source> <translation>Repite novo contrasinal</translation> </message> -</context> + </context> <context> <name>BanTableModel</name> </context> @@ -223,10 +226,6 @@ <translation>Opcións da liña de comandos</translation> </message> <message> - <source>No block source available...</source> - <translation>Non hai orixe de bloques dispoñible...</translation> - </message> - <message> <source>%1 behind</source> <translation>%1 detrás</translation> </message> @@ -274,7 +273,7 @@ <source>Wallet is <b>encrypted</b> and currently <b>locked</b></source> <translation>O moedeiro está <b>encriptado</b> e actualmente <b>bloqueado</b></translation> </message> -</context> + </context> <context> <name>CoinControlDialog</name> <message> @@ -290,10 +289,6 @@ <translation>Importe:</translation> </message> <message> - <source>Priority:</source> - <translation>Prioridade:</translation> - </message> - <message> <source>Fee:</source> <translation>Pago:</translation> </message> @@ -329,11 +324,7 @@ <source>Confirmed</source> <translation>Confirmado</translation> </message> - <message> - <source>Priority</source> - <translation>Prioridade</translation> - </message> -</context> + </context> <context> <name>EditAddressDialog</name> <message> @@ -356,7 +347,7 @@ <source>&Address</source> <translation>&Dirección</translation> </message> -</context> + </context> <context> <name>FreespaceChecker</name> <message> @@ -419,6 +410,17 @@ </message> </context> <context> + <name>ModalOverlay</name> + <message> + <source>Form</source> + <translation>Formulario</translation> + </message> + <message> + <source>Last block time</source> + <translation>Hora do último bloque</translation> + </message> + </context> +<context> <name>OpenURIDialog</name> <message> <source>Open URI</source> @@ -436,7 +438,7 @@ <source>Select payment request file</source> <translation>Seleccionar ficheiro de solicitude de pago</translation> </message> -</context> + </context> <context> <name>OptionsDialog</name> <message> @@ -572,6 +574,9 @@ </message> </context> <context> + <name>PaymentServer</name> + </context> +<context> <name>PeerTableModel</name> </context> <context> @@ -594,6 +599,12 @@ </message> </context> <context> + <name>QObject::QObject</name> + </context> +<context> + <name>QRImageWidget</name> + </context> +<context> <name>RPCConsole</name> <message> <source>N/A</source> @@ -749,7 +760,10 @@ <source>&Save Image...</source> <translation>&Gardar Imaxe...</translation> </message> -</context> + </context> +<context> + <name>RecentRequestsTableModel</name> + </context> <context> <name>SendCoinsDialog</name> <message> @@ -773,10 +787,6 @@ <translation>Importe:</translation> </message> <message> - <source>Priority:</source> - <translation>Prioridade:</translation> - </message> - <message> <source>Fee:</source> <translation>Pago:</translation> </message> @@ -816,7 +826,7 @@ <source>S&end</source> <translation>&Enviar</translation> </message> -</context> + </context> <context> <name>SendCoinsEntry</name> <message> @@ -871,7 +881,10 @@ <source>Memo:</source> <translation>Memo:</translation> </message> -</context> + </context> +<context> + <name>SendConfirmationDialog</name> + </context> <context> <name>ShutdownWindow</name> </context> @@ -945,7 +958,7 @@ <source>Reset all verify message fields</source> <translation>Restaurar todos os campos de verificación de mensaxe</translation> </message> -</context> + </context> <context> <name>SplashScreen</name> <message> @@ -961,16 +974,34 @@ </message> </context> <context> + <name>TransactionDesc</name> + </context> +<context> <name>TransactionDescDialog</name> <message> <source>This pane shows a detailed description of the transaction</source> <translation>Este panel amosa unha descripción detallada da transacción</translation> </message> -</context> + </context> +<context> + <name>TransactionTableModel</name> + </context> +<context> + <name>TransactionView</name> + </context> <context> <name>UnitDisplayStatusBarControl</name> </context> <context> + <name>WalletFrame</name> + </context> +<context> + <name>WalletModel</name> + </context> +<context> + <name>WalletView</name> + </context> +<context> <name>bitcoin-core</name> <message> <source>Options:</source> @@ -997,10 +1028,6 @@ <translation>Executar no fondo como un demo e aceptar comandos</translation> </message> <message> - <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> - <translation>Aceptar conexións de fóra (por defecto: 1 se non -proxy ou -connect)</translation> - </message> - <message> <source>Bitcoin Core</source> <translation>Core de Bitcoin</translation> </message> @@ -1013,18 +1040,6 @@ <translation>Executar comando cando unha transacción do moedeiro cambia (%s no comando é substituído por TxID)</translation> </message> <message> - <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source> - <translation>Esta é unha build de test pre-lanzamento - emprégaa baixo o teu propio risco - non empregar para minado ou aplicacións de comerciantes</translation> - </message> - <message> - <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source> - <translation>Precaución: A rede non parece estar totalmente de acordo! Algúns mineitos parecen estar experimentando problemas.</translation> - </message> - <message> - <source>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</source> - <translation>Precaución: Non parece que esteamos totalmente de acordo cos nosos pares! Pode que precises actualizar, ou outros nodos poden precisar actualizarse.</translation> - </message> - <message> <source><category> can be:</source> <translation><categoría> pode ser:</translation> </message> @@ -1033,10 +1048,6 @@ <translation>Opcións de creación de bloque:</translation> </message> <message> - <source>Connect only to the specified node(s)</source> - <translation>Conectar so ao(s) nodo(s) especificado(s)</translation> - </message> - <message> <source>Corrupted block database detected</source> <translation>Detectada base de datos de bloques corrupta.</translation> </message> @@ -1121,10 +1132,6 @@ <translation>A cantidade da transacción é demasiado pequena</translation> </message> <message> - <source>Transaction amounts must be positive</source> - <translation>As cantidades da transacción deben ser positivas</translation> - </message> - <message> <source>Transaction too large</source> <translation>A transacción é demasiado grande</translation> </message> diff --git a/src/qt/locale/bitcoin_he.ts b/src/qt/locale/bitcoin_he.ts index 4a293c1c3f..78ef446ff1 100644 --- a/src/qt/locale/bitcoin_he.ts +++ b/src/qt/locale/bitcoin_he.ts @@ -41,6 +41,69 @@ <source>&Delete</source> <translation>מ&חיקה</translation> </message> + <message> + <source>Choose the address to send coins to</source> + <translation>בחר את הכתובת אליה תרצה לשלוח את המטבעות</translation> + </message> + <message> + <source>Choose the address to receive coins with</source> + <translation>בחר את הכתובת בה תקבל את המטבעות</translation> + </message> + <message> + <source>C&hoose</source> + <translation>בחר</translation> + </message> + <message> + <source>Sending addresses</source> + <translation>כתובת לשליחה</translation> + </message> + <message> + <source>Receiving addresses</source> + <translation>מקבל כתובות</translation> + </message> + <message> + <source>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source> + <translation>אלה הם כתובות הביטקוין שלך לשליחת תשלומים. חשוב לבדוק את הכמות של הכתובות המקבלות לפני שליחת מטבעות</translation> + </message> + <message> + <source>These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction.</source> + <translation>אלה הן כתובות הביטקוין שלך לקבלת תשלומים. מומלץ להשתמש בכתובת חדשה לכל העברה.</translation> + </message> + <message> + <source>&Copy Address</source> + <translation>&העתק כתובת</translation> + </message> + <message> + <source>Copy &Label</source> + <translation>העתק &תוית</translation> + </message> + <message> + <source>&Edit</source> + <translation>&ערוך</translation> + </message> + <message> + <source>Exporting Failed</source> + <translation>יצוא נכשל</translation> + </message> + <message> + <source>There was an error trying to save the address list to %1. Please try again.</source> + <translation>אירעה שגיאה בעת הניסיון לשמור את רשימת הכתובת אל %1. נא לנסות שוב.</translation> + </message> +</context> +<context> + <name>AddressTableModel</name> + <message> + <source>Label</source> + <translation>תוית</translation> + </message> + <message> + <source>Address</source> + <translation>כתובת</translation> + </message> + <message> + <source>(no label)</source> + <translation>(ללא תוית)</translation> + </message> </context> <context> <name>AskPassphraseDialog</name> @@ -60,7 +123,7 @@ <source>Repeat new passphrase</source> <translation>נא לחזור על מילת הצופן החדשה</translation> </message> -</context> + </context> <context> <name>BanTableModel</name> <message> @@ -255,14 +318,6 @@ <translation>מעבד בלוקים על הדיסק...</translation> </message> <message> - <source>No block source available...</source> - <translation>אין מקור מקטעים זמין…</translation> - </message> - <message> - <source>%1 and %2</source> - <translation>%1 ו%2</translation> - </message> - <message> <source>%1 behind</source> <translation>%1 מאחור</translation> </message> @@ -310,7 +365,7 @@ <source>Wallet is <b>encrypted</b> and currently <b>locked</b></source> <translation>הארנק <b>מוצפן</b> ו<b>נעול</b> כרגע</translation> </message> -</context> + </context> <context> <name>CoinControlDialog</name> <message> @@ -330,10 +385,6 @@ <translation>סכום:</translation> </message> <message> - <source>Priority:</source> - <translation>עדיפות:</translation> - </message> - <message> <source>Fee:</source> <translation>עמלה:</translation> </message> @@ -386,10 +437,10 @@ <translation>מאושר</translation> </message> <message> - <source>Priority</source> - <translation>עדיפות</translation> + <source>(no label)</source> + <translation>(ללא תוית)</translation> </message> -</context> + </context> <context> <name>EditAddressDialog</name> <message> @@ -412,7 +463,7 @@ <source>&Address</source> <translation>&כתובת</translation> </message> -</context> + </context> <context> <name>FreespaceChecker</name> <message> @@ -467,6 +518,10 @@ <translation>התחל ממוזער</translation> </message> <message> + <source>Show splash screen on startup (default: %u)</source> + <translation>הצג מסך פתיחה בעת הפעלה (ברירת מחדל: %u)</translation> + </message> + <message> <source>Reset all settings changed in the GUI</source> <translation>איפוס כל שינויי הגדרות התצוגה</translation> </message> @@ -499,6 +554,21 @@ </message> </context> <context> + <name>ModalOverlay</name> + <message> + <source>Form</source> + <translation>טופס</translation> + </message> + <message> + <source>Last block time</source> + <translation>זמן המקטע האחרון</translation> + </message> + <message> + <source>Hide</source> + <translation>הסתר</translation> + </message> + </context> +<context> <name>OpenURIDialog</name> <message> <source>Open URI</source> @@ -516,7 +586,7 @@ <source>Select payment request file</source> <translation>בחירת קובץ בקשת תשלום</translation> </message> -</context> + </context> <context> <name>OptionsDialog</name> <message> @@ -776,16 +846,15 @@ </message> </context> <context> + <name>PaymentServer</name> + </context> +<context> <name>PeerTableModel</name> <message> <source>User Agent</source> <translation>סוכן משתמש</translation> </message> - <message> - <source>Ping Time</source> - <translation>זמן המענה</translation> - </message> -</context> + </context> <context> <name>QObject</name> <message> @@ -824,7 +893,17 @@ <source>%1 ms</source> <translation>%1 מילישניות</translation> </message> -</context> + <message> + <source>%1 and %2</source> + <translation>%1 ו%2</translation> + </message> + </context> +<context> + <name>QObject::QObject</name> + </context> +<context> + <name>QRImageWidget</name> + </context> <context> <name>RPCConsole</name> <message> @@ -1012,8 +1091,8 @@ <translation>ניקוי מסוף הבקרה</translation> </message> <message> - <source>Ban Node for</source> - <translation>חסום משתמש ל</translation> + <source>1 &hour</source> + <translation>1 שעה</translation> </message> <message> <source>1 &day</source> @@ -1150,7 +1229,7 @@ <source>Remove</source> <translation>הסרה</translation> </message> -</context> + </context> <context> <name>ReceiveRequestDialog</name> <message> @@ -1169,7 +1248,26 @@ <source>&Save Image...</source> <translation>&שמירת תמונה…</translation> </message> -</context> + <message> + <source>Address</source> + <translation>כתובת</translation> + </message> + <message> + <source>Label</source> + <translation>תוית</translation> + </message> + </context> +<context> + <name>RecentRequestsTableModel</name> + <message> + <source>Label</source> + <translation>תוית</translation> + </message> + <message> + <source>(no label)</source> + <translation>(ללא תוית)</translation> + </message> + </context> <context> <name>SendCoinsDialog</name> <message> @@ -1205,10 +1303,6 @@ <translation>סכום:</translation> </message> <message> - <source>Priority:</source> - <translation>עדיפות:</translation> - </message> - <message> <source>Fee:</source> <translation>עמלה:</translation> </message> @@ -1257,10 +1351,6 @@ <translation>מותאם אישית:</translation> </message> <message> - <source>Confirmation time:</source> - <translation>זמן האישור:</translation> - </message> - <message> <source>normal</source> <translation>רגיל</translation> </message> @@ -1300,6 +1390,10 @@ <source>S&end</source> <translation>&שליחה</translation> </message> + <message> + <source>(no label)</source> + <translation>(ללא תוית)</translation> + </message> </context> <context> <name>SendCoinsEntry</name> @@ -1367,7 +1461,10 @@ <source>Memo:</source> <translation>תזכורת:</translation> </message> -</context> + </context> +<context> + <name>SendConfirmationDialog</name> + </context> <context> <name>ShutdownWindow</name> <message> @@ -1453,7 +1550,7 @@ <source>Reset all verify message fields</source> <translation>איפוס כל שדות אימות ההודעה</translation> </message> -</context> + </context> <context> <name>SplashScreen</name> <message> @@ -1469,12 +1566,41 @@ </message> </context> <context> + <name>TransactionDesc</name> + </context> +<context> <name>TransactionDescDialog</name> <message> <source>This pane shows a detailed description of the transaction</source> <translation>חלונית זו מציגה תיאור מפורט של ההעברה</translation> </message> -</context> + </context> +<context> + <name>TransactionTableModel</name> + <message> + <source>Label</source> + <translation>תוית</translation> + </message> + <message> + <source>(no label)</source> + <translation>(ללא תוית)</translation> + </message> + </context> +<context> + <name>TransactionView</name> + <message> + <source>Label</source> + <translation>תוית</translation> + </message> + <message> + <source>Address</source> + <translation>כתובת</translation> + </message> + <message> + <source>Exporting Failed</source> + <translation>יצוא נכשל</translation> + </message> + </context> <context> <name>UnitDisplayStatusBarControl</name> <message> @@ -1483,6 +1609,15 @@ </message> </context> <context> + <name>WalletFrame</name> + </context> +<context> + <name>WalletModel</name> + </context> +<context> + <name>WalletView</name> + </context> +<context> <name>bitcoin-core</name> <message> <source>Options:</source> @@ -1513,10 +1648,6 @@ <translation>ריצה כסוכן ברקע וקבלת פקודות</translation> </message> <message> - <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> - <translation>קבלת חיבורים מבחוץ (בררת מחדל: 1 ללא -proxy או -connect)</translation> - </message> - <message> <source>Bitcoin Core</source> <translation>ליבת ביטקוין</translation> </message> @@ -1537,18 +1668,6 @@ <translation>ביצוע פקודה כאשר העברה בארנק משתנה (%s ב־cmd יוחלף ב־TxID)</translation> </message> <message> - <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source> - <translation>זוהי בניית ניסיון טרום-שחרור - השימוש בה על אחריותך - אין להשתמש לצורך כריה או יישומי מסחר</translation> - </message> - <message> - <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source> - <translation>אזהרה: נראה שלא כל הרשת מסכימה! נראה שישנם כורים שנתקלים בבעיות.</translation> - </message> - <message> - <source>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</source> - <translation>אזהרה: נראה שישנה אי־הסכמה בינינו לבין שאר העמיתים שלנו! יתכן שעדיף לשדרג או שכל שאר העמיתים צריכים לשדרג.</translation> - </message> - <message> <source><category> can be:</source> <translation><קטגוריה> יכולה להיות:</translation> </message> @@ -1561,10 +1680,6 @@ <translation>אינדקס העודף מחוץ לתחום</translation> </message> <message> - <source>Connect only to the specified node(s)</source> - <translation>התחבר רק לצמתים המצוינים</translation> - </message> - <message> <source>Connection options:</source> <translation>הגדרות חיבור:</translation> </message> @@ -1737,10 +1852,6 @@ <translation>סכום ההעברה קטן מדי</translation> </message> <message> - <source>Transaction amounts must be positive</source> - <translation>סכומי ההעברות חייבים להיות חיוביים</translation> - </message> - <message> <source>Transaction too large for fee policy</source> <translation>ההעברה גבוהה מדי עבור מדיניות העמלות</translation> </message> diff --git a/src/qt/locale/bitcoin_hi_IN.ts b/src/qt/locale/bitcoin_hi_IN.ts index 86c53b4ce3..20fbd0e0ae 100644 --- a/src/qt/locale/bitcoin_hi_IN.ts +++ b/src/qt/locale/bitcoin_hi_IN.ts @@ -13,7 +13,10 @@ <source>&Delete</source> <translation>&मिटाए !!</translation> </message> -</context> + </context> +<context> + <name>AddressTableModel</name> + </context> <context> <name>AskPassphraseDialog</name> <message> @@ -28,7 +31,7 @@ <source>Repeat new passphrase</source> <translation>दोबारा नया पहचान शब्द/अक्षर डालिए !</translation> </message> -</context> + </context> <context> <name>BanTableModel</name> </context> @@ -135,7 +138,7 @@ <source>Wallet is <b>encrypted</b> and currently <b>locked</b></source> <translation>वॉलेट एन्क्रिप्टेड है तथा अभी लॉक्ड है</translation> </message> -</context> + </context> <context> <name>CoinControlDialog</name> <message> @@ -169,7 +172,7 @@ <source>&Address</source> <translation>&पता</translation> </message> -</context> + </context> <context> <name>FreespaceChecker</name> </context> @@ -192,6 +195,13 @@ </message> </context> <context> + <name>ModalOverlay</name> + <message> + <source>Form</source> + <translation>फार्म</translation> + </message> + </context> +<context> <name>OpenURIDialog</name> </context> <context> @@ -221,6 +231,9 @@ </message> </context> <context> + <name>PaymentServer</name> + </context> +<context> <name>PeerTableModel</name> </context> <context> @@ -236,6 +249,12 @@ </message> </context> <context> + <name>QObject::QObject</name> + </context> +<context> + <name>QRImageWidget</name> + </context> +<context> <name>RPCConsole</name> <message> <source>N/A</source> @@ -266,6 +285,9 @@ </message> </context> <context> + <name>RecentRequestsTableModel</name> + </context> +<context> <name>SendCoinsDialog</name> <message> <source>Send Coins</source> @@ -320,6 +342,9 @@ </message> </context> <context> + <name>SendConfirmationDialog</name> + </context> +<context> <name>ShutdownWindow</name> </context> <context> @@ -352,16 +377,34 @@ <name>TrafficGraphWidget</name> </context> <context> + <name>TransactionDesc</name> + </context> +<context> <name>TransactionDescDialog</name> <message> <source>This pane shows a detailed description of the transaction</source> <translation> ये खिड़की आपको लेन-देन का विस्तृत विवरण देगी !</translation> </message> -</context> + </context> +<context> + <name>TransactionTableModel</name> + </context> +<context> + <name>TransactionView</name> + </context> <context> <name>UnitDisplayStatusBarControl</name> </context> <context> + <name>WalletFrame</name> + </context> +<context> + <name>WalletModel</name> + </context> +<context> + <name>WalletView</name> + </context> +<context> <name>bitcoin-core</name> <message> <source>Options:</source> diff --git a/src/qt/locale/bitcoin_hr.ts b/src/qt/locale/bitcoin_hr.ts index f5accfb0b8..3956669ad4 100644 --- a/src/qt/locale/bitcoin_hr.ts +++ b/src/qt/locale/bitcoin_hr.ts @@ -41,7 +41,34 @@ <source>&Delete</source> <translation>Iz&briši</translation> </message> -</context> + <message> + <source>Choose the address to send coins to</source> + <translation>Odaberi adresu na koju šalješ novac</translation> + </message> + <message> + <source>Choose the address to receive coins with</source> + <translation>Odaberi adresu na koju primaš novac</translation> + </message> + <message> + <source>C&hoose</source> + <translation>&Odaberi</translation> + </message> + <message> + <source>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source> + <translation>Ovo su vaše Bitcoin adrese za slanje novca. Uvijek provjerite iznos i adresu primatelja prije slanja novca.</translation> + </message> + <message> + <source>&Copy Address</source> + <translation>&Kopiraj adresu</translation> + </message> + <message> + <source>Exporting Failed</source> + <translation>Izvoz neuspješan</translation> + </message> + </context> +<context> + <name>AddressTableModel</name> + </context> <context> <name>AskPassphraseDialog</name> <message> @@ -60,7 +87,7 @@ <source>Repeat new passphrase</source> <translation>Ponovite novu lozinku</translation> </message> -</context> + </context> <context> <name>BanTableModel</name> </context> @@ -250,26 +277,6 @@ <source>Processed %n block(s) of transaction history.</source> <translation><numerusform>Obrađen %n blok povijesti transakcije.</numerusform><numerusform>Obrađeno %n bloka povijesti transakcije.</numerusform><numerusform>Obrađeno %n blokova povijesti transakcije.</numerusform></translation> </message> - <message numerus="yes"> - <source>%n hour(s)</source> - <translation><numerusform>%n sat</numerusform><numerusform>%n sata</numerusform><numerusform>%n sati</numerusform></translation> - </message> - <message numerus="yes"> - <source>%n day(s)</source> - <translation><numerusform>%n dan</numerusform><numerusform>%n dana</numerusform><numerusform>%n dana</numerusform></translation> - </message> - <message numerus="yes"> - <source>%n week(s)</source> - <translation><numerusform>%n tjedan</numerusform><numerusform>%n tjedna</numerusform><numerusform>%n tjedana</numerusform></translation> - </message> - <message> - <source>%1 and %2</source> - <translation>%1 i %2</translation> - </message> - <message numerus="yes"> - <source>%n year(s)</source> - <translation><numerusform>%n godina</numerusform><numerusform>%n godine</numerusform><numerusform>%n godina</numerusform></translation> - </message> <message> <source>Last received block was generated %1 ago.</source> <translation>Zadnji primljeni blok je bio ustvaren prije %1.</translation> @@ -344,7 +351,7 @@ <source>Wallet is <b>encrypted</b> and currently <b>locked</b></source> <translation>Novčanik je <b>šifriran</b> i trenutno <b>zaključan</b></translation> </message> -</context> + </context> <context> <name>CoinControlDialog</name> <message> @@ -364,10 +371,6 @@ <translation>Iznos:</translation> </message> <message> - <source>Priority:</source> - <translation>Prioriteta:</translation> - </message> - <message> <source>Fee:</source> <translation>Naknada:</translation> </message> @@ -407,11 +410,7 @@ <source>Confirmed</source> <translation>Potvrđeno</translation> </message> - <message> - <source>Priority</source> - <translation>Prioriteta</translation> - </message> -</context> + </context> <context> <name>EditAddressDialog</name> <message> @@ -434,7 +433,7 @@ <source>&Address</source> <translation>&Adresa</translation> </message> -</context> + </context> <context> <name>FreespaceChecker</name> <message> @@ -485,6 +484,17 @@ </message> </context> <context> + <name>ModalOverlay</name> + <message> + <source>Form</source> + <translation>Oblik</translation> + </message> + <message> + <source>Last block time</source> + <translation>Posljednje vrijeme bloka</translation> + </message> + </context> +<context> <name>OpenURIDialog</name> <message> <source>Open URI</source> @@ -502,7 +512,7 @@ <source>Select payment request file</source> <translation>Izaberi datoteku zahtjeva za plaćanje</translation> </message> -</context> + </context> <context> <name>OptionsDialog</name> <message> @@ -642,6 +652,9 @@ </message> </context> <context> + <name>PaymentServer</name> + </context> +<context> <name>PeerTableModel</name> </context> <context> @@ -654,6 +667,16 @@ <source>N/A</source> <translation>N/A</translation> </message> + <message> + <source>%1 and %2</source> + <translation>%1 i %2</translation> + </message> + </context> +<context> + <name>QObject::QObject</name> + </context> +<context> + <name>QRImageWidget</name> </context> <context> <name>RPCConsole</name> @@ -791,7 +814,10 @@ <source>&Save Image...</source> <translation>&Spremi sliku...</translation> </message> -</context> + </context> +<context> + <name>RecentRequestsTableModel</name> + </context> <context> <name>SendCoinsDialog</name> <message> @@ -815,10 +841,6 @@ <translation>Iznos:</translation> </message> <message> - <source>Priority:</source> - <translation>Prioriteta:</translation> - </message> - <message> <source>Fee:</source> <translation>Naknada:</translation> </message> @@ -862,7 +884,7 @@ <source>S&end</source> <translation>&Pošalji</translation> </message> -</context> + </context> <context> <name>SendCoinsEntry</name> <message> @@ -899,6 +921,9 @@ </message> </context> <context> + <name>SendConfirmationDialog</name> + </context> +<context> <name>ShutdownWindow</name> </context> <context> @@ -955,16 +980,38 @@ <name>TrafficGraphWidget</name> </context> <context> + <name>TransactionDesc</name> + </context> +<context> <name>TransactionDescDialog</name> <message> <source>This pane shows a detailed description of the transaction</source> <translation>Ovaj prozor prikazuje detaljni opis transakcije</translation> </message> -</context> + </context> +<context> + <name>TransactionTableModel</name> + </context> +<context> + <name>TransactionView</name> + <message> + <source>Exporting Failed</source> + <translation>Izvoz neuspješan</translation> + </message> + </context> <context> <name>UnitDisplayStatusBarControl</name> </context> <context> + <name>WalletFrame</name> + </context> +<context> + <name>WalletModel</name> + </context> +<context> + <name>WalletView</name> + </context> +<context> <name>bitcoin-core</name> <message> <source>Options:</source> @@ -995,10 +1042,6 @@ <translation>Opcije za kreiranje bloka:</translation> </message> <message> - <source>Connect only to the specified node(s)</source> - <translation>Poveži se samo sa određenim čvorom/čvorovima</translation> - </message> - <message> <source>Error: Disk space is low!</source> <translation>Pogreška: Nema dovoljno prostora na disku!</translation> </message> diff --git a/src/qt/locale/bitcoin_hu.ts b/src/qt/locale/bitcoin_hu.ts index 9eb0cf76c4..28270e8c2e 100644 --- a/src/qt/locale/bitcoin_hu.ts +++ b/src/qt/locale/bitcoin_hu.ts @@ -41,7 +41,10 @@ <source>&Delete</source> <translation>&Törlés</translation> </message> -</context> + </context> +<context> + <name>AddressTableModel</name> + </context> <context> <name>AskPassphraseDialog</name> <message> @@ -60,10 +63,18 @@ <source>Repeat new passphrase</source> <translation>Új jelszó újra</translation> </message> -</context> + </context> <context> <name>BanTableModel</name> - </context> + <message> + <source>IP/Netmask</source> + <translation>IP-cím/maszk</translation> + </message> + <message> + <source>Banned Until</source> + <translation>Kitiltás vége</translation> + </message> +</context> <context> <name>BitcoinGUI</name> <message> @@ -246,34 +257,10 @@ <source>%n active connection(s) to Bitcoin network</source> <translation><numerusform>%n aktív kapcsolat a Bitcoin hálózathoz</numerusform><numerusform>%n aktív kapcsolat a Bitcoin hálózathoz</numerusform></translation> </message> - <message> - <source>No block source available...</source> - <translation>Blokk forrása ismeretlen...</translation> - </message> <message numerus="yes"> <source>Processed %n block(s) of transaction history.</source> <translation><numerusform>%n blokk feldolgozva a tranzakció előzményből.</numerusform><numerusform>%n blokk feldolgozva a tranzakció előzményből.</numerusform></translation> </message> - <message numerus="yes"> - <source>%n hour(s)</source> - <translation><numerusform>%n óra</numerusform><numerusform>%n óra</numerusform></translation> - </message> - <message numerus="yes"> - <source>%n day(s)</source> - <translation><numerusform>%n nap</numerusform><numerusform>%n nap</numerusform></translation> - </message> - <message numerus="yes"> - <source>%n week(s)</source> - <translation><numerusform>%n hét</numerusform><numerusform>%n hét</numerusform></translation> - </message> - <message> - <source>%1 and %2</source> - <translation>%1 és %2</translation> - </message> - <message numerus="yes"> - <source>%n year(s)</source> - <translation><numerusform>%n év</numerusform><numerusform>%n év</numerusform></translation> - </message> <message> <source>%1 behind</source> <translation>%1 lemaradás</translation> @@ -352,7 +339,7 @@ <source>Wallet is <b>encrypted</b> and currently <b>locked</b></source> <translation>Tárca <b>kódolva</b> és jelenleg <b>zárva</b>.</translation> </message> -</context> + </context> <context> <name>CoinControlDialog</name> <message> @@ -372,10 +359,6 @@ <translation>Összeg:</translation> </message> <message> - <source>Priority:</source> - <translation>Prioritás:</translation> - </message> - <message> <source>Fee:</source> <translation>Díj:</translation> </message> @@ -427,11 +410,7 @@ <source>Confirmed</source> <translation>Megerősítve</translation> </message> - <message> - <source>Priority</source> - <translation>Prioritás</translation> - </message> -</context> + </context> <context> <name>EditAddressDialog</name> <message> @@ -454,7 +433,7 @@ <source>&Address</source> <translation>&Cím</translation> </message> -</context> + </context> <context> <name>FreespaceChecker</name> <message> @@ -525,6 +504,21 @@ </message> </context> <context> + <name>ModalOverlay</name> + <message> + <source>Form</source> + <translation>Űrlap</translation> + </message> + <message> + <source>Last block time</source> + <translation>Utolsó blokk ideje</translation> + </message> + <message> + <source>Hide</source> + <translation>Elrejtés</translation> + </message> + </context> +<context> <name>OpenURIDialog</name> <message> <source>Open URI</source> @@ -542,7 +536,7 @@ <source>Select payment request file</source> <translation>Fizetési kérelmi fájl kiválasztása</translation> </message> -</context> + </context> <context> <name>OptionsDialog</name> <message> @@ -754,16 +748,15 @@ </message> </context> <context> + <name>PaymentServer</name> + </context> +<context> <name>PeerTableModel</name> <message> <source>User Agent</source> <translation>User Agent</translation> </message> - <message> - <source>Ping Time</source> - <translation>Ping idő</translation> - </message> -</context> + </context> <context> <name>QObject</name> <message> @@ -802,7 +795,17 @@ <source>%1 ms</source> <translation>%1 ms</translation> </message> -</context> + <message> + <source>%1 and %2</source> + <translation>%1 és %2</translation> + </message> + </context> +<context> + <name>QObject::QObject</name> + </context> +<context> + <name>QRImageWidget</name> + </context> <context> <name>RPCConsole</name> <message> @@ -870,6 +873,10 @@ <translation>&Peerek</translation> </message> <message> + <source>Banned peers</source> + <translation>Kitiltott felek</translation> + </message> + <message> <source>Select a peer to view detailed information.</source> <translation>Peer kijelölése a részletes információkért</translation> </message> @@ -1052,7 +1059,7 @@ <source>Remove</source> <translation>Eltávolítás</translation> </message> -</context> + </context> <context> <name>ReceiveRequestDialog</name> <message> @@ -1071,7 +1078,10 @@ <source>&Save Image...</source> <translation>&Kép mentése</translation> </message> -</context> + </context> +<context> + <name>RecentRequestsTableModel</name> + </context> <context> <name>SendCoinsDialog</name> <message> @@ -1103,10 +1113,6 @@ <translation>Összeg:</translation> </message> <message> - <source>Priority:</source> - <translation>Prioritás:</translation> - </message> - <message> <source>Fee:</source> <translation>Díjak:</translation> </message> @@ -1182,7 +1188,7 @@ <source>S&end</source> <translation>&Küldés</translation> </message> -</context> + </context> <context> <name>SendCoinsEntry</name> <message> @@ -1229,7 +1235,10 @@ <source>Memo:</source> <translation>Jegyzet:</translation> </message> -</context> + </context> +<context> + <name>SendConfirmationDialog</name> + </context> <context> <name>ShutdownWindow</name> <message> @@ -1311,16 +1320,34 @@ </message> </context> <context> + <name>TransactionDesc</name> + </context> +<context> <name>TransactionDescDialog</name> <message> <source>This pane shows a detailed description of the transaction</source> <translation>Ez a mező a tranzakció részleteit mutatja</translation> </message> -</context> + </context> +<context> + <name>TransactionTableModel</name> + </context> +<context> + <name>TransactionView</name> + </context> <context> <name>UnitDisplayStatusBarControl</name> </context> <context> + <name>WalletFrame</name> + </context> +<context> + <name>WalletModel</name> + </context> +<context> + <name>WalletView</name> + </context> +<context> <name>bitcoin-core</name> <message> <source>Options:</source> @@ -1351,10 +1378,6 @@ </translation> </message> <message> - <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> - <translation>Kívülről érkező kapcsolatok elfogadása (alapértelmezett: 1, ha nem használt a -proxy vagy a -connect)</translation> - </message> - <message> <source>Bitcoin Core</source> <translation>Bitcoin Core</translation> </message> @@ -1363,8 +1386,8 @@ <translation>Parancs, amit akkor hajt végre, amikor egy tárca-tranzakció megváltozik (%s a parancsban lecserélődik a blokk TxID-re)</translation> </message> <message> - <source>Connect only to the specified node(s)</source> - <translation>Csatlakozás csak a megadott csomóponthoz</translation> + <source>Use UPnP to map the listening port (default: 1 when listening and no -proxy)</source> + <translation>UPnP használata porttovábbításra (alapértelmezett: 1, amikor kiszolgál és nem használt a -proxy)</translation> </message> <message> <source>Corrupted block database detected</source> @@ -1407,6 +1430,10 @@ <translation>Helytelen vagy nemlétező genézis blokk. Helytelen hálózati adatkönyvtár?</translation> </message> <message> + <source>Loading banlist...</source> + <translation>Tiltólista betöltése...</translation> + </message> + <message> <source>Not enough file descriptors available.</source> <translation>Nincs elég fájlleíró. </translation> </message> @@ -1423,6 +1450,18 @@ <translation>Tárca beállítások:</translation> </message> <message> + <source>Discover own IP addresses (default: 1 when listening and no -externalip or -proxy)</source> + <translation>Saját IP-cím felfedezése (alapértelmezett: 1, amikor kiszolgál és nem használt a -externalip)</translation> + </message> + <message> + <source>Whitelisted peers cannot be DoS banned and their transactions are always relayed, even if they are already in the mempool, useful e.g. for a gateway</source> + <translation>A fehérlistán szereplő felek nem lesznek automatikusan kitiltva és a tranzakcióik is mindig továbbítva lesznek, akkor is ha már a megerősítésre váró listán (mempool) vannak. Hasznos például összekötő csomópontokon (gateway).</translation> + </message> + <message> + <source>(default: %u)</source> + <translation>(alapértelmezett: %u)</translation> + </message> + <message> <source>Error reading from database, shutting down.</source> <translation>Hiba az adatbázis olvasásakor, leállítás</translation> </message> @@ -1447,10 +1486,6 @@ <translation>Tranzakció összege túl alacsony</translation> </message> <message> - <source>Transaction amounts must be positive</source> - <translation>Tranzakció összege pozitív kell legyen</translation> - </message> - <message> <source>Transaction too large</source> <translation>Túl nagy tranzakció</translation> </message> @@ -1481,6 +1516,14 @@ <translation>Címek betöltése...</translation> </message> <message> + <source>(default: %s)</source> + <translation>(alapértelmezett: %s)</translation> + </message> + <message> + <source>Include IP addresses in debug output (default: %u)</source> + <translation>IP-címek megjelenítése a naplóban (alapértelmezett: %u)</translation> + </message> + <message> <source>Invalid -proxy address: '%s'</source> <translation>Érvénytelen -proxy cím: '%s'</translation> </message> diff --git a/src/qt/locale/bitcoin_id_ID.ts b/src/qt/locale/bitcoin_id_ID.ts index feb6f690c4..fd77f07cd8 100644 --- a/src/qt/locale/bitcoin_id_ID.ts +++ b/src/qt/locale/bitcoin_id_ID.ts @@ -41,7 +41,10 @@ <source>&Delete</source> <translation>&Hapus</translation> </message> -</context> + </context> +<context> + <name>AddressTableModel</name> + </context> <context> <name>AskPassphraseDialog</name> <message> @@ -60,7 +63,7 @@ <source>Repeat new passphrase</source> <translation>Ulangi kata kunci baru</translation> </message> -</context> + </context> <context> <name>BanTableModel</name> <message> @@ -250,34 +253,10 @@ <source>%n active connection(s) to Bitcoin network</source> <translation><numerusform>%n koneksi aktif ke jaringan Bitcoin</numerusform></translation> </message> - <message> - <source>No block source available...</source> - <translation>Sumber blok tidak tersedia...</translation> - </message> <message numerus="yes"> <source>Processed %n block(s) of transaction history.</source> <translation><numerusform>%n blok dari riwayat transaksi diproses.</numerusform></translation> </message> - <message numerus="yes"> - <source>%n hour(s)</source> - <translation><numerusform>%n jam</numerusform></translation> - </message> - <message numerus="yes"> - <source>%n day(s)</source> - <translation><numerusform>%n hari</numerusform></translation> - </message> - <message numerus="yes"> - <source>%n week(s)</source> - <translation><numerusform>%n minggu</numerusform></translation> - </message> - <message> - <source>%1 and %2</source> - <translation>%1 dan %2</translation> - </message> - <message numerus="yes"> - <source>%n year(s)</source> - <translation><numerusform>%n tahun</numerusform></translation> - </message> <message> <source>%1 behind</source> <translation>kurang %1</translation> @@ -356,7 +335,7 @@ <source>Wallet is <b>encrypted</b> and currently <b>locked</b></source> <translation>Dompet saat ini <b>terenkripsi</b> dan <b>terkunci</b></translation> </message> -</context> + </context> <context> <name>CoinControlDialog</name> <message> @@ -376,10 +355,6 @@ <translation>Jumlah:</translation> </message> <message> - <source>Priority:</source> - <translation>Prioritas:</translation> - </message> - <message> <source>Fee:</source> <translation>Biaya:</translation> </message> @@ -431,11 +406,7 @@ <source>Confirmed</source> <translation>Terkonfirmasi</translation> </message> - <message> - <source>Priority</source> - <translation>Prioritas</translation> - </message> -</context> + </context> <context> <name>EditAddressDialog</name> <message> @@ -458,7 +429,7 @@ <source>&Address</source> <translation>&Alamat</translation> </message> -</context> + </context> <context> <name>FreespaceChecker</name> <message> @@ -561,6 +532,17 @@ </message> </context> <context> + <name>ModalOverlay</name> + <message> + <source>Form</source> + <translation>Formulir</translation> + </message> + <message> + <source>Last block time</source> + <translation>Waktu blok terakhir</translation> + </message> + </context> +<context> <name>OpenURIDialog</name> <message> <source>Open URI</source> @@ -578,7 +560,7 @@ <source>Select payment request file</source> <translation>Pilih data permintaan pembayaran</translation> </message> -</context> + </context> <context> <name>OptionsDialog</name> <message> @@ -822,6 +804,9 @@ </message> </context> <context> + <name>PaymentServer</name> + </context> +<context> <name>PeerTableModel</name> <message> <source>User Agent</source> @@ -850,6 +835,16 @@ <source>N/A</source> <translation>T/S</translation> </message> + <message> + <source>%1 and %2</source> + <translation>%1 dan %2</translation> + </message> + </context> +<context> + <name>QObject::QObject</name> + </context> +<context> + <name>QRImageWidget</name> </context> <context> <name>RPCConsole</name> @@ -1070,7 +1065,7 @@ <source>Remove</source> <translation>Menghapus</translation> </message> -</context> + </context> <context> <name>ReceiveRequestDialog</name> <message> @@ -1089,7 +1084,14 @@ <source>&Save Image...</source> <translation>&Simpan Gambaran...</translation> </message> -</context> + <message> + <source>Amount</source> + <translation>Jumlah</translation> + </message> + </context> +<context> + <name>RecentRequestsTableModel</name> + </context> <context> <name>SendCoinsDialog</name> <message> @@ -1125,10 +1127,6 @@ <translation>Nilai:</translation> </message> <message> - <source>Priority:</source> - <translation>Prioritas:</translation> - </message> - <message> <source>Fee:</source> <translation>Biaya:</translation> </message> @@ -1157,10 +1155,6 @@ <translation>Disarankan</translation> </message> <message> - <source>Confirmation time:</source> - <translation>Waktu konfirmasi:</translation> - </message> - <message> <source>normal</source> <translation>normal</translation> </message> @@ -1200,7 +1194,7 @@ <source>S&end</source> <translation>K&irim</translation> </message> -</context> + </context> <context> <name>SendCoinsEntry</name> <message> @@ -1255,7 +1249,10 @@ <source>Memo:</source> <translation>Catatan Peringatan:</translation> </message> -</context> + </context> +<context> + <name>SendConfirmationDialog</name> + </context> <context> <name>ShutdownWindow</name> <message> @@ -1329,7 +1326,7 @@ <source>Reset all verify message fields</source> <translation>Hapus semua bidang verifikasi pesan</translation> </message> -</context> + </context> <context> <name>SplashScreen</name> <message> @@ -1345,16 +1342,38 @@ </message> </context> <context> + <name>TransactionDesc</name> + <message> + <source>Amount</source> + <translation>Jumlah</translation> + </message> + </context> +<context> <name>TransactionDescDialog</name> <message> <source>This pane shows a detailed description of the transaction</source> <translation>Jendela ini menampilkan deskripsi rinci dari transaksi tersebut</translation> </message> -</context> + </context> +<context> + <name>TransactionTableModel</name> + </context> +<context> + <name>TransactionView</name> + </context> <context> <name>UnitDisplayStatusBarControl</name> </context> <context> + <name>WalletFrame</name> + </context> +<context> + <name>WalletModel</name> + </context> +<context> + <name>WalletView</name> + </context> +<context> <name>bitcoin-core</name> <message> <source>Options:</source> @@ -1381,10 +1400,6 @@ <translation>Berjalan dibelakang sebagai daemin dan menerima perintah</translation> </message> <message> - <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> - <translation>Terima hubungan dari luar (standar: 1 kalau -proxy atau -connect tidak dipilih)</translation> - </message> - <message> <source>Bitcoin Core</source> <translation>Bitcoin Core</translation> </message> @@ -1393,22 +1408,10 @@ <translation>Jalankan perintah ketika perubahan transaksi dompet (%s di cmd digantikan oleh TxID)</translation> </message> <message> - <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source> - <translation>Peringatan: Jaringan tidak semua bersetuju! Beberapa penambang dapat persoalan.</translation> - </message> - <message> - <source>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</source> - <translation>Peringatan: Kami tidak bersetujuh dengan peer-peer kami! Kemungkinan Anda harus upgrade, atau node-node lain yang harus diupgrade.</translation> - </message> - <message> <source>Block creation options:</source> <translation>Pilihan pembuatan blok:</translation> </message> <message> - <source>Connect only to the specified node(s)</source> - <translation>Jangan menghubungkan node(-node) selain yang di daftar</translation> - </message> - <message> <source>Connection options:</source> <translation>Pilih koneksi:</translation> </message> @@ -1513,10 +1516,6 @@ <translation>Nilai transaksi terlalu kecil</translation> </message> <message> - <source>Transaction amounts must be positive</source> - <translation>Nilai transaksi harus positif</translation> - </message> - <message> <source>Transaction too large</source> <translation>Transaksi terlalu besar</translation> </message> diff --git a/src/qt/locale/bitcoin_it.ts b/src/qt/locale/bitcoin_it.ts index 55bc9c3c82..9f2c7626de 100644 --- a/src/qt/locale/bitcoin_it.ts +++ b/src/qt/locale/bitcoin_it.ts @@ -3,7 +3,7 @@ <name>AddressBookPage</name> <message> <source>Right-click to edit address or label</source> - <translation>Fare clic con il tasto destro del mouse per modificare l'indirizzo o l'etichetta</translation> + <translation>Fare clic con il tasto destro del mouse per modificare l'indirizzo o l'etichettadefault</translation> </message> <message> <source>Create a new address</source> @@ -41,6 +41,77 @@ <source>&Delete</source> <translation>&Elimina</translation> </message> + <message> + <source>Choose the address to send coins to</source> + <translation>Scegli l'indirizzo a cui inviare bitcoin</translation> + </message> + <message> + <source>Choose the address to receive coins with</source> + <translation>Scegli l'indirizzo con cui ricevere bitcoin</translation> + </message> + <message> + <source>C&hoose</source> + <translation>Sc&egli</translation> + </message> + <message> + <source>Sending addresses</source> + <translation>Indirizzi d'invio</translation> + </message> + <message> + <source>Receiving addresses</source> + <translation>Indirizzi di ricezione</translation> + </message> + <message> + <source>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source> + <translation>Questo è un elenco di indirizzi Bitcoin a cui puoi inviare pagamenti. Controlla sempre l'importo e l'indirizzo del beneficiario prima di inviare bitcoin.</translation> + </message> + <message> + <source>These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction.</source> + <translation>Questi sono i tuoi indirizzi Bitcoin che puoi usare per ricevere pagamenti. Si raccomanda di generare un nuovo indirizzo per ogni transazione.</translation> + </message> + <message> + <source>&Copy Address</source> + <translation>&Copia l'indirizzo</translation> + </message> + <message> + <source>Copy &Label</source> + <translation>Copia &l'etichetta</translation> + </message> + <message> + <source>&Edit</source> + <translation>&Modifica</translation> + </message> + <message> + <source>Export Address List</source> + <translation>Esporta Lista Indirizzi</translation> + </message> + <message> + <source>Comma separated file (*.csv)</source> + <translation>Testo CSV (*.csv)</translation> + </message> + <message> + <source>Exporting Failed</source> + <translation>Esportazione Fallita</translation> + </message> + <message> + <source>There was an error trying to save the address list to %1. Please try again.</source> + <translation>Si è verificato un errore tentando di salvare la lista degli indirizzi su %1. Si prega di riprovare.</translation> + </message> +</context> +<context> + <name>AddressTableModel</name> + <message> + <source>Label</source> + <translation>Etichetta</translation> + </message> + <message> + <source>Address</source> + <translation>Indirizzo</translation> + </message> + <message> + <source>(no label)</source> + <translation>(nessuna etichetta)</translation> + </message> </context> <context> <name>AskPassphraseDialog</name> @@ -60,7 +131,67 @@ <source>Repeat new passphrase</source> <translation>Ripeti la nuova passphrase</translation> </message> -</context> + <message> + <source>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>.</source> + <translation>Inserisci la nuova passphrase per il portamonete.<br/>Si consiglia di utilizzare <b>almeno dieci caratteri casuali</b> oppure <b>otto o più parole</b>.</translation> + </message> + <message> + <source>Encrypt wallet</source> + <translation>Cifra il portamonete</translation> + </message> + <message> + <source>This operation needs your wallet passphrase to unlock the wallet.</source> + <translation>Questa operazione necessita della passphrase per sbloccare il portamonete.</translation> + </message> + <message> + <source>Unlock wallet</source> + <translation>Sblocca il portamonete</translation> + </message> + <message> + <source>This operation needs your wallet passphrase to decrypt the wallet.</source> + <translation>Quest'operazione necessita della passphrase per decifrare il portamonete,</translation> + </message> + <message> + <source>Decrypt wallet</source> + <translation>Decifra il portamonete</translation> + </message> + <message> + <source>Change passphrase</source> + <translation>Cambia la passphrase</translation> + </message> + <message> + <source>Enter the old passphrase and new passphrase to the wallet.</source> + <translation>Inserisci la vecchia e la nuova passphrase per il portamonete.</translation> + </message> + <message> + <source>Confirm wallet encryption</source> + <translation>Conferma la cifratura del portamonete</translation> + </message> + <message> + <source>Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR BITCOINS</b>!</source> + <translation>Attenzione: perdendo la passphrase di un portamonete cifrato <b>TUTTI I PROPRI BITCOIN ANDRANNO PERSI</b>!</translation> + </message> + <message> + <source>Are you sure you wish to encrypt your wallet?</source> + <translation>Si è sicuri di voler cifrare il portamonete?</translation> + </message> + <message> + <source>Wallet encrypted</source> + <translation>Portamonete cifrato</translation> + </message> + <message> + <source>Wallet encryption failed</source> + <translation>Il processo di crittografia del tuo portafogli è fallito</translation> + </message> + <message> + <source>Wallet unlock failed</source> + <translation>Sbloccaggio del portafoglio fallito</translation> + </message> + <message> + <source>The passphrase entered for the wallet decryption was incorrect.</source> + <translation>La frase inserita per decrittografare il tuo portafoglio è incorretta</translation> + </message> + </context> <context> <name>BanTableModel</name> <message> @@ -115,6 +246,10 @@ <translation>&Informazioni su %1</translation> </message> <message> + <source>Show information about %1</source> + <translation>Mostra informazioni su %1</translation> + </message> + <message> <source>About &Qt</source> <translation>Informazioni su &Qt</translation> </message> @@ -127,6 +262,10 @@ <translation>&Opzioni...</translation> </message> <message> + <source>Modify configuration options for %1</source> + <translation>Modifica le opzioni di configurazione per %1</translation> + </message> + <message> <source>&Encrypt Wallet...</source> <translation>&Cifra il portamonete...</translation> </message> @@ -255,32 +394,16 @@ <translation><numerusform>%n connessione attiva alla rete Bitcoin</numerusform><numerusform>%n connessioni alla rete Bitcoin attive</numerusform></translation> </message> <message> - <source>No block source available...</source> - <translation>Nessuna fonte di blocchi disponibile...</translation> - </message> - <message numerus="yes"> - <source>Processed %n block(s) of transaction history.</source> - <translation><numerusform>Elaborato %n blocco dello storico transazioni.</numerusform><numerusform>Elaborati %n blocchi dello storico transazioni.</numerusform></translation> - </message> - <message numerus="yes"> - <source>%n hour(s)</source> - <translation><numerusform>%n ora</numerusform><numerusform>%n ore</numerusform></translation> - </message> - <message numerus="yes"> - <source>%n day(s)</source> - <translation><numerusform>%n giorno</numerusform><numerusform>%n giorni</numerusform></translation> - </message> - <message numerus="yes"> - <source>%n week(s)</source> - <translation><numerusform>%n settimana</numerusform><numerusform>%n settimane</numerusform></translation> + <source>Indexing blocks on disk...</source> + <translation>Indicizzando i blocchi su disco...</translation> </message> <message> - <source>%1 and %2</source> - <translation>%1 e %2</translation> + <source>Processing blocks on disk...</source> + <translation>Processando i blocchi su disco...</translation> </message> <message numerus="yes"> - <source>%n year(s)</source> - <translation><numerusform>%n anno</numerusform><numerusform>%n anni</numerusform></translation> + <source>Processed %n block(s) of transaction history.</source> + <translation><numerusform>Elaborato %n blocco dello storico transazioni.</numerusform><numerusform>Elaborati %n blocchi dello storico transazioni.</numerusform></translation> </message> <message> <source>%1 behind</source> @@ -311,6 +434,14 @@ <translation>Aggiornato</translation> </message> <message> + <source>Show the %1 help message to get a list with possible Bitcoin command-line options</source> + <translation>Mostra il messaggio di aiuto di %1 per ottenere una lista di opzioni di comando per Bitcoin </translation> + </message> + <message> + <source>%1 client</source> + <translation>%1 client</translation> + </message> + <message> <source>Catching up...</source> <translation>In aggiornamento...</translation> </message> @@ -360,7 +491,7 @@ <source>Wallet is <b>encrypted</b> and currently <b>locked</b></source> <translation>Il portamonete è <b>cifrato</b> ed attualmente <b>bloccato</b></translation> </message> -</context> + </context> <context> <name>CoinControlDialog</name> <message> @@ -380,10 +511,6 @@ <translation>Importo:</translation> </message> <message> - <source>Priority:</source> - <translation>Priorità:</translation> - </message> - <message> <source>Fee:</source> <translation>Commissione:</translation> </message> @@ -436,10 +563,10 @@ <translation>Confermato</translation> </message> <message> - <source>Priority</source> - <translation>Priorità</translation> + <source>(no label)</source> + <translation>(nessuna etichetta)</translation> </message> -</context> + </context> <context> <name>EditAddressDialog</name> <message> @@ -462,7 +589,7 @@ <source>&Address</source> <translation>&Indirizzo</translation> </message> -</context> + </context> <context> <name>FreespaceChecker</name> <message> @@ -497,6 +624,10 @@ <translation>(%1-bit)</translation> </message> <message> + <source>About %1</source> + <translation>Informazioni %1</translation> + </message> + <message> <source>Command-line options</source> <translation>Opzioni della riga di comando</translation> </message> @@ -532,7 +663,11 @@ <source>Show splash screen on startup (default: %u)</source> <translation>Mostra schermata iniziale all'avvio (default: %u)</translation> </message> - </context> + <message> + <source>Reset all settings changed in the GUI</source> + <translation>Reimposta tutti i campi dell'interfaccia grafica</translation> + </message> +</context> <context> <name>Intro</name> <message> @@ -540,6 +675,18 @@ <translation>Benvenuto</translation> </message> <message> + <source>Welcome to %1.</source> + <translation>Benvenuto su %1.</translation> + </message> + <message> + <source>As this is the first time the program is launched, you can choose where %1 will store its data.</source> + <translation>Dato che questa è la prima volta che il programma viene lanciato, puoi scegliere dove %1 salverà i suoi dati.</translation> + </message> + <message> + <source>%1 will download and store a copy of the Bitcoin block chain. At least %2GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source> + <translation>%1 scaricherà e salverà una copia della Blockchain di Bitcoin. Saranno salvati almeno %2GB di dati in questo percorso e continueranno ad aumentare col tempo. Anche il portafoglio verrà salvato in questo percorso.</translation> + </message> + <message> <source>Use the default data directory</source> <translation>Usa la cartella dati predefinita</translation> </message> @@ -556,15 +703,26 @@ <translation>Errore</translation> </message> <message numerus="yes"> - <source>%n GB of free space available</source> - <translation><numerusform>GB di spazio libero disponibile</numerusform><numerusform>%n GB di spazio disponibile</numerusform></translation> - </message> - <message numerus="yes"> <source>(of %n GB needed)</source> <translation><numerusform>(di %nGB richiesti)</numerusform><numerusform>(%n GB richiesti)</numerusform></translation> </message> </context> <context> + <name>ModalOverlay</name> + <message> + <source>Form</source> + <translation>Modulo</translation> + </message> + <message> + <source>Last block time</source> + <translation>Ora del blocco più recente</translation> + </message> + <message> + <source>Hide</source> + <translation>Nascondi</translation> + </message> + </context> +<context> <name>OpenURIDialog</name> <message> <source>Open URI</source> @@ -582,7 +740,7 @@ <source>Select payment request file</source> <translation>Seleziona il file di richiesta di pagamento</translation> </message> -</context> + </context> <context> <name>OptionsDialog</name> <message> @@ -594,6 +752,14 @@ <translation>&Principale</translation> </message> <message> + <source>Automatically start %1 after logging in to the system.</source> + <translation>Avvia automaticamente %1 una volta effettuato l'accesso al sistema.</translation> + </message> + <message> + <source>&Start %1 on system login</source> + <translation>&Start %1 all'accesso al sistema</translation> + </message> + <message> <source>Size of &database cache</source> <translation>Dimensione della cache del &database.</translation> </message> @@ -731,6 +897,14 @@ Per specificare più URL separarli con una barra verticale "|".</translation> <translation>&Finestra</translation> </message> <message> + <source>&Hide the icon from the system tray.</source> + <translation>&Nascondi l'icona nella barra delle applicazioni.</translation> + </message> + <message> + <source>Hide tray icon</source> + <translation>Nascondi l'icona della barra applicazioni</translation> + </message> + <message> <source>Show only a tray icon after minimizing the window.</source> <translation>Mostra solo nella tray bar quando si riduce ad icona.</translation> </message> @@ -751,6 +925,10 @@ Per specificare più URL separarli con una barra verticale "|".</translation> <translation>&Lingua Interfaccia Utente:</translation> </message> <message> + <source>The user interface language can be set here. This setting will take effect after restarting %1.</source> + <translation>La lingua dell'interfaccia utente può essere impostata qui. L'impostazione avrà effetto dopo il riavvio %1.</translation> + </message> + <message> <source>&Unit to show amounts in:</source> <translation>&Unità di misura con cui visualizzare gli importi:</translation> </message> @@ -875,6 +1053,9 @@ Per specificare più URL separarli con una barra verticale "|".</translation> </message> </context> <context> + <name>PaymentServer</name> + </context> +<context> <name>PeerTableModel</name> <message> <source>User Agent</source> @@ -884,11 +1065,7 @@ Per specificare più URL separarli con una barra verticale "|".</translation> <source>Node/Service</source> <translation>Nodo/Servizio</translation> </message> - <message> - <source>Ping Time</source> - <translation>Tempo di ping</translation> - </message> -</context> + </context> <context> <name>QObject</name> <message> @@ -927,7 +1104,17 @@ Per specificare più URL separarli con una barra verticale "|".</translation> <source>%1 ms</source> <translation>%1 ms</translation> </message> -</context> + <message> + <source>%1 and %2</source> + <translation>%1 e %2</translation> + </message> + </context> +<context> + <name>QObject::QObject</name> + </context> +<context> + <name>QRImageWidget</name> + </context> <context> <name>RPCConsole</name> <message> @@ -955,6 +1142,10 @@ Per specificare più URL separarli con una barra verticale "|".</translation> <translation>Versione BerkeleyDB in uso</translation> </message> <message> + <source>Datadir</source> + <translation>Datadir</translation> + </message> + <message> <source>Startup time</source> <translation>Ora di avvio</translation> </message> @@ -1039,6 +1230,18 @@ Per specificare più URL separarli con una barra verticale "|".</translation> <translation>User Agent</translation> </message> <message> + <source>Open the %1 debug log file from the current data directory. This can take a few seconds for large log files.</source> + <translation>Apri il file log del debug di %1 dalla cartella dati attuale. Può richiedere alcuni secondi per file di log di grandi dimensioni.</translation> + </message> + <message> + <source>Decrease font size</source> + <translation>Riduci dimensioni font.</translation> + </message> + <message> + <source>Increase font size</source> + <translation>Aumenta dimensioni font</translation> + </message> + <message> <source>Services</source> <translation>Servizi</translation> </message> @@ -1115,14 +1318,6 @@ Per specificare più URL separarli con una barra verticale "|".</translation> <translation>Cancella console</translation> </message> <message> - <source>&Disconnect Node</source> - <translation>&Nodo Disconnesso</translation> - </message> - <message> - <source>Ban Node for</source> - <translation>Nodo Bannato perché</translation> - </message> - <message> <source>1 &hour</source> <translation>1 &ora</translation> </message> @@ -1139,8 +1334,8 @@ Per specificare più URL separarli con una barra verticale "|".</translation> <translation>1 &anno</translation> </message> <message> - <source>&Unban Node</source> - <translation>&Elimina Ban Nodo</translation> + <source>Welcome to the %1 RPC console.</source> + <translation>Benvenuto nella console RPC di %1.</translation> </message> <message> <source>Use up and down arrows to navigate history, and <b>Ctrl-L</b> to clear screen.</source> @@ -1269,7 +1464,7 @@ Per specificare più URL separarli con una barra verticale "|".</translation> <source>Remove</source> <translation>Rimuovi</translation> </message> -</context> + </context> <context> <name>ReceiveRequestDialog</name> <message> @@ -1288,7 +1483,26 @@ Per specificare più URL separarli con una barra verticale "|".</translation> <source>&Save Image...</source> <translation>&Salva Immagine...</translation> </message> -</context> + <message> + <source>Address</source> + <translation>Indirizzo</translation> + </message> + <message> + <source>Label</source> + <translation>Etichetta</translation> + </message> + </context> +<context> + <name>RecentRequestsTableModel</name> + <message> + <source>Label</source> + <translation>Etichetta</translation> + </message> + <message> + <source>(no label)</source> + <translation>(nessuna etichetta)</translation> + </message> + </context> <context> <name>SendCoinsDialog</name> <message> @@ -1324,10 +1538,6 @@ Per specificare più URL separarli con una barra verticale "|".</translation> <translation>Importo:</translation> </message> <message> - <source>Priority:</source> - <translation>Priorità:</translation> - </message> - <message> <source>Fee:</source> <translation>Commissione:</translation> </message> @@ -1396,10 +1606,6 @@ Per specificare più URL separarli con una barra verticale "|".</translation> <translation>(Commissione intelligente non ancora inizializzata. Normalmente richiede un'attesa di alcuni blocchi...)</translation> </message> <message> - <source>Confirmation time:</source> - <translation>Tempo di conferma:</translation> - </message> - <message> <source>normal</source> <translation>normale</translation> </message> @@ -1439,6 +1645,10 @@ Per specificare più URL separarli con una barra verticale "|".</translation> <source>S&end</source> <translation>&Invia</translation> </message> + <message> + <source>(no label)</source> + <translation>(nessuna etichetta)</translation> + </message> </context> <context> <name>SendCoinsEntry</name> @@ -1518,10 +1728,17 @@ Per specificare più URL separarli con una barra verticale "|".</translation> <source>Memo:</source> <translation>Memo:</translation> </message> -</context> + </context> +<context> + <name>SendConfirmationDialog</name> + </context> <context> <name>ShutdownWindow</name> <message> + <source>%1 is shutting down...</source> + <translation>Arresto di %1 in corso...</translation> + </message> + <message> <source>Do not shut down the computer until this window disappears.</source> <translation>Non spegnere il computer fino a quando questa finestra non si sarà chiusa.</translation> </message> @@ -1612,7 +1829,7 @@ Per specificare più URL separarli con una barra verticale "|".</translation> <source>Reset all verify message fields</source> <translation>Reimposta tutti i campi della verifica messaggio</translation> </message> -</context> + </context> <context> <name>SplashScreen</name> <message> @@ -1628,12 +1845,45 @@ Per specificare più URL separarli con una barra verticale "|".</translation> </message> </context> <context> + <name>TransactionDesc</name> + </context> +<context> <name>TransactionDescDialog</name> <message> <source>This pane shows a detailed description of the transaction</source> <translation>Questo pannello mostra una descrizione dettagliata della transazione</translation> </message> -</context> + </context> +<context> + <name>TransactionTableModel</name> + <message> + <source>Label</source> + <translation>Etichetta</translation> + </message> + <message> + <source>(no label)</source> + <translation>(nessuna etichetta)</translation> + </message> + </context> +<context> + <name>TransactionView</name> + <message> + <source>Comma separated file (*.csv)</source> + <translation>Testo CSV (*.csv)</translation> + </message> + <message> + <source>Label</source> + <translation>Etichetta</translation> + </message> + <message> + <source>Address</source> + <translation>Indirizzo</translation> + </message> + <message> + <source>Exporting Failed</source> + <translation>Esportazione Fallita</translation> + </message> + </context> <context> <name>UnitDisplayStatusBarControl</name> <message> @@ -1642,6 +1892,15 @@ Per specificare più URL separarli con una barra verticale "|".</translation> </message> </context> <context> + <name>WalletFrame</name> + </context> +<context> + <name>WalletModel</name> + </context> +<context> + <name>WalletView</name> + </context> +<context> <name>bitcoin-core</name> <message> <source>Options:</source> @@ -1676,10 +1935,6 @@ Per specificare più URL separarli con una barra verticale "|".</translation> <translation>Prune: l'ultima sincronizzazione del wallet risulta essere oltre la riduzione dei dati. È necessario eseguire un -reindex (scaricare nuovamente la blockchain in caso di nodo pruned)</translation> </message> <message> - <source>Reduce storage requirements by pruning (deleting) old blocks. This mode is incompatible with -txindex and -rescan. Warning: Reverting this setting requires re-downloading the entire blockchain. (default: 0 = disable pruning blocks, >%u = target size in MiB to use for block files)</source> - <translation>Riduce i requisiti di spazio di archiviazione attraverso la rimozione dei vecchi blocchi (pruning). Questa modalità è incompatibile con l'opzione -txindex e -rescan. Attenzione: ripristinando questa opzione l'intera blockchain dovrà essere riscaricata. (default: 0 = disabilita il pruning, >%u = dimensione desiderata in MiB per i file dei blocchi)</translation> - </message> - <message> <source>Rescans are not possible in pruned mode. You will need to use -reindex which will download the whole blockchain again.</source> <translation>Non è possibile un Rescan in modalità pruned. Sarà necessario utilizzare -reindex che farà scaricare nuovamente tutta la blockchain.</translation> </message> @@ -1704,30 +1959,62 @@ Per specificare più URL separarli con una barra verticale "|".</translation> <translation>Impossibile avviare il server HTTP. Dettagli nel log di debug.</translation> </message> <message> - <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> - <translation>Accetta connessioni dall'esterno (predefinito: 1 se -proxy o -connect non sono utilizzati)</translation> - </message> - <message> <source>Bitcoin Core</source> <translation>Bitcoin Core</translation> </message> <message> + <source>The %s developers</source> + <translation>Sviluppatori di %s</translation> + </message> + <message> + <source>A fee rate (in %s/kB) that will be used when fee estimation has insufficient data (default: %s)</source> + <translation>Un importo (in %s/kB) che sarà utilizzato quando la stima delle commissioni non ha abbastanza dati (default: %s)</translation> + </message> + <message> + <source>Accept relayed transactions received from whitelisted peers even when not relaying transactions (default: %d)</source> + <translation>Accetta le transazioni trasmesse ricevute da peers in whitelist anche se non si stanno trasmettendo transazioni (default: %d)</translation> + </message> + <message> <source>Bind to given address and always listen on it. Use [host]:port notation for IPv6</source> <translation>Associa all'indirizzo indicato e resta permanentemente in ascolto su di esso. Usa la notazione [host]:porta per l'IPv6</translation> </message> <message> + <source>Cannot obtain a lock on data directory %s. %s is probably already running.</source> + <translation>Non è possibile ottenere i dati sulla cartella %s. Probabilmente %s è già in esecuzione.</translation> + </message> + <message> <source>Delete all wallet transactions and only recover those parts of the blockchain through -rescan on startup</source> <translation>Elimina tutte le transazioni dal portamonete e recupera solo quelle che fanno parte della blockchain attraverso il comando -rescan all'avvio.</translation> </message> <message> - <source>Distributed under the MIT software license, see the accompanying file COPYING or <http://www.opensource.org/licenses/mit-license.php>.</source> - <translation>Distribuito secondo la licenza software MIT, vedi il file COPYING incluso oppure <http://www.opensource.org/licenses/mit-license.php>.</translation> + <source>Error loading %s: You can't enable HD on a already existing non-HD wallet</source> + <translation>Errore caricamento %s: Non puoi abilitare HD in un portafoglio non-HD già esistente</translation> + </message> + <message> + <source>Error reading %s! All keys read correctly, but transaction data or address book entries might be missing or incorrect.</source> + <translation>Errore lettura %s! Tutte le chiavi sono state lette correttamente, ma i dati delle transazioni o della rubrica potrebbero essere mancanti o non corretti.</translation> </message> <message> <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source> <translation>Esegue un comando quando lo stato di una transazione del portamonete cambia (%s in cmd è sostituito da TxID)</translation> </message> <message> + <source>Maximum allowed median peer time offset adjustment. Local perspective of time may be influenced by peers forward or backward by this amount. (default: %u seconds)</source> + <translation>Regolazione della massima differenza media di tempo dei peer consentita. L'impostazione dell'orario locale può essere impostata in avanti o indietro di questa quantità. (default %u secondi)</translation> + </message> + <message> + <source>Maximum total fees (in %s) to use in a single wallet transaction or raw transaction; setting this too low may abort large transactions (default: %s)</source> + <translation>Totale massimo di commissioni (in %s) da usare in una transazione singola o di gruppo del wallet; valori troppo bassi possono abortire grandi transazioni (default: %s)</translation> + </message> + <message> + <source>Please check that your computer's date and time are correct! If your clock is wrong, %s will not work properly.</source> + <translation>Per favore controllate che la data del computer e l'ora siano corrette! Se il vostro orologio è sbagliato %s non funzionerà correttamente.</translation> + </message> + <message> + <source>Please contribute if you find %s useful. Visit %s for further information about the software.</source> + <translation>Per favore contribuite se ritenete %s utile. Visitate %s per maggiori informazioni riguardo il software.</translation> + </message> + <message> <source>Set the number of script verification threads (%u to %d, 0 = auto, <0 = leave that many cores free, default: %d)</source> <translation>Imposta il numero di thread per la verifica degli script (da %u a %d, 0 = automatico, <0 = lascia questo numero di core liberi, predefinito: %d)</translation> </message> @@ -1736,24 +2023,20 @@ Per specificare più URL separarli con una barra verticale "|".</translation> <translation>Il database dei blocchi contiene un blocco che sembra provenire dal futuro. Questo può essere dovuto alla data e ora del tuo computer impostate in modo scorretto. Ricostruisci il database dei blocchi se sei certo che la data e l'ora sul tuo computer siano corrette</translation> </message> <message> - <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source> - <translation>Questa versione è una compilazione pre-rilascio - usala a tuo rischio - non utilizzarla per la generazione o per applicazioni di commercio</translation> + <source>Unable to rewind the database to a pre-fork state. You will need to redownload the blockchain</source> + <translation>Impossibile riportare il database ad un livello pre-fork. Dovrai riscaricare tutta la blockchain</translation> </message> <message> <source>Use UPnP to map the listening port (default: 1 when listening and no -proxy)</source> <translation>Utilizza UPnP per mappare la porta in ascolto (default: 1 quando in ascolto e -proxy non è specificato)</translation> </message> <message> - <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source> - <translation>Attenzione: La rete non sembra trovarsi in pieno consenso! Alcuni minatori sembrano riscontrare problemi.</translation> - </message> - <message> - <source>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</source> - <translation>Attenzione: Sembra che non vi sia pieno consenso con i nostri peer! Un aggiornamento da parte tua o degli altri nodi potrebbe essere necessario.</translation> + <source>You need to rebuild the database using -reindex-chainstate to change -txindex</source> + <translation>È necessario ricostruire il database usando -reindex per cambiare -txindex</translation> </message> <message> - <source>Whitelist peers connecting from the given netmask or IP address. Can be specified multiple times.</source> - <translation>Inserisce in whitelist i peer che si connettono da un dato indirizzo IP o netmask. Può essere specificato più volte.</translation> + <source>%s corrupt, salvage failed</source> + <translation>%s corrotto, recupero fallito</translation> </message> <message> <source>-maxmempool must be at least %d MB</source> @@ -1764,18 +2047,34 @@ Per specificare più URL separarli con una barra verticale "|".</translation> <translation>Valori possibili per <category>:</translation> </message> <message> + <source>Append comment to the user agent string</source> + <translation>Aggiungi commento alla stringa dell'applicazione utente</translation> + </message> + <message> + <source>Attempt to recover private keys from a corrupt wallet on startup</source> + <translation>Prova a recuperare le chiavi private da un portafoglio corrotto all'avvio</translation> + </message> + <message> <source>Block creation options:</source> <translation>Opzioni creazione blocco:</translation> </message> <message> - <source>Connect only to the specified node(s)</source> - <translation>Connessione ai soli nodi specificati</translation> + <source>Cannot resolve -%s address: '%s'</source> + <translation>Impossobile risolvere l'indirizzo -%s: '%s'</translation> + </message> + <message> + <source>Change index out of range</source> + <translation>Cambio indice fuori paramentro</translation> </message> <message> <source>Connection options:</source> <translation>Opzioni di connessione:</translation> </message> <message> + <source>Copyright (C) %i-%i</source> + <translation>Copyright (C) %i-%i</translation> + </message> + <message> <source>Corrupted block database detected</source> <translation>Rilevato database blocchi corrotto</translation> </message> @@ -1808,6 +2107,10 @@ Per specificare più URL separarli con una barra verticale "|".</translation> <translation>Abilita pubblicazione transazione raw in <address></translation> </message> <message> + <source>Enable transaction replacement in the memory pool (default: %u)</source> + <translation>Abilita la sostituzione della transazione nel pool della memoria (default: %u)</translation> + </message> + <message> <source>Error initializing block database</source> <translation>Errore durante l'inizializzazione del database dei blocchi</translation> </message> @@ -1816,6 +2119,22 @@ Per specificare più URL separarli con una barra verticale "|".</translation> <translation>Errore durante l'inizializzazione dell'ambiente del database del portamonete %s!</translation> </message> <message> + <source>Error loading %s</source> + <translation>Errore caricamento %s</translation> + </message> + <message> + <source>Error loading %s: Wallet corrupted</source> + <translation>Errore caricamento %s: Portafoglio corrotto</translation> + </message> + <message> + <source>Error loading %s: Wallet requires newer version of %s</source> + <translation>Errore caricamento %s: il Portafoglio richiede una versione aggiornata di %s</translation> + </message> + <message> + <source>Error loading %s: You can't disable HD on a already existing HD wallet</source> + <translation>Errore caricamento %s: Non puoi disabilitare HD in un portafoglio HD già esistente</translation> + </message> + <message> <source>Error loading block database</source> <translation>Errore durante il caricamento del database blocchi</translation> </message> @@ -1840,14 +2159,34 @@ Per specificare più URL separarli con una barra verticale "|".</translation> <translation>Blocco genesi non corretto o non trovato. È possibile che la cartella dati appartenga ad un'altra rete.</translation> </message> <message> + <source>Initialization sanity check failed. %s is shutting down.</source> + <translation>Test di integrità iniziale fallito. %s si arresterà.</translation> + </message> + <message> <source>Invalid -onion address: '%s'</source> <translation>Indirizzo -onion non valido: '%s'</translation> </message> <message> + <source>Invalid amount for -%s=<amount>: '%s'</source> + <translation>Importo non valido per -%s=<amount>: '%s'</translation> + </message> + <message> + <source>Invalid amount for -fallbackfee=<amount>: '%s'</source> + <translation>Importo non valido per -fallbackfee=<amount>: '%s'</translation> + </message> + <message> <source>Keep the transaction memory pool below <n> megabytes (default: %u)</source> <translation>Mantieni la memory pool delle transazioni al di sotto di <n> megabytes (default: %u)</translation> </message> <message> + <source>Loading banlist...</source> + <translation>Caricamento bloccati...</translation> + </message> + <message> + <source>Location of the auth cookie (default: data dir)</source> + <translation>Posizione del cookie di aiutorizzazione (default: data dir)</translation> + </message> + <message> <source>Not enough file descriptors available.</source> <translation>Non ci sono abbastanza descrittori di file disponibili.</translation> </message> @@ -1856,6 +2195,14 @@ Per specificare più URL separarli con una barra verticale "|".</translation> <translation>Connessione ai soli nodi appartenenti alla rete <net> (ipv4, ipv6 o Tor)</translation> </message> <message> + <source>Print this help message and exit</source> + <translation>Mostra questo messaggio di aiuto ed esci</translation> + </message> + <message> + <source>Print version and exit</source> + <translation>Mostra la versione ed esci</translation> + </message> + <message> <source>Prune cannot be configured with a negative value.</source> <translation>La modalità prune non può essere configurata con un valore negativo.</translation> </message> @@ -1864,6 +2211,18 @@ Per specificare più URL separarli con una barra verticale "|".</translation> <translation>La modalità prune è incompatibile con l'opzione -txindex.</translation> </message> <message> + <source>Rebuild chain state and block index from the blk*.dat files on disk</source> + <translation>Ricostruisci lo stato della catena e l'indice dei blocchi partendo dai file blk*.dat presenti sul disco</translation> + </message> + <message> + <source>Rebuild chain state from the currently indexed blocks</source> + <translation>Ricrea l'indice della catena dei blocchi partendo da quelli già indicizzati</translation> + </message> + <message> + <source>Rewinding blocks...</source> + <translation>Verifica blocchi...</translation> + </message> + <message> <source>Set database cache size in megabytes (%d to %d, default: %d)</source> <translation>Imposta la dimensione della cache del database in megabyte (%d a %d, predefinito: %d)</translation> </message> @@ -1876,6 +2235,14 @@ Per specificare più URL separarli con una barra verticale "|".</translation> <translation>Specifica il file del portamonete (all'interno della cartella dati)</translation> </message> <message> + <source>The source code is available from %s.</source> + <translation>Il codice sorgente è disponibile in %s</translation> + </message> + <message> + <source>Unable to bind to %s on this computer. %s is probably already running.</source> + <translation>Impossibile collegarsi a %s su questo computer. Probabilmente %s è già in esecuzione.</translation> + </message> + <message> <source>Unsupported argument -benchmark ignored, use -debug=bench.</source> <translation>Ignorata opzione -benchmark non supportata, utilizzare -debug=bench.</translation> </message> @@ -1908,6 +2275,14 @@ Per specificare più URL separarli con una barra verticale "|".</translation> <translation>Il portamonete %s si trova al di fuori dalla cartella dati %s</translation> </message> <message> + <source>Wallet debugging/testing options:</source> + <translation>Opzioni di Debug/Test del portafoglio:</translation> + </message> + <message> + <source>Wallet needed to be rewritten: restart %s to complete</source> + <translation>Il portamonete necessita di essere riscritto: riavviare %s per completare</translation> + </message> + <message> <source>Wallet options:</source> <translation>Opzioni portamonete:</translation> </message> @@ -1956,10 +2331,6 @@ Per specificare più URL separarli con una barra verticale "|".</translation> <translation>Dimensione massima dei dati in transazioni di trasporto dati che saranno trasmesse ed incluse nei blocchi (predefinito: %u)</translation> </message> <message> - <source>Query for peer addresses via DNS lookup, if low on addresses (default: 1 unless -connect)</source> - <translation>Ottiene gli indirizzi dei peer attraverso interrogazioni DNS, in caso di scarsa disponibilità (predefinito: 1 a meno che -connect non sia specificato)</translation> - </message> - <message> <source>Randomize credentials for every proxy connection. This enables Tor stream isolation (default: %u)</source> <translation>Randomizza le credenziali per ogni connessione proxy. Permette la Tor stream isolation (predefinito: %u)</translation> </message> @@ -1972,8 +2343,8 @@ Per specificare più URL separarli con una barra verticale "|".</translation> <translation>L'importo della transazione risulta troppo basso per l'invio una volta dedotte le commissioni.</translation> </message> <message> - <source>This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit <https://www.openssl.org/> and cryptographic software written by Eric Young and UPnP software written by Thomas Bernard.</source> - <translation>Questo prodotto include software sviluppato dal progetto OpenSSL per l'uso del Toolkit OpenSSL <https://www.openssl.org/>, software crittografico scritto da Eric Young e software UPnP scritto da Thomas Bernard.</translation> + <source>Use hierarchical deterministic key generation (HD) after BIP32. Only has effect during wallet creation/first start</source> + <translation>Usa la generazione gerarchica deterministica (HD) della chiave dopo BIP32. Valido solamente durante la creazione del portafoglio o al primo avvio</translation> </message> <message> <source>Whitelisted peers cannot be DoS banned and their transactions are always relayed, even if they are already in the mempool, useful e.g. for a gateway</source> @@ -2084,10 +2455,6 @@ Per specificare più URL separarli con una barra verticale "|".</translation> <translation>Importo transazione troppo piccolo</translation> </message> <message> - <source>Transaction amounts must be positive</source> - <translation>Gli importi della transazione devono essere positivi</translation> - </message> - <message> <source>Transaction too large for fee policy</source> <translation>Transazione troppo grande in base alla policy sulle commissioni</translation> </message> @@ -2112,6 +2479,10 @@ Per specificare più URL separarli con una barra verticale "|".</translation> <translation>Attenzione</translation> </message> <message> + <source>Warning: unknown new rules activated (versionbit %i)</source> + <translation>Attenzione: nuove regole non conosciute attivate (versionbit %i)</translation> + </message> + <message> <source>Whether to operate in a blocks only mode (default: %u)</source> <translation>Imposta se operare in modalità solo blocchi (default: %u)</translation> </message> @@ -2148,14 +2519,14 @@ Per specificare più URL separarli con una barra verticale "|".</translation> <translation>-maxtxfee è impostato molto alto! Commissioni così alte possono venir pagate anche su una singola transazione.</translation> </message> <message> - <source>-paytxfee is set very high! This is the transaction fee you will pay if you send a transaction.</source> - <translation>-paytxfee è impostato su un valore molto elevato. Questa è la commissione che si paga quando si invia una transazione.</translation> - </message> - <message> <source>Do not keep transactions in the mempool longer than <n> hours (default: %u)</source> <translation>Non mantenere le transazioni nella mempool più a lungo di <n> ore (default: %u)</translation> </message> <message> + <source>Equivalent bytes per sigop in transactions for relay and mining (default: %u)</source> + <translation>Byte equivalenti per ottimizzazione segnale dedicati a ritrasmissione ed estrazione (default: %u)</translation> + </message> + <message> <source>Fees (in %s/kB) smaller than this are considered zero fee for transaction creation (default: %s)</source> <translation>Le commissioni (in %s/kB) inferiori a questo valore sono considerate pari a zero per la creazione della transazione (default: %s)</translation> </message> @@ -2192,12 +2563,20 @@ Per specificare più URL separarli con una barra verticale "|".</translation> <translation>Argomento -socks non supportato. Non è più possibile impostare la versione SOCKS, solamente i proxy SOCKS5 sono supportati.</translation> </message> <message> + <source>Unsupported argument -whitelistalwaysrelay ignored, use -whitelistrelay and/or -whitelistforcerelay.</source> + <translation>Argomento non supportato -whitelistalwaysrelay è stato ignorato, utilizzare -whitelistrelay e/o -whitelistforcerelay.</translation> + </message> + <message> <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: %s)</source> <translation>Usa un proxy SOCKS5 a parte per raggiungere i peer attraverso gli hidden services di Tor (predefinito: %s)</translation> </message> <message> - <source>Username and hashed password for JSON-RPC connections. The field <userpw> comes in the format: <USERNAME>:<SALT>$<HASH>. A canonical python script is included in share/rpcuser. This option can be specified multiple times</source> - <translation>Username e hash password per connessioni JSON-RPC. Il campo <userpw> utilizza il formato: <USERNAME>:<SALT>$<HASH>. Uno script python standard è incluso in share/rpcuser. Questa opzione può essere specificata più volte</translation> + <source>Warning: Unknown block versions being mined! It's possible unknown rules are in effect</source> + <translation>Attenzione: si stanno minando versioni sconocsiute di blocchi! E' possibile che siano attive regole sconosciute</translation> + </message> + <message> + <source>Warning: Wallet file corrupt, data salvaged! Original %s saved as %s in %s; if your balance or transactions are incorrect you should restore from a backup.</source> + <translation>Attenzione: file del Portafoglio corrotto, dati recuperati! %s originale salvato come %s in %s; se il saldo o le transazioni non sono corrette effettua un ripristino da un backup.</translation> </message> <message> <source>(default: %s)</source> @@ -2260,8 +2639,8 @@ Per specificare più URL separarli con una barra verticale "|".</translation> <translation>Imposta la dimensione del pool di chiavi a <n> (predefinito: %u)</translation> </message> <message> - <source>Set minimum block size in bytes (default: %u)</source> - <translation>Imposta la dimensione minima del blocco in byte (predefinito: %u)</translation> + <source>Set maximum BIP141 block weight (default: %d)</source> + <translation>Imposta la dimensione massima del blocco BIP141 (default: %d)</translation> </message> <message> <source>Set the number of threads to service RPC calls (default: %d)</source> diff --git a/src/qt/locale/bitcoin_it_IT.ts b/src/qt/locale/bitcoin_it_IT.ts index f89f4bdc48..09d40497fa 100644 --- a/src/qt/locale/bitcoin_it_IT.ts +++ b/src/qt/locale/bitcoin_it_IT.ts @@ -41,7 +41,10 @@ <source>&Delete</source> <translation>Cancella</translation> </message> -</context> + </context> +<context> + <name>AddressTableModel</name> + </context> <context> <name>AskPassphraseDialog</name> <message> @@ -56,10 +59,18 @@ <source>Repeat new passphrase</source> <translation>Ripeti nuova passphrase</translation> </message> + <message> + <source>Warning: The Caps Lock key is on!</source> + <translation>Attenzione: Il tasto blocco delle maiuscole è attivo!</translation> + </message> </context> <context> <name>BanTableModel</name> <message> + <source>IP/Netmask</source> + <translation>IP/Netmask</translation> + </message> + <message> <source>Banned Until</source> <translation>bannato fino </translation> </message> @@ -87,6 +98,9 @@ <name>Intro</name> </context> <context> + <name>ModalOverlay</name> + </context> +<context> <name>OpenURIDialog</name> </context> <context> @@ -96,12 +110,21 @@ <name>OverviewPage</name> </context> <context> + <name>PaymentServer</name> + </context> +<context> <name>PeerTableModel</name> </context> <context> <name>QObject</name> </context> <context> + <name>QObject::QObject</name> + </context> +<context> + <name>QRImageWidget</name> + </context> +<context> <name>RPCConsole</name> </context> <context> @@ -111,12 +134,18 @@ <name>ReceiveRequestDialog</name> </context> <context> + <name>RecentRequestsTableModel</name> + </context> +<context> <name>SendCoinsDialog</name> </context> <context> <name>SendCoinsEntry</name> </context> <context> + <name>SendConfirmationDialog</name> + </context> +<context> <name>ShutdownWindow</name> </context> <context> @@ -129,12 +158,30 @@ <name>TrafficGraphWidget</name> </context> <context> + <name>TransactionDesc</name> + </context> +<context> <name>TransactionDescDialog</name> </context> <context> + <name>TransactionTableModel</name> + </context> +<context> + <name>TransactionView</name> + </context> +<context> <name>UnitDisplayStatusBarControl</name> </context> <context> + <name>WalletFrame</name> + </context> +<context> + <name>WalletModel</name> + </context> +<context> + <name>WalletView</name> + </context> +<context> <name>bitcoin-core</name> </context> </TS>
\ No newline at end of file diff --git a/src/qt/locale/bitcoin_ja.ts b/src/qt/locale/bitcoin_ja.ts index 4948cc3067..f81818896f 100644 --- a/src/qt/locale/bitcoin_ja.ts +++ b/src/qt/locale/bitcoin_ja.ts @@ -41,6 +41,77 @@ <source>&Delete</source> <translation>削除(&D)</translation> </message> + <message> + <source>Choose the address to send coins to</source> + <translation>先のアドレスを選択</translation> + </message> + <message> + <source>Choose the address to receive coins with</source> + <translation>支払いを受け取るアドレスを指定する</translation> + </message> + <message> + <source>C&hoose</source> + <translation>選択 (&C)</translation> + </message> + <message> + <source>Sending addresses</source> + <translation>送金用</translation> + </message> + <message> + <source>Receiving addresses</source> + <translation>受け取りアドレス</translation> + </message> + <message> + <source>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source> + <translation>これらは支払いを送信するためのあなたの Bitcoin アドレスです。コインを送信する前に、常に額と受信アドレスを確認してください。</translation> + </message> + <message> + <source>These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction.</source> + <translation>これらは支払いを受け取るためのビットコインアドレスです。トランザクションごとに新しい受け取り用アドレスを作成することが推奨されます。</translation> + </message> + <message> + <source>&Copy Address</source> + <translation>アドレスをコピー (&C)</translation> + </message> + <message> + <source>Copy &Label</source> + <translation>ラベルをコピー (&L)</translation> + </message> + <message> + <source>&Edit</source> + <translation>編集 (&E)</translation> + </message> + <message> + <source>Export Address List</source> + <translation>アドレス帳をエクスポート</translation> + </message> + <message> + <source>Comma separated file (*.csv)</source> + <translation>テキスト CSV (*.csv)</translation> + </message> + <message> + <source>Exporting Failed</source> + <translation>エクスポートに失敗しました</translation> + </message> + <message> + <source>There was an error trying to save the address list to %1. Please try again.</source> + <translation>トランザクション履歴を %1 へ保存する際にエラーが発生しました。再試行してください。</translation> + </message> +</context> +<context> + <name>AddressTableModel</name> + <message> + <source>Label</source> + <translation>ラベル</translation> + </message> + <message> + <source>Address</source> + <translation>アドレス</translation> + </message> + <message> + <source>(no label)</source> + <translation>(ラベル無し)</translation> + </message> </context> <context> <name>AskPassphraseDialog</name> @@ -60,6 +131,94 @@ <source>Repeat new passphrase</source> <translation>新しいパスフレーズをもう一度</translation> </message> + <message> + <source>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>.</source> + <translation>ウォレットの新しいパスフレーズを入力してください。<br/><b>10文字以上のランダムな文字</b>で構成されたものか、<b>8単語以上の単語</b>で構成されたパスフレーズを使用してください。</translation> + </message> + <message> + <source>Encrypt wallet</source> + <translation>ウォレットを暗号化する</translation> + </message> + <message> + <source>This operation needs your wallet passphrase to unlock the wallet.</source> + <translation>この操作はウォレットをアンロックするためにパスフレーズが必要です。</translation> + </message> + <message> + <source>Unlock wallet</source> + <translation>ウォレットをアンロックする</translation> + </message> + <message> + <source>This operation needs your wallet passphrase to decrypt the wallet.</source> + <translation>この操作はウォレットの暗号化解除のためにパスフレーズが必要です。</translation> + </message> + <message> + <source>Decrypt wallet</source> + <translation>ウォレットの暗号化を解除する</translation> + </message> + <message> + <source>Change passphrase</source> + <translation>パスフレーズの変更</translation> + </message> + <message> + <source>Enter the old passphrase and new passphrase to the wallet.</source> + <translation>ウォレットの古いパスフレーズおよび新しいパスフレーズを入力してください。</translation> + </message> + <message> + <source>Confirm wallet encryption</source> + <translation>ウォレットの暗号化を確認する</translation> + </message> + <message> + <source>Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR BITCOINS</b>!</source> + <translation>警告: もしもあなたのウォレットを暗号化してパスフレーズを失ってしまったなら、<b>あなたの Bitcoin はすべて失われます</b>!</translation> + </message> + <message> + <source>Are you sure you wish to encrypt your wallet?</source> + <translation>本当にウォレットを暗号化しますか?</translation> + </message> + <message> + <source>Wallet encrypted</source> + <translation>ウォレットは暗号化されました</translation> + </message> + <message> + <source>%1 will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your bitcoins from being stolen by malware infecting your computer.</source> + <translation>暗号化処理を完了させるため %1 をいますぐ終了します。ウォレットの暗号化では、コンピュータに感染したマルウェアなどによるビットコインの盗難から完全に守ることはできないことにご注意ください。</translation> + </message> + <message> + <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source> + <translation>重要: 過去のウォレット ファイルのバックアップは、暗号化された新しいウォレット ファイルに取り替える必要があります。セキュリティ上の理由により、暗号化された新しいウォレットを使い始めると、暗号化されていないウォレット ファイルのバックアップはすぐに使えなくなります。</translation> + </message> + <message> + <source>Wallet encryption failed</source> + <translation>ウォレットの暗号化に失敗しました</translation> + </message> + <message> + <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source> + <translation>内部エラーによりウォレットの暗号化が失敗しました。ウォレットは暗号化されませんでした。</translation> + </message> + <message> + <source>The supplied passphrases do not match.</source> + <translation>パスフレーズが同じではありません。</translation> + </message> + <message> + <source>Wallet unlock failed</source> + <translation>ウォレットのアンロックに失敗しました</translation> + </message> + <message> + <source>The passphrase entered for the wallet decryption was incorrect.</source> + <translation>ウォレットの暗号化解除のパスフレーズが正しくありません。</translation> + </message> + <message> + <source>Wallet decryption failed</source> + <translation>ウォレットの暗号化解除に失敗しました</translation> + </message> + <message> + <source>Wallet passphrase was successfully changed.</source> + <translation>ウォレットのパスフレーズの変更が成功しました。</translation> + </message> + <message> + <source>Warning: The Caps Lock key is on!</source> + <translation>警告: Caps Lock キーがオンになっています!</translation> + </message> </context> <context> <name>BanTableModel</name> @@ -159,6 +318,22 @@ <translation>URI を開く (&U)...</translation> </message> <message> + <source>Click to disable network activity.</source> + <translation>クリックするとネットワーク活動を無効化します。</translation> + </message> + <message> + <source>Network activity disabled.</source> + <translation>ネットワーク活動は無効化されました。</translation> + </message> + <message> + <source>Click to enable network activity again.</source> + <translation>クリックするとネットワーク活動を再び有効化します。</translation> + </message> + <message> + <source>Syncing Headers (%1%)...</source> + <translation>未知。ヘッダを同期しています (%1%)...</translation> + </message> + <message> <source>Reindexing blocks on disk...</source> <translation>ディスク上のブロックのインデックスを再作成中...</translation> </message> @@ -270,34 +445,10 @@ <source>Processing blocks on disk...</source> <translation>ディスク上のブロックを処理しています...</translation> </message> - <message> - <source>No block source available...</source> - <translation>利用可能なブロックがありません...</translation> - </message> <message numerus="yes"> <source>Processed %n block(s) of transaction history.</source> <translation><numerusform>トランザクション履歴の %n ブロックを処理しました。</numerusform></translation> </message> - <message numerus="yes"> - <source>%n hour(s)</source> - <translation><numerusform>%n 時間</numerusform></translation> - </message> - <message numerus="yes"> - <source>%n day(s)</source> - <translation><numerusform>%n 日</numerusform></translation> - </message> - <message numerus="yes"> - <source>%n week(s)</source> - <translation><numerusform>%n 週間</numerusform></translation> - </message> - <message> - <source>%1 and %2</source> - <translation>%1 と %2</translation> - </message> - <message numerus="yes"> - <source>%n year(s)</source> - <translation><numerusform>%n 年</numerusform></translation> - </message> <message> <source>%1 behind</source> <translation>%1 遅延</translation> @@ -335,6 +486,10 @@ <translation>%1 クライアント</translation> </message> <message> + <source>Connecting to peers...</source> + <translation>ピアに接続しています...</translation> + </message> + <message> <source>Catching up...</source> <translation>追跡中...</translation> </message> @@ -377,6 +532,14 @@ <translation>着金取引</translation> </message> <message> + <source>HD key generation is <b>enabled</b></source> + <translation>HD鍵生成は<b>有効化</b>されています</translation> + </message> + <message> + <source>HD key generation is <b>disabled</b></source> + <translation>HD鍵生成は<b>無効化</b>されています</translation> + </message> + <message> <source>Wallet is <b>encrypted</b> and currently <b>unlocked</b></source> <translation>ウォレットは<b>暗号化されて、アンロックされています</b></translation> </message> @@ -384,6 +547,10 @@ <source>Wallet is <b>encrypted</b> and currently <b>locked</b></source> <translation>ウォレットは<b>暗号化されて、ロックされています</b></translation> </message> + <message> + <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> + <translation>致命的なエラーが発生しました。Bitcoin は安全に継続することができず終了するでしょう。</translation> + </message> </context> <context> <name>CoinControlDialog</name> @@ -404,10 +571,6 @@ <translation>総額:</translation> </message> <message> - <source>Priority:</source> - <translation>優先度:</translation> - </message> - <message> <source>Fee:</source> <translation>手数料:</translation> </message> @@ -460,8 +623,84 @@ <translation>検証済み</translation> </message> <message> - <source>Priority</source> - <translation>優先度</translation> + <source>Copy address</source> + <translation>アドレスをコピーする</translation> + </message> + <message> + <source>Copy label</source> + <translation>ラベルをコピーする</translation> + </message> + <message> + <source>Copy amount</source> + <translation>総額のコピー</translation> + </message> + <message> + <source>Copy transaction ID</source> + <translation>取引 ID をコピー</translation> + </message> + <message> + <source>Lock unspent</source> + <translation>未使用トランザクションをロックする</translation> + </message> + <message> + <source>Unlock unspent</source> + <translation>未使用トランザクションをアンロックする</translation> + </message> + <message> + <source>Copy quantity</source> + <translation>数量をコピーする</translation> + </message> + <message> + <source>Copy fee</source> + <translation>手数料をコピーする</translation> + </message> + <message> + <source>Copy after fee</source> + <translation>手数料差引後の値をコピーする</translation> + </message> + <message> + <source>Copy bytes</source> + <translation>バイト数をコピーする</translation> + </message> + <message> + <source>Copy dust</source> + <translation>ダストをコピーする</translation> + </message> + <message> + <source>Copy change</source> + <translation>釣り銭をコピー</translation> + </message> + <message> + <source>(%1 locked)</source> + <translation>(%1 がロック済み)</translation> + </message> + <message> + <source>yes</source> + <translation>はい</translation> + </message> + <message> + <source>no</source> + <translation>いいえ</translation> + </message> + <message> + <source>This label turns red if any recipient receives an amount smaller than the current dust threshold.</source> + <translation>少なくともひとつの受取額が現在のダスト閾値を下回る場合にはこのラベルは赤くなります。</translation> + </message> + <message> + <source>Can vary +/- %1 satoshi(s) per input.</source> + <translation>ひとつの入力につき %1 satoshi 前後ずれることがあります。</translation> + </message> + <message> + <source>(no label)</source> + <translation>（ラベル無し）</translation> + </message> + <message> + <source>change from %1 (%2)</source> + <translation>%1 (%2) からのおつり</translation> + </message> + <message> + <source>(change)</source> + <translation>(おつり)</translation> </message> </context> <context> @@ -486,6 +725,38 @@ <source>&Address</source> <translation>アドレス帳 (&A)</translation> </message> + <message> + <source>New receiving address</source> + <translation>新しい受信アドレス</translation> + </message> + <message> + <source>New sending address</source> + <translation>新しい送信アドレス</translation> + </message> + <message> + <source>Edit receiving address</source> + <translation>入金アドレスを編集</translation> + </message> + <message> + <source>Edit sending address</source> + <translation>送信アドレスを編集</translation> + </message> + <message> + <source>The entered address "%1" is not a valid Bitcoin address.</source> + <translation>入力されたアドレス "%1" は無効な Bitcoin アドレスです。</translation> + </message> + <message> + <source>The entered address "%1" is already in the address book.</source> + <translation>入力されたアドレス "%1" は既にアドレス帳にあります。</translation> + </message> + <message> + <source>Could not unlock wallet.</source> + <translation>ウォレットをアンロックできませんでした。</translation> + </message> + <message> + <source>New key generation failed.</source> + <translation>新しいキーの生成に失敗しました。</translation> + </message> </context> <context> <name>FreespaceChecker</name> @@ -609,6 +880,57 @@ </message> </context> <context> + <name>ModalOverlay</name> + <message> + <source>Form</source> + <translation>フォーム</translation> + </message> + <message> + <source>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 bitcoin network, as detailed below.</source> + <translation>確認できない最近のトランザクションがあるかもしれません。これによりウォレットの残高は不正確なものである可能性があります。この情報はウォレットが一度ビットコインネットワークへの同期が完了すると正確なものとなります。詳細は下記を参照してください。</translation> + </message> + <message> + <source>Attempting to spend bitcoins that are affected by not-yet-displayed transactions will not be accepted by the network.</source> + <translation>まだ表示されていないトランザクションが影響するビットコインを使用しようとすると、ネットワークから認証がなされないでしょう。</translation> + </message> + <message> + <source>Number of blocks left</source> + <translation>残りのブロック数</translation> + </message> + <message> + <source>Unknown...</source> + <translation>未知...</translation> + </message> + <message> + <source>Last block time</source> + <translation>最終ブロックの日時</translation> + </message> + <message> + <source>Progress</source> + <translation>進捗</translation> + </message> + <message> + <source>Progress increase per hour</source> + <translation>進捗状況は一時間ごとに増加します</translation> + </message> + <message> + <source>calculating...</source> + <translation>計算しています...</translation> + </message> + <message> + <source>Estimated time left until synced</source> + <translation>同期完了までの推定残り時間</translation> + </message> + <message> + <source>Hide</source> + <translation>隠す</translation> + </message> + <message> + <source>Unknown. Syncing Headers (%1)...</source> + <translation>未知。ヘッダを同期しています (%1)...</translation> + </message> +</context> +<context> <name>OpenURIDialog</name> <message> <source>Open URI</source> @@ -626,6 +948,10 @@ <source>Select payment request file</source> <translation>支払いリクエストファイルを選択してください</translation> </message> + <message> + <source>Select payment request file to open</source> + <translation>開きたい支払いリクエストファイルを選択してください</translation> + </message> </context> <context> <name>OptionsDialog</name> @@ -938,6 +1264,97 @@ </message> </context> <context> + <name>PaymentServer</name> + <message> + <source>Payment request error</source> + <translation>支払いのリクエストのエラーです</translation> + </message> + <message> + <source>Cannot start bitcoin: click-to-pay handler</source> + <translation>Bitcoin を起動できません: click-to-pay handler</translation> + </message> + <message> + <source>URI handling</source> + <translation>URI の操作</translation> + </message> + <message> + <source>Payment request fetch URL is invalid: %1</source> + <translation>支払い要求の取得先URLが無効です: %1</translation> + </message> + <message> + <source>Invalid payment address %1</source> + <translation>支払いのアドレス「%1」は無効です</translation> + </message> + <message> + <source>URI cannot be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters.</source> + <translation>URI を解析できません! これは無効な Bitcoin アドレスあるいや不正な形式の URI パラメーターによって引き起こされる場合があります。</translation> + </message> + <message> + <source>Payment request file handling</source> + <translation>支払いリクエストファイルを処理しています</translation> + </message> + <message> + <source>Payment request file cannot be read! This can be caused by an invalid payment request file.</source> + <translation>支払いリクエストファイルを読み込めませんでした！無効な支払いリクエストファイルにより引き起こされた可能性があります。</translation> + </message> + <message> + <source>Payment request rejected</source> + <translation>支払い要求は拒否されました</translation> + </message> + <message> + <source>Payment request network doesn't match client network.</source> + <translation>支払いリクエストのネットワークは現在のクライアントのネットワークに一致しません。</translation> + </message> + <message> + <source>Payment request expired.</source> + <translation>支払いリクエストの期限が切れました。</translation> + </message> + <message> + <source>Payment request is not initialized.</source> + <translation>支払いリクエストは開始されていません。</translation> + </message> + <message> + <source>Unverified payment requests to custom payment scripts are unsupported.</source> + <translation>カスタム支払いスクリプトに対する、検証されていない支払いリクエストはサポートされていません。</translation> + </message> + <message> + <source>Invalid payment request.</source> + <translation>無効な支払いリクエスト。</translation> + </message> + <message> + <source>Requested payment amount of %1 is too small (considered dust).</source> + <translation>要求された支払額 %1 は少なすぎます (ダストとみなされてしまいます)。</translation> + </message> + <message> + <source>Refund from %1</source> + <translation>%1 からの返金</translation> + </message> + <message> + <source>Payment request %1 is too large (%2 bytes, allowed %3 bytes).</source> + <translation>支払リクエスト %1 は大きすぎます（%2バイトですが、%3バイトまでが許されています）。</translation> + </message> + <message> + <source>Error communicating with %1: %2</source> + <translation>%1: %2とコミュニケーション・エラーです</translation> + </message> + <message> + <source>Payment request cannot be parsed!</source> + <translation>支払リクエストを読み込めませんでした！</translation> + </message> + <message> + <source>Bad response from server %1</source> + <translation>サーバーの返事は無効 %1</translation> + </message> + <message> + <source>Network request error</source> + <translation>ネットワーク・リクエストのエラーです</translation> + </message> + <message> + <source>Payment acknowledged</source> + <translation>支払いは確認しました</translation> + </message> +</context> +<context> <name>PeerTableModel</name> <message> <source>User Agent</source> @@ -948,8 +1365,12 @@ <translation>ノード・サービス</translation> </message> <message> - <source>Ping Time</source> - <translation>Ping時間</translation> + <source>NodeId</source> + <translation>ノードID</translation> + </message> + <message> + <source>Ping</source> + <translation>Ping</translation> </message> </context> <context> @@ -990,6 +1411,72 @@ <source>%1 ms</source> <translation>%1ミリ秒</translation> </message> + <message numerus="yes"> + <source>%n second(s)</source> + <translation><numerusform>%n 秒</numerusform></translation> + </message> + <message numerus="yes"> + <source>%n minute(s)</source> + <translation><numerusform>%n 分</numerusform></translation> + </message> + <message numerus="yes"> + <source>%n hour(s)</source> + <translation><numerusform>%n 時間</numerusform></translation> + </message> + <message numerus="yes"> + <source>%n day(s)</source> + <translation><numerusform>%n 日</numerusform></translation> + </message> + <message numerus="yes"> + <source>%n week(s)</source> + <translation><numerusform>%n 週間</numerusform></translation> + </message> + <message> + <source>%1 and %2</source> + <translation>%1 と %2</translation> + </message> + <message numerus="yes"> + <source>%n year(s)</source> + <translation><numerusform>%n 年</numerusform></translation> + </message> + <message> + <source>%1 didn't yet exit safely...</source> + <translation>%1 はまだ安全に終了していません...</translation> + </message> +</context> +<context> + <name>QObject::QObject</name> + <message> + <source>Error: Specified data directory "%1" does not exist.</source> + <translation>エラー: 指定のデータ ディレクトリ "%1" は存在しません。</translation> + </message> + <message> + <source>Error: Cannot parse configuration file: %1. Only use key=value syntax.</source> + <translation>エラー: 設定ファイルをパースできません: %1。key=value という記法のみを利用してください。</translation> + </message> + <message> + <source>Error: %1</source> + <translation>エラー: %1</translation> + </message> +</context> +<context> + <name>QRImageWidget</name> + <message> + <source>&Save Image...</source> + <translation>画像を保存(&S)</translation> + </message> + <message> + <source>&Copy Image</source> + <translation>画像をコピー(&C)</translation> + </message> + <message> + <source>Save QR Code</source> + <translation>QR コードの保存</translation> + </message> + <message> + <source>PNG Image (*.png)</source> + <translation>PNG画像ファイル(*.png)</translation> + </message> </context> <context> <name>RPCConsole</name> @@ -1150,6 +1637,10 @@ <translation>Ping待ち</translation> </message> <message> + <source>Min Ping</source> + <translation>最小 Ping</translation> + </message> + <message> <source>Time Offset</source> <translation>時間オフセット</translation> </message> @@ -1194,14 +1685,6 @@ <translation>コンソールをクリア</translation> </message> <message> - <source>&Disconnect Node</source> - <translation>ノードを切断する (&D)</translation> - </message> - <message> - <source>Ban Node for</source> - <translation>ノードをbanする:</translation> - </message> - <message> <source>1 &hour</source> <translation>1時間 (&H)</translation> </message> @@ -1218,8 +1701,16 @@ <translation>1年 (&Y)</translation> </message> <message> - <source>&Unban Node</source> - <translation>ノードのbanを解除する (&U)</translation> + <source>&Disconnect</source> + <translation>切断 (&D)</translation> + </message> + <message> + <source>Ban for</source> + <translation>Banする:</translation> + </message> + <message> + <source>&Unban</source> + <translation>Banを解除する (&U)</translation> </message> <message> <source>Welcome to the %1 RPC console.</source> @@ -1234,6 +1725,14 @@ <translation>使用可能なコマンドを見るには <b>help</b> と入力します。</translation> </message> <message> + <source>WARNING: Scammers have been active, telling users to type commands here, stealing their wallet contents. Do not use this console without fully understanding the ramification of a command.</source> + <translation>警告: 詐欺師が活動しており、ユーザに対してここにコマンドを入力させることでウォレットの中身を盗もうとしています。コマンドの結果を完全に理解していない限り、このコンソールは利用しないでください。</translation> + </message> + <message> + <source>Network activity disabled</source> + <translation>ネットワーク活動は無効化されました</translation> + </message> + <message> <source>%1 B</source> <translation>%1 B</translation> </message> @@ -1352,6 +1851,22 @@ <source>Remove</source> <translation>削除</translation> </message> + <message> + <source>Copy URI</source> + <translation>URI をコピーする</translation> + </message> + <message> + <source>Copy label</source> + <translation>ラベルをコピーする</translation> + </message> + <message> + <source>Copy message</source> + <translation>メッセージをコピーする</translation> + </message> + <message> + <source>Copy amount</source> + <translation>総額のコピー</translation> + </message> </context> <context> <name>ReceiveRequestDialog</name> @@ -1371,6 +1886,73 @@ <source>&Save Image...</source> <translation>画像を保存(&S)</translation> </message> + <message> + <source>Request payment to %1</source> + <translation>%1 への支払いリクエストを行う</translation> + </message> + <message> + <source>Payment information</source> + <translation>支払い情報</translation> + </message> + <message> + <source>URI</source> + <translation>URI</translation> + </message> + <message> + <source>Address</source> + <translation>アドレス</translation> + </message> + <message> + <source>Amount</source> + <translation>総額</translation> + </message> + <message> + <source>Label</source> + <translation>ラベル</translation> + </message> + <message> + <source>Message</source> + <translation>メッセージ</translation> + </message> + <message> + <source>Resulting URI too long, try to reduce the text for label / message.</source> + <translation>URI が長くなり過ぎます。ラベルやメッセージのテキストを短くしてください。</translation> + </message> + <message> + <source>Error encoding URI into QR Code.</source> + <translation>QR コード用の URI エンコードでエラー。</translation> + </message> +</context> +<context> + <name>RecentRequestsTableModel</name> + <message> + <source>Date</source> + <translation>日付</translation> + </message> + <message> + <source>Label</source> + <translation>ラベル</translation> + </message> + <message> + <source>Message</source> + <translation>メッセージ</translation> + </message> + <message> + <source>(no label)</source> + <translation>（ラベル無し）</translation> + </message> + <message> + <source>(no message)</source> + <translation>（メッセージなし）</translation> + </message> + <message> + <source>(no amount requested)</source> + <translation>(金額指定なし)</translation> + </message> + <message> + <source>Requested</source> + <translation>要求</translation> + </message> </context> <context> <name>SendCoinsDialog</name> @@ -1407,10 +1989,6 @@ <translation>総額:</translation> </message> <message> - <source>Priority:</source> - <translation>優先度:</translation> - </message> - <message> <source>Fee:</source> <translation>手数料:</translation> </message> @@ -1479,10 +2057,6 @@ <translation>（スマート手数料はまだ初期化されていません。これにはおおよそ数ブロックほどかかります……）</translation> </message> <message> - <source>Confirmation time:</source> - <translation>検証時間：</translation> - </message> - <message> <source>normal</source> <translation>普通</translation> </message> @@ -1507,6 +2081,10 @@ <translation>ダスト：</translation> </message> <message> + <source>Confirmation time target:</source> + <translation>検証時間のターゲット:</translation> + </message> + <message> <source>Clear &All</source> <translation>すべてクリア (&A)</translation> </message> @@ -1522,6 +2100,126 @@ <source>S&end</source> <translation>送金 (&E)</translation> </message> + <message> + <source>Copy quantity</source> + <translation>数量をコピーする</translation> + </message> + <message> + <source>Copy amount</source> + <translation>総額のコピー</translation> + </message> + <message> + <source>Copy fee</source> + <translation>手数料をコピーする</translation> + </message> + <message> + <source>Copy after fee</source> + <translation>手数料差引後の値をコピーする</translation> + </message> + <message> + <source>Copy bytes</source> + <translation>バイト数をコピーする</translation> + </message> + <message> + <source>Copy dust</source> + <translation>ダストをコピーする</translation> + </message> + <message> + <source>Copy change</source> + <translation>釣り銭をコピー</translation> + </message> + <message> + <source>%1 to %2</source> + <translation>%1 から %2</translation> + </message> + <message> + <source>Are you sure you want to send?</source> + <translation>送ってよろしいですか？</translation> + </message> + <message> + <source>added as transaction fee</source> + <translation>取引手数料として追加された</translation> + </message> + <message> + <source>Total Amount %1</source> + <translation>合計： %1</translation> + </message> + <message> + <source>or</source> + <translation>または</translation> + </message> + <message> + <source>Confirm send coins</source> + <translation>コインを送る確認</translation> + </message> + <message> + <source>The recipient address is not valid. Please recheck.</source> + <translation>受取アドレスが不正です。再チェックしてください。</translation> + </message> + <message> + <source>The amount to pay must be larger than 0.</source> + <translation>支払額は0より大きくないといけません。</translation> + </message> + <message> + <source>The amount exceeds your balance.</source> + <translation>額が残高を超えています。</translation> + </message> + <message> + <source>The total exceeds your balance when the %1 transaction fee is included.</source> + <translation>%1 の取引手数料を含めると額が残高を超えています。</translation> + </message> + <message> + <source>Duplicate address found: addresses should only be used once each.</source> + <translation>重複したアドレスが見つかりました: アドレスはそれぞれ一度のみ使用することができます。</translation> + </message> + <message> + <source>Transaction creation failed!</source> + <translation>トラザクションの作成に失敗しました!</translation> + </message> + <message> + <source>The transaction was rejected with the following reason: %1</source> + <translation>トランザクションは以下の理由により拒絶されました: %1</translation> + </message> + <message> + <source>A fee higher than %1 is considered an absurdly high fee.</source> + <translation>%1 よりも高い手数料の場合、手数料が高すぎると判断されます。</translation> + </message> + <message> + <source>Payment request expired.</source> + <translation>支払いリクエストの期限が切れました。</translation> + </message> + <message numerus="yes"> + <source>%n block(s)</source> + <translation><numerusform>%n ブロック</numerusform></translation> + </message> + <message> + <source>Pay only the required fee of %1</source> + <translation>要求手数料 %1 のみを支払う</translation> + </message> + <message numerus="yes"> + <source>Estimated to begin confirmation within %n block(s).</source> + <translation><numerusform>%n ブロック以内に検証が開始されると予想されます。</numerusform></translation> + </message> + <message> + <source>Warning: Invalid Bitcoin address</source> + <translation>警告：無効なBitcoinアドレスです</translation> + </message> + <message> + <source>Warning: Unknown change address</source> + <translation>警告：未知のおつりアドレスです</translation> + </message> + <message> + <source>Confirm custom change address</source> + <translation>カスタムおつりアドレスを確認</translation> + </message> + <message> + <source>The address you selected for change is not part of this wallet. Any or all funds in your wallet may be sent to this address. Are you sure?</source> + <translation>おつりとして指定されたアドレスはこのウォレットに属さないもののようです。このウォレットの一部またはすべての資産がこのアドレスへ送金されます。よろしいですか？</translation> + </message> + <message> + <source>(no label)</source> + <translation>（ラベル無し）</translation> + </message> </context> <context> <name>SendCoinsEntry</name> @@ -1601,6 +2299,17 @@ <source>Memo:</source> <translation>メモ：</translation> </message> + <message> + <source>Enter a label for this address to add it to your address book</source> + <translation>アドレス帳に追加するには、このアドレスのラベルを入力します</translation> + </message> +</context> +<context> + <name>SendConfirmationDialog</name> + <message> + <source>Yes</source> + <translation>はい</translation> + </message> </context> <context> <name>ShutdownWindow</name> @@ -1699,6 +2408,58 @@ <source>Reset all verify message fields</source> <translation>入力項目の内容をすべて消去します</translation> </message> + <message> + <source>Click "Sign Message" to generate signature</source> + <translation>署名を作成するには"メッセージの署名"をクリック</translation> + </message> + <message> + <source>The entered address is invalid.</source> + <translation>不正なアドレスが入力されました。</translation> + </message> + <message> + <source>Please check the address and try again.</source> + <translation>アドレスを確かめてからもう一度試してください。</translation> + </message> + <message> + <source>The entered address does not refer to a key.</source> + <translation>入力されたアドレスに関連するキーがありません。</translation> + </message> + <message> + <source>Wallet unlock was cancelled.</source> + <translation>ウォレットのアンロックはキャンセルされました。</translation> + </message> + <message> + <source>Private key for the entered address is not available.</source> + <translation>入力されたアドレスのプライベート キーが無効です。</translation> + </message> + <message> + <source>Message signing failed.</source> + <translation>メッセージの署名に失敗しました。</translation> + </message> + <message> + <source>Message signed.</source> + <translation>メッセージに署名しました。</translation> + </message> + <message> + <source>The signature could not be decoded.</source> + <translation>署名がデコードできません。</translation> + </message> + <message> + <source>Please check the signature and try again.</source> + <translation>署名を確認してからもう一度試してください。</translation> + </message> + <message> + <source>The signature did not match the message digest.</source> + <translation>署名はメッセージ ダイジェストと一致しませんでした。</translation> + </message> + <message> + <source>Message verification failed.</source> + <translation>メッセージの検証に失敗しました。</translation> + </message> + <message> + <source>Message verified.</source> + <translation>メッセージは検証されました。</translation> + </message> </context> <context> <name>SplashScreen</name> @@ -1715,11 +2476,460 @@ </message> </context> <context> + <name>TransactionDesc</name> + <message numerus="yes"> + <source>Open for %n more block(s)</source> + <translation><numerusform>%n 以上のブロックを開く</numerusform></translation> + </message> + <message> + <source>Open until %1</source> + <translation>ユニット %1 を開く</translation> + </message> + <message> + <source>conflicted with a transaction with %1 confirmations</source> + <translation>%1 検証のトランザクションと衝突</translation> + </message> + <message> + <source>%1/offline</source> + <translation>%1/オフライン</translation> + </message> + <message> + <source>0/unconfirmed, %1</source> + <translation>0/未検証, %1</translation> + </message> + <message> + <source>in memory pool</source> + <translation>メモリプール内</translation> + </message> + <message> + <source>not in memory pool</source> + <translation>メモリプール外</translation> + </message> + <message> + <source>abandoned</source> + <translation>中止</translation> + </message> + <message> + <source>%1/unconfirmed</source> + <translation>%1/未検証</translation> + </message> + <message> + <source>%1 confirmations</source> + <translation>%1 確認</translation> + </message> + <message> + <source>Status</source> + <translation>ステータス</translation> + </message> + <message> + <source>, has not been successfully broadcast yet</source> + <translation>まだブロードキャストが成功していません</translation> + </message> + <message numerus="yes"> + <source>, broadcast through %n node(s)</source> + <translation><numerusform>%n ノードにブロードキャスト</numerusform></translation> + </message> + <message> + <source>Date</source> + <translation>日付</translation> + </message> + <message> + <source>Source</source> + <translation>ソース</translation> + </message> + <message> + <source>Generated</source> + <translation>生成された</translation> + </message> + <message> + <source>From</source> + <translation>送信</translation> + </message> + <message> + <source>unknown</source> + <translation>未確認</translation> + </message> + <message> + <source>To</source> + <translation>受信</translation> + </message> + <message> + <source>own address</source> + <translation>自分のアドレス</translation> + </message> + <message> + <source>watch-only</source> + <translation>監視限定</translation> + </message> + <message> + <source>label</source> + <translation>ラベル</translation> + </message> + <message> + <source>Credit</source> + <translation>クレジット</translation> + </message> + <message numerus="yes"> + <source>matures in %n more block(s)</source> + <translation><numerusform>あと %n ブロックで成熟します</numerusform></translation> + </message> + <message> + <source>not accepted</source> + <translation>承認されなかった</translation> + </message> + <message> + <source>Debit</source> + <translation>引き落とし額</translation> + </message> + <message> + <source>Total debit</source> + <translation>総出金額</translation> + </message> + <message> + <source>Total credit</source> + <translation>総入金額</translation> + </message> + <message> + <source>Transaction fee</source> + <translation>取引手数料</translation> + </message> + <message> + <source>Net amount</source> + <translation>正味金額</translation> + </message> + <message> + <source>Message</source> + <translation>メッセージ</translation> + </message> + <message> + <source>Comment</source> + <translation>コメント</translation> + </message> + <message> + <source>Transaction ID</source> + <translation>取引 ID</translation> + </message> + <message> + <source>Transaction total size</source> + <translation>トランザクションの全体サイズ</translation> + </message> + <message> + <source>Output index</source> + <translation>出力インデックス</translation> + </message> + <message> + <source>Merchant</source> + <translation>商人</translation> + </message> + <message> + <source>Generated coins must mature %1 blocks before they can be spent. When you generated this block, it was broadcast to the network to be added to the block chain. If it fails to get into the chain, its state will change to "not accepted" and it won't be spendable. This may occasionally happen if another node generates a block within a few seconds of yours.</source> + <translation>生成されたコインは使う前に%1のブロックを完成させる必要があります。あなたが生成した時、このブロックはブロック チェーンに追加されるネットワークにブロードキャストされました。チェーンに追加されるのが失敗した場合、状態が"不承認"に変更されて使えなくなるでしょう。これは、別のノードがあなたの数秒前にブロックを生成する場合に時々起こるかもしれません。</translation> + </message> + <message> + <source>Debug information</source> + <translation>デバッグ情報</translation> + </message> + <message> + <source>Transaction</source> + <translation>取引</translation> + </message> + <message> + <source>Inputs</source> + <translation>入力</translation> + </message> + <message> + <source>Amount</source> + <translation>総額</translation> + </message> + <message> + <source>true</source> + <translation>正しい</translation> + </message> + <message> + <source>false</source> + <translation>正しくない</translation> + </message> +</context> +<context> <name>TransactionDescDialog</name> <message> <source>This pane shows a detailed description of the transaction</source> <translation>ここでは取引の詳細を表示しています</translation> </message> + <message> + <source>Details for %1</source> + <translation>%1 の詳細</translation> + </message> +</context> +<context> + <name>TransactionTableModel</name> + <message> + <source>Date</source> + <translation>日付</translation> + </message> + <message> + <source>Type</source> + <translation>タイプ</translation> + </message> + <message> + <source>Label</source> + <translation>ラベル</translation> + </message> + <message numerus="yes"> + <source>Open for %n more block(s)</source> + <translation><numerusform>%n 以上のブロックを開く</numerusform></translation> + </message> + <message> + <source>Open until %1</source> + <translation>ユニット %1 を開く</translation> + </message> + <message> + <source>Offline</source> + <translation>オフライン</translation> + </message> + <message> + <source>Unconfirmed</source> + <translation>未検証</translation> + </message> + <message> + <source>Abandoned</source> + <translation>中止</translation> + </message> + <message> + <source>Confirming (%1 of %2 recommended confirmations)</source> + <translation>検証中（%2の推奨検証数のうち、%1検証が完了）</translation> + </message> + <message> + <source>Confirmed (%1 confirmations)</source> + <translation>検証されました (%1 検証済み)</translation> + </message> + <message> + <source>Conflicted</source> + <translation>衝突</translation> + </message> + <message> + <source>Immature (%1 confirmations, will be available after %2)</source> + <translation>未成熟（%1検証。%2検証完了後に使用可能となります）</translation> + </message> + <message> + <source>This block was not received by any other nodes and will probably not be accepted!</source> + <translation>このブロックは他のどのノードによっても受け取られないで、多分受け入れられないでしょう！</translation> + </message> + <message> + <source>Generated but not accepted</source> + <translation>生成されましたが承認されませんでした</translation> + </message> + <message> + <source>Received with</source> + <translation>送り主</translation> + </message> + <message> + <source>Received from</source> + <translation>送り主</translation> + </message> + <message> + <source>Sent to</source> + <translation>送り先</translation> + </message> + <message> + <source>Payment to yourself</source> + <translation>自分自身への支払い</translation> + </message> + <message> + <source>Mined</source> + <translation>発掘した</translation> + </message> + <message> + <source>watch-only</source> + <translation>監視限定</translation> + </message> + <message> + <source>(n/a)</source> + <translation>(n/a)</translation> + </message> + <message> + <source>(no label)</source> + <translation>（ラベル無し）</translation> + </message> + <message> + <source>Transaction status. Hover over this field to show number of confirmations.</source> + <translation>取引の状況。このフィールドの上にカーソルを置くと検証の数を表示します。</translation> + </message> + <message> + <source>Date and time that the transaction was received.</source> + <translation>取引を受信した日時。</translation> + </message> + <message> + <source>Type of transaction.</source> + <translation>取引の種類。</translation> + </message> + <message> + <source>Whether or not a watch-only address is involved in this transaction.</source> + <translation>監視限定アドレスがこのトランザクションに含まれているかどうか</translation> + </message> + <message> + <source>User-defined intent/purpose of the transaction.</source> + <translation>ユーザ定義のトランザクションの意図や目的。</translation> + </message> + <message> + <source>Amount removed from or added to balance.</source> + <translation>残高に追加または削除された総額。</translation> + </message> +</context> +<context> + <name>TransactionView</name> + <message> + <source>All</source> + <translation>すべて</translation> + </message> + <message> + <source>Today</source> + <translation>今日</translation> + </message> + <message> + <source>This week</source> + <translation>今週</translation> + </message> + <message> + <source>This month</source> + <translation>今月</translation> + </message> + <message> + <source>Last month</source> + <translation>先月</translation> + </message> + <message> + <source>This year</source> + <translation>今年</translation> + </message> + <message> + <source>Range...</source> + <translation>期間...</translation> + </message> + <message> + <source>Received with</source> + <translation>送り主</translation> + </message> + <message> + <source>Sent to</source> + <translation>送り先</translation> + </message> + <message> + <source>To yourself</source> + <translation>自分自身</translation> + </message> + <message> + <source>Mined</source> + <translation>発掘した</translation> + </message> + <message> + <source>Other</source> + <translation>その他</translation> + </message> + <message> + <source>Enter address or label to search</source> + <translation>検索するアドレスまたはラベルを入力</translation> + </message> + <message> + <source>Min amount</source> + <translation>最小の額</translation> + </message> + <message> + <source>Abandon transaction</source> + <translation>取引の中止</translation> + </message> + <message> + <source>Copy address</source> + <translation>アドレスをコピーする</translation> + </message> + <message> + <source>Copy label</source> + <translation>ラベルをコピーする</translation> + </message> + <message> + <source>Copy amount</source> + <translation>総額のコピー</translation> + </message> + <message> + <source>Copy transaction ID</source> + <translation>取引 ID をコピー</translation> + </message> + <message> + <source>Copy raw transaction</source> + <translation>生トランザクションをコピー</translation> + </message> + <message> + <source>Copy full transaction details</source> + <translation>トランザクションの詳細すべてをコピー</translation> + </message> + <message> + <source>Edit label</source> + <translation>ラベルの編集</translation> + </message> + <message> + <source>Show transaction details</source> + <translation>取引の詳細を表示</translation> + </message> + <message> + <source>Export Transaction History</source> + <translation>トランザクション履歴をエクスポートする</translation> + </message> + <message> + <source>Comma separated file (*.csv)</source> + <translation>テキスト CSV (*.csv)</translation> + </message> + <message> + <source>Confirmed</source> + <translation>検証済み</translation> + </message> + <message> + <source>Watch-only</source> + <translation>監視限定</translation> + </message> + <message> + <source>Date</source> + <translation>日付</translation> + </message> + <message> + <source>Type</source> + <translation>タイプ</translation> + </message> + <message> + <source>Label</source> + <translation>ラベル</translation> + </message> + <message> + <source>Address</source> + <translation>アドレス</translation> + </message> + <message> + <source>ID</source> + <translation>ID</translation> + </message> + <message> + <source>Exporting Failed</source> + <translation>エクスポートに失敗しました</translation> + </message> + <message> + <source>There was an error trying to save the transaction history to %1.</source> + <translation>トランザクション履歴を %1 へ保存する際にエラーが発生しました。</translation> + </message> + <message> + <source>Exporting Successful</source> + <translation>エクスポートに成功しました</translation> + </message> + <message> + <source>The transaction history was successfully saved to %1.</source> + <translation>トランザクション履歴は正常に%1に保存されました。</translation> + </message> + <message> + <source>Range:</source> + <translation>期間:</translation> + </message> + <message> + <source>to</source> + <translation>から</translation> + </message> </context> <context> <name>UnitDisplayStatusBarControl</name> @@ -1729,6 +2939,55 @@ </message> </context> <context> + <name>WalletFrame</name> + <message> + <source>No wallet has been loaded.</source> + <translation>ウォレットがロードされていません</translation> + </message> +</context> +<context> + <name>WalletModel</name> + <message> + <source>Send Coins</source> + <translation>コインを送る</translation> + </message> +</context> +<context> + <name>WalletView</name> + <message> + <source>&Export</source> + <translation>エクスポート (&E)</translation> + </message> + <message> + <source>Export the data in the current tab to a file</source> + <translation>ファイルに現在のタブのデータをエクスポート</translation> + </message> + <message> + <source>Backup Wallet</source> + <translation>ウォレットのバックアップ</translation> + </message> + <message> + <source>Wallet Data (*.dat)</source> + <translation>ウォレット データ (*.dat)</translation> + </message> + <message> + <source>Backup Failed</source> + <translation>バックアップに失敗しました</translation> + </message> + <message> + <source>There was an error trying to save the wallet data to %1.</source> + <translation>ウォレットデータを%1へ保存する際にエラーが発生しました。</translation> + </message> + <message> + <source>Backup Successful</source> + <translation>バックアップ成功</translation> + </message> + <message> + <source>The wallet data was successfully saved to %1.</source> + <translation>ウォレット データは正常に%1に保存されました。</translation> + </message> +</context> +<context> <name>bitcoin-core</name> <message> <source>Options:</source> @@ -1751,6 +3010,18 @@ <translation>コマンドラインと JSON-RPC コマンドを許可</translation> </message> <message> + <source>Accept connections from outside (default: 1 if no -proxy or -connect/-noconnect)</source> + <translation>外部からの接続を許可 (初期値: -proxy または -connect/-noconnect を使用していない場合は1)</translation> + </message> + <message> + <source>Connect only to the specified node(s); -noconnect or -connect=0 alone to disable automatic connections</source> + <translation>指定されたノードにのみ接続を行う; -noconnect または -connect=0 だけを指定すると自動接続を無効化します</translation> + </message> + <message> + <source>Distributed under the MIT software license, see the accompanying file %s or %s</source> + <translation>MITソフトウェアライセンスのもとで配布されています。付属のファイル %s または %s を参照してください</translation> + </message> + <message> <source>If <category> is not supplied or if <category> = 1, output all debugging information.</source> <translation><category> が与えられなかった場合や <category> = 1 の場合には、すべてのデバッグ情報が出力されます。</translation> </message> @@ -1763,10 +3034,6 @@ <translation>剪定: 最後のウォレット同期ポイントは、選定されたデータよりも過去のものとなっています。-reindexをする必要があります (剪定されたノードの場合、ブロックチェイン全体をダウンロードします)</translation> </message> <message> - <source>Reduce storage requirements by pruning (deleting) old blocks. This mode is incompatible with -txindex and -rescan. Warning: Reverting this setting requires re-downloading the entire blockchain. (default: 0 = disable pruning blocks, >%u = target size in MiB to use for block files)</source> - <translation>古いブロックを剪定する (削除する) ことで記憶容量の必要量を削減する。このモードを有効にすると-txindexや-rescanと互換性がなくなります。警告: この設定の再有効化には全ブロックチェインの再ダウンロードが必要となります。(規定値: 0 = ブロックの剪定無効、>%u = ブロックファイルに使用するMiB単位の目標サイズ)</translation> - </message> - <message> <source>Rescans are not possible in pruned mode. You will need to use -reindex which will download the whole blockchain again.</source> <translation>剪定モードでは再スキャンを行うことはできません。-reindexを指定し、ブロックチェイン全体を再ダウンロードする必要があります。</translation> </message> @@ -1791,10 +3058,6 @@ <translation>HTTPサーバを開始できませんでした。詳細はデバッグログをご確認ください。</translation> </message> <message> - <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> - <translation>外部からの接続を許可 (初期値: -proxy または -connect を使用していない場合は1)</translation> - </message> - <message> <source>Bitcoin Core</source> <translation>Bitcoin のコア</translation> </message> @@ -1803,10 +3066,6 @@ <translation>%s の開発者</translation> </message> <message> - <source>-fallbackfee is set very high! This is the transaction fee you may pay when fee estimates are not available.</source> - <translation>-fallbackfee が高すぎます！これは手数料の推定機能が利用できない場合に支払うトランザクション手数料です。</translation> - </message> - <message> <source>A fee rate (in %s/kB) that will be used when fee estimation has insufficient data (default: %s)</source> <translation>十分なデータが蓄積されていない場合に手数料推定機能が利用する手数料レート (%s/kB) (デフォルト: %s)</translation> </message> @@ -1827,10 +3086,6 @@ <translation>ウォレットの全トランザクションを削除し、これらを-rescanオプションを用いることで起動時にブロックチェインのデータのみからリカバリします。</translation> </message> <message> - <source>Distributed under the MIT software license, see the accompanying file COPYING or <http://www.opensource.org/licenses/mit-license.php>.</source> - <translation>MITソフトウェアライセンスのもとで配布されています。付属のCOPYINGファイルまたは<http://www.opensource.org/licenses/mit-license.php>を参照してください。</translation> - </message> - <message> <source>Error loading %s: You can't enable HD on a already existing non-HD wallet</source> <translation>%s の読み込みエラー: 非HDウォレットが既に存在するため、HDウォレットを有効化できません</translation> </message> @@ -1843,8 +3098,12 @@ <translation>ウォレットの取引を変更する際にコマンドを実行 (cmd の %s は TxID に置換される)</translation> </message> <message> - <source>Force relay of transactions from whitelisted peers even they violate local relay policy (default: %d)</source> - <translation>ホワイトリストのピアから受け取ったトランザクションに関しては、たとえローカルの中継ポリシーに違反しているとしても中継を行うようにする (デフォルト: %d)</translation> + <source>Extra transactions to keep in memory for compact block reconstructions (default: %u)</source> + <translation>コンパクトブロック再構成のために追加のトランザクションをメモリ内に保管しておく (デフォルト: %u)</translation> + </message> + <message> + <source>If this block is in the chain assume that it and its ancestors are valid and potentially skip their script verification (0 to verify all, default: %s, testnet: %s)</source> + <translation>このブロックがブロックチェーン内に含まれていた場合には、このブロックおよびそれ以前のすべてのブロックを有効であるとみなし、スクリプトの検証を省略する (0ならすべてを検証、デフォルト: %s、テストネット: %s)</translation> </message> <message> <source>Maximum allowed median peer time offset adjustment. Local perspective of time may be influenced by peers forward or backward by this amount. (default: %u seconds)</source> @@ -1863,6 +3122,14 @@ <translation>%s が有用だと感じられた方はぜひプロジェクトへの貢献をお願いします。ソフトウェアのより詳細な情報については %s をご覧ください。</translation> </message> <message> + <source>Reduce storage requirements by enabling pruning (deleting) of old blocks. This allows the pruneblockchain RPC to be called to delete specific blocks, and enables automatic pruning of old blocks if a target size in MiB is provided. This mode is incompatible with -txindex and -rescan. Warning: Reverting this setting requires re-downloading the entire blockchain. (default: 0 = disable pruning blocks, 1 = allow manual pruning via RPC, >%u = automatically prune block files to stay under the specified target size in MiB)</source> + <translation>古いブロックの剪定 (削除) を有効にすることでストレージの必要量を削減する。これにより pruneblockchain RPC を呼び出すことで指定されたブロックを削除することができます。またターゲットサイズが MiB 単位で指定された場合には古いブロックの自動剪定が有効となります。このモードは -txindex および -rescan オプションと互換性がありません。警告: この設定を最有効化するにはすべてのブロックチェーンの再ダウンロードが必要となります。(デフォルト: 0 = ブロックの剪定を無効化する, 1 = RPC 経由での手動剪定を許可する, >%u = MiB 単位で指定されたターゲットサイズを常に下回るようにブロックファイルを自動的に剪定する)</translation> + </message> + <message> + <source>Set lowest fee rate (in %s/kB) for transactions to be included in block creation. (default: %s)</source> + <translation>ブロック生成時に取り込まれるトランザクションの最低手数料率 (%s/kB 単位)。(デフォルト: %s)</translation> + </message> + <message> <source>Set the number of script verification threads (%u to %d, 0 = auto, <0 = leave that many cores free, default: %d)</source> <translation>スクリプト検証スレッドを設定 (%uから%dの間, 0 = 自動, <0 = たくさんのコアを自由にしておく, 初期値: %d)</translation> </message> @@ -1883,16 +3150,20 @@ <translation>リスン ポートの割当に UPnP を使用 (初期値: リスン中および-proxyが指定されていない場合は1)</translation> </message> <message> - <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source> - <translation>警告： ネットワークは完全に同意しないみたいです。マイナーは何かの問題を経験してるみたいなんです。</translation> + <source>Username and hashed password for JSON-RPC connections. The field <userpw> comes in the format: <USERNAME>:<SALT>$<HASH>. A canonical python script is included in share/rpcuser. The client then connects normally using the rpcuser=<USERNAME>/rpcpassword=<PASSWORD> pair of arguments. This option can be specified multiple times</source> + <translation>JSON-RPC 接続時のユーザ名とハッシュ化されたパスワード。<userpw> フィールドのフォーマットは <USERNAME>:<SALT>$<HASH>。標準的な Python スクリプトが share/rpcuser 内に含まれています。クライアントは通常の場合には rpcuser=<USERNAME>/rpcpassword=<PASSWORD> を利用して接続を行います。このオプションは複数回指定できます。</translation> </message> <message> - <source>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</source> - <translation>警告： ピアーと完全に同意しないみたいです！アップグレードは必要かもしれません、それとも他のノードはアップグレードは必要かもしれません。</translation> + <source>Wallet will not create transactions that violate mempool chain limits (default: %u)</source> + <translation>ウォレットがmempoolチェーン制限数を超えてトランザクションを作らないようにする (初期値: %u)</translation> + </message> + <message> + <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source> + <translation>警告: ネットワークは完全に合意が取れていないようです。幾人かのマイナーに何らかの障害が発生しているようです。</translation> </message> <message> - <source>Whitelist peers connecting from the given netmask or IP address. Can be specified multiple times.</source> - <translation>与えられたネットマスクやIPアドレスから接続を行う、ホワイトリストのピア。複数回指定できます。</translation> + <source>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</source> + <translation>警告: ピアと完全に合意が取れていないようです！このノードまたは他のノードのアップグレードが必要なようです。</translation> </message> <message> <source>You need to rebuild the database using -reindex-chainstate to change -txindex</source> @@ -1927,12 +3198,12 @@ <translation>-%s アドレス '%s' を解決できません</translation> </message> <message> - <source>Change index out of range</source> - <translation>おつりのインデックスが範囲外です</translation> + <source>Chain selection options:</source> + <translation>チェイン選択オプション:</translation> </message> <message> - <source>Connect only to the specified node(s)</source> - <translation>指定したノードだけに接続</translation> + <source>Change index out of range</source> + <translation>おつりのインデックスが範囲外です</translation> </message> <message> <source>Connection options:</source> @@ -2056,10 +3327,6 @@ <translation>認証クッキーの場所 (デフォルト: )</translation> </message> <message> - <source>Minimum bytes per sigop in transactions we relay and mine (default: %u)</source> - <translation>中継や採掘を行ってもよい、sigopあたりの最小バイト数 (デフォルト: %u)</translation> - </message> - <message> <source>Not enough file descriptors available.</source> <translation>使用可能なファイルディスクリプタが不足しています。</translation> </message> @@ -2100,10 +3367,6 @@ <translation>データベースのキャッシュサイズをメガバイトで設定 (%dから%d。初期値: %d)</translation> </message> <message> - <source>Set maximum block cost (default: %d)</source> - <translation>最大ブロックコストを設定 (初期値: %d)</translation> - </message> - <message> <source>Set maximum block size in bytes (default: %d)</source> <translation>最大ブロックサイズをバイトで設定 (初期値: %d)</translation> </message> @@ -2136,6 +3399,10 @@ <translation>リッスンポートの割当に UPnP を使用 (初期値: %u)</translation> </message> <message> + <source>Use the test chain</source> + <translation>テストチェインを利用する</translation> + </message> + <message> <source>User Agent comment (%s) contains unsafe characters.</source> <translation>ユーザエージェントのコメント (%s) には安全でない文字が含まれています。</translation> </message> @@ -2208,10 +3475,6 @@ <translation>中継および採掘を行う際の、データ運送トランザクションの中のデータの最大サイズ (初期値: %u)</translation> </message> <message> - <source>Query for peer addresses via DNS lookup, if low on addresses (default: 1 unless -connect)</source> - <translation>保有するピアアドレスが少ない場合、DNS ルックアップによりピアアドレスを問い合わせる (-connect を使っていない場合の初期値: 1)</translation> - </message> - <message> <source>Randomize credentials for every proxy connection. This enables Tor stream isolation (default: %u)</source> <translation>認証情報をプロキシー接続ごとにランダム化する。これによりTorストリーム分離をすることができます (規定値: %u)</translation> </message> @@ -2224,10 +3487,6 @@ <translation>手数料差引後のトランザクションの金額が小さすぎるため、送金できません。</translation> </message> <message> - <source>This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit <https://www.openssl.org/> and cryptographic software written by Eric Young and UPnP software written by Thomas Bernard.</source> - <translation>この製品はOpenSSLプロジェクトにより開発されたソフトウェアをOpenSSLツールキットとして利用しています <https://www.openssl.org/>。また、Eric Young氏により開発された暗号ソフトウェア、Thomas Bernard氏により書かれたUPnPソフトウェアを用いています。</translation> - </message> - <message> <source>Use hierarchical deterministic key generation (HD) after BIP32. Only has effect during wallet creation/first start</source> <translation>BIP32 に従った階層的決定性鍵生成方式 (HD) を利用します。ウォレットの生成時ないし最初に起動した時にのみ有効です。</translation> </message> @@ -2340,10 +3599,6 @@ <translation>取引の額が小さ過ぎます</translation> </message> <message> - <source>Transaction amounts must be positive</source> - <translation>取引の額は0より大きくしてください</translation> - </message> - <message> <source>Transaction too large for fee policy</source> <translation>手数料ポリシーに対してトランザクションが大きすぎます</translation> </message> @@ -2408,18 +3663,22 @@ <translation>-maxtxfee が非常に高く設定されています！ひとつのトランザクションでこの量の手数料が支払われてしまうことがあります。</translation> </message> <message> - <source>-paytxfee is set very high! This is the transaction fee you will pay if you send a transaction.</source> - <translation>-paytxfee が非常に高く設定されています! これは取引を送信する場合に支払う取引手数料です。</translation> - </message> - <message> <source>Do not keep transactions in the mempool longer than <n> hours (default: %u)</source> <translation>mempool内でトランザクションを <n> 時間以上保持しない (初期値: %u)</translation> </message> <message> + <source>Equivalent bytes per sigop in transactions for relay and mining (default: %u)</source> + <translation>中継や採掘を行う際のトランザクション内の、sigopあたりバイト数の相当量 (初期値: %u)</translation> + </message> + <message> <source>Fees (in %s/kB) smaller than this are considered zero fee for transaction creation (default: %s)</source> <translation>トランザクション作成の際、この値未満の手数料 (%s/kB単位) はゼロであるとみなす (デフォルト: %s)</translation> </message> <message> + <source>Force relay of transactions from whitelisted peers even if they violate local relay policy (default: %d)</source> + <translation>ホワイトリストのピアから受け取ったトランザクションに関しては、たとえローカルの中継ポリシーに違反しているとしても中継を行うようにする (デフォルト: %d)</translation> + </message> + <message> <source>How thorough the block verification of -checkblocks is (0-4, default: %u)</source> <translation>-checkblocks のブロックの検証レベル (0-4, 初期値: %u)</translation> </message> @@ -2436,10 +3695,26 @@ <translation>デバッグ情報を出力する (初期値: %u, <category> の指定は任意です)</translation> </message> <message> + <source>Query for peer addresses via DNS lookup, if low on addresses (default: 1 unless -connect/-noconnect)</source> + <translation>保有するピアアドレスが少ない場合、DNS ルックアップによりピアアドレスを問い合わせる (-connect/-noconnect を使っていない場合の初期値: 1)</translation> + </message> + <message> + <source>Sets the serialization of raw transaction or block hex returned in non-verbose mode, non-segwit(0) or segwit(1) (default: %d)</source> + <translation>非冗長モードで返却する生トランザクションやブロックの16進数表現のシリアライゼーションフォーマットを非 segwit (0) または segwit (1) のものに設定する (デフォルト: %d)</translation> + </message> + <message> <source>Support filtering of blocks and transaction with bloom filters (default: %u)</source> <translation>Bloomフィルタによる、ブロックおよびトランザクションのフィルタリングを有効化する (初期値: %u)</translation> </message> <message> + <source>This is the transaction fee you may pay when fee estimates are not available.</source> + <translation>これは手数料の推定機能が利用できない場合に支払うトランザクション手数料です。</translation> + </message> + <message> + <source>This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit %s and cryptographic software written by Eric Young and UPnP software written by Thomas Bernard.</source> + <translation>この製品はOpenSSLプロジェクトにより開発されたソフトウェアをOpenSSLツールキット %s として利用しています <https://www.openssl.org/>。また、Eric Young氏により開発された暗号ソフトウェア、Thomas Bernard氏により書かれたUPnPソフトウェアを用いています。</translation> + </message> + <message> <source>Total length of network version string (%i) exceeds maximum length (%i). Reduce the number or size of uacomments.</source> <translation>ネットワークバージョン文字 (%i) の長さが最大の長さ (%i) を超えています。UAコメントの数や長さを削減してください。</translation> </message> @@ -2460,10 +3735,6 @@ <translation>Tor 秘匿サービスを通し、別々の SOCKS5 プロキシを用いることでピアに到達する (初期値: %s)</translation> </message> <message> - <source>Username and hashed password for JSON-RPC connections. The field <userpw> comes in the format: <USERNAME>:<SALT>$<HASH>. A canonical python script is included in share/rpcuser. This option can be specified multiple times</source> - <translation>JSON-RPC接続時のユーザ名とハッシュ化されたパスワード。<userpw> フィールドのフォーマットは <USERNAME>:<SALT>$<HASH>。標準的な Python スクリプトが share/rpcuser 内に含まれています。このオプションは複数回指定できます。</translation> - </message> - <message> <source>Warning: Unknown block versions being mined! It's possible unknown rules are in effect</source> <translation>警告: 未知のバージョンのブロックが採掘されました。未知のルールが導入された可能性があります</translation> </message> @@ -2472,6 +3743,14 @@ <translation>警告: ウォレットファイルが破損していましたのでデータを復旧しました！元の %s は %s として %s に保存されました; 残高やトランザクションが正しくない場合にはバックアップから復元してください。</translation> </message> <message> + <source>Whitelist peers connecting from the given IP address (e.g. 1.2.3.4) or CIDR notated network (e.g. 1.2.3.0/24). Can be specified multiple times.</source> + <translation>ホワイトリストとして登録するピアノ、接続元の IP アドレス (例: 1.2.3.4) または CIDR 表現のネットワーク (例: 1.2.3.0/24)。複数回指定することもできる</translation> + </message> + <message> + <source>%s is set very high!</source> + <translation>%s の設定値は高すぎます</translation> + </message> + <message> <source>(default: %s)</source> <translation>(デフォルト: %s)</translation> </message> @@ -2492,6 +3771,10 @@ <translation>無効な -proxy アドレス: '%s'</translation> </message> <message> + <source>Keypool ran out, please call keypoolrefill first</source> + <translation>鍵プールが枯渇しました。まずはじめに keypoolrefill を呼び出してください</translation> + </message> + <message> <source>Listen for JSON-RPC connections on <port> (default: %u or testnet: %u)</source> <translation><port> で JSON-RPC 接続をリスン (初期値: %u、testnet は %u)</translation> </message> @@ -2528,12 +3811,16 @@ <translation>P2SHでないマルチシグトランザクションをリレーする (初期値: %u)</translation> </message> <message> + <source>Send transactions with full-RBF opt-in enabled (default: %u)</source> + <translation>full-RBF opt-in を利用してトランザクションを送信する (初期値: %u)</translation> + </message> + <message> <source>Set key pool size to <n> (default: %u)</source> <translation>key pool のサイズを <n> (初期値: %u) にセット</translation> </message> <message> - <source>Set minimum block size in bytes (default: %u)</source> - <translation>最小ブロックサイズをバイトで設定 (初期値: %u)</translation> + <source>Set maximum BIP141 block weight (default: %d)</source> + <translation>BIP141ブロック重みの最大値を設定 (初期値: %d)</translation> </message> <message> <source>Set the number of threads to service RPC calls (default: %d)</source> @@ -2556,10 +3843,38 @@ <translation>トランザクション送信時に未検証のおつりを使用する (デフォルト: %u)</translation> </message> <message> + <source>Starting network threads...</source> + <translation>ネットワークのスレッドを起動しています...</translation> + </message> + <message> + <source>The wallet will avoid paying less than the minimum relay fee.</source> + <translation>ウォレットは最小中継手数料を下回る額の支払を拒否します。</translation> + </message> + <message> + <source>This is the minimum transaction fee you pay on every transaction.</source> + <translation>これはすべてのトランザクションに対して最低限支払うべき手数料です。</translation> + </message> + <message> + <source>This is the transaction fee you will pay if you send a transaction.</source> + <translation>これは取引を送信する場合に支払う取引手数料です。</translation> + </message> + <message> <source>Threshold for disconnecting misbehaving peers (default: %u)</source> <translation>不正なピアを切断するためのしきい値 (初期値: %u)</translation> </message> <message> + <source>Transaction amounts must not be negative</source> + <translation>取引の額は負であってはいけません</translation> + </message> + <message> + <source>Transaction has too long of a mempool chain</source> + <translation>トランザクションのmempoolチェインが長過ぎます</translation> + </message> + <message> + <source>Transaction must have at least one recipient</source> + <translation>トランザクションは最低ひとつの受取先が必要です</translation> + </message> + <message> <source>Unknown network specified in -onlynet: '%s'</source> <translation>-onlynet で指定された '%s' は未知のネットワークです</translation> </message> diff --git a/src/qt/locale/bitcoin_ka.ts b/src/qt/locale/bitcoin_ka.ts index 80508be8ee..14378ebea1 100644 --- a/src/qt/locale/bitcoin_ka.ts +++ b/src/qt/locale/bitcoin_ka.ts @@ -37,7 +37,10 @@ <source>&Delete</source> <translation>&წაშლა</translation> </message> -</context> + </context> +<context> + <name>AddressTableModel</name> + </context> <context> <name>AskPassphraseDialog</name> <message> @@ -56,7 +59,7 @@ <source>Repeat new passphrase</source> <translation>გაიმეორეთ ახალი ფრაზა-პაროლი</translation> </message> -</context> + </context> <context> <name>BanTableModel</name> </context> @@ -235,14 +238,6 @@ <translation>საკომანდო სტრიქონის ოპ&ციები</translation> </message> <message> - <source>No block source available...</source> - <translation>ბლოკების წყარო მიუწვდომელია...</translation> - </message> - <message> - <source>%1 and %2</source> - <translation>%1 და %2</translation> - </message> - <message> <source>%1 behind</source> <translation>%1 გავლილია</translation> </message> @@ -290,7 +285,7 @@ <source>Wallet is <b>encrypted</b> and currently <b>locked</b></source> <translation>საფულე <b>დაშიფრულია</b> და ამჟამად <b>დაბლოკილია</b></translation> </message> -</context> + </context> <context> <name>CoinControlDialog</name> <message> @@ -306,10 +301,6 @@ <translation>თანხა:</translation> </message> <message> - <source>Priority:</source> - <translation>პრიორიტეტი:</translation> - </message> - <message> <source>Fee:</source> <translation>საკომისიო:</translation> </message> @@ -349,11 +340,7 @@ <source>Confirmed</source> <translation>დადასტურებულია</translation> </message> - <message> - <source>Priority</source> - <translation>პრიორიტეტი</translation> - </message> -</context> + </context> <context> <name>EditAddressDialog</name> <message> @@ -376,7 +363,7 @@ <source>&Address</source> <translation>მის&ამართი</translation> </message> -</context> + </context> <context> <name>FreespaceChecker</name> <message> @@ -439,6 +426,17 @@ </message> </context> <context> + <name>ModalOverlay</name> + <message> + <source>Form</source> + <translation>ფორმა</translation> + </message> + <message> + <source>Last block time</source> + <translation>ბოლო ბლოკის დრო</translation> + </message> + </context> +<context> <name>OpenURIDialog</name> <message> <source>Open URI</source> @@ -456,7 +454,7 @@ <source>Select payment request file</source> <translation>გადახდის მოთხოვნის ფაილის არჩევა</translation> </message> -</context> + </context> <context> <name>OptionsDialog</name> <message> @@ -640,6 +638,9 @@ </message> </context> <context> + <name>PaymentServer</name> + </context> +<context> <name>PeerTableModel</name> </context> <context> @@ -660,6 +661,16 @@ <source>N/A</source> <translation>მიუწვდ.</translation> </message> + <message> + <source>%1 and %2</source> + <translation>%1 და %2</translation> + </message> + </context> +<context> + <name>QObject::QObject</name> + </context> +<context> + <name>QRImageWidget</name> </context> <context> <name>RPCConsole</name> @@ -842,7 +853,7 @@ <source>Remove</source> <translation>წაშლა</translation> </message> -</context> + </context> <context> <name>ReceiveRequestDialog</name> <message> @@ -861,7 +872,10 @@ <source>&Save Image...</source> <translation>გამო&სახულების შენახვა...</translation> </message> -</context> + </context> +<context> + <name>RecentRequestsTableModel</name> + </context> <context> <name>SendCoinsDialog</name> <message> @@ -897,10 +911,6 @@ <translation>თანხა:</translation> </message> <message> - <source>Priority:</source> - <translation>პრიორიტეტი:</translation> - </message> - <message> <source>Fee:</source> <translation>საკომისიო:</translation> </message> @@ -952,7 +962,7 @@ <source>S&end</source> <translation>გაგ&ზავნა</translation> </message> -</context> + </context> <context> <name>SendCoinsEntry</name> <message> @@ -1011,7 +1021,10 @@ <source>Memo:</source> <translation>შენიშვნა:</translation> </message> -</context> + </context> +<context> + <name>SendConfirmationDialog</name> + </context> <context> <name>ShutdownWindow</name> <message> @@ -1089,7 +1102,7 @@ <source>Reset all verify message fields</source> <translation>ვერიფიკაციის ყველა ველის წაშლა</translation> </message> -</context> + </context> <context> <name>SplashScreen</name> <message> @@ -1105,16 +1118,34 @@ </message> </context> <context> + <name>TransactionDesc</name> + </context> +<context> <name>TransactionDescDialog</name> <message> <source>This pane shows a detailed description of the transaction</source> <translation>ტრანსაქციის დაწვრილებითი აღწერილობა</translation> </message> -</context> + </context> +<context> + <name>TransactionTableModel</name> + </context> +<context> + <name>TransactionView</name> + </context> <context> <name>UnitDisplayStatusBarControl</name> </context> <context> + <name>WalletFrame</name> + </context> +<context> + <name>WalletModel</name> + </context> +<context> + <name>WalletView</name> + </context> +<context> <name>bitcoin-core</name> <message> <source>Options:</source> @@ -1141,10 +1172,6 @@ <translation>რეზიდენტულად გაშვება და კომანდების მიღება</translation> </message> <message> - <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> - <translation>გარედან შეერთებების დაშვება (ნაგულისხმევი: 1 თუ არ გამოიყენება -proxy ან -connect)</translation> - </message> - <message> <source>Bitcoin Core</source> <translation>Bitcoin Core</translation> </message> @@ -1157,18 +1184,6 @@ <translation>კომანდის შესრულება საფულის ტრანსაქციის ცვლილებისას (%s კომანდაში ჩანაცვლდება TxID-ით)</translation> </message> <message> - <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source> - <translation>ეს არის წინასწარი სატესტო ვერსია - გამოიყენეთ საკუთარი რისკით - არ გამოიყენოთ მოპოვებისა ან კომერციული მიზნებისათვის</translation> - </message> - <message> - <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source> - <translation>ყურადღება: ქსელში შეუთანხმებლობაა. შესაძლოა ცალკეულ მომპოვებლებს პრობლემები ექმნებათ!</translation> - </message> - <message> - <source>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</source> - <translation>ყურადღება: ჩვენ არ ვეთანხმებით ყველა პირს. შესაძლოა თქვენ ან სხვა კვანძებს განახლება გჭირდებათ.</translation> - </message> - <message> <source><category> can be:</source> <translation><category> შეიძლება იყოს:</translation> </message> @@ -1177,10 +1192,6 @@ <translation>ბლოკის შექმნის ოპციები:</translation> </message> <message> - <source>Connect only to the specified node(s)</source> - <translation>შეერთება მხოლოდ მითითებულ კვანძ(ებ)თან</translation> - </message> - <message> <source>Corrupted block database detected</source> <translation>შენიშნულია ბლოკთა ბაზის დაზიანება</translation> </message> @@ -1281,10 +1292,6 @@ <translation>ტრანსაქციების რაოდენობა ძალიან ცოტაა</translation> </message> <message> - <source>Transaction amounts must be positive</source> - <translation>ტრანსაქციების რაოდენობა დადებითი რიცხვი უნდა იყოს</translation> - </message> - <message> <source>Transaction too large</source> <translation>ტრანსაქცია ძალიან დიდია</translation> </message> diff --git a/src/qt/locale/bitcoin_kk_KZ.ts b/src/qt/locale/bitcoin_kk_KZ.ts index ff02521264..2c9d228401 100644 --- a/src/qt/locale/bitcoin_kk_KZ.ts +++ b/src/qt/locale/bitcoin_kk_KZ.ts @@ -25,7 +25,10 @@ <source>&Delete</source> <translation>Жою</translation> </message> -</context> + </context> +<context> + <name>AddressTableModel</name> + </context> <context> <name>AskPassphraseDialog</name> <message> @@ -40,7 +43,7 @@ <source>Repeat new passphrase</source> <translation>Жаңа құпия сөзді қайта енгізу</translation> </message> -</context> + </context> <context> <name>BanTableModel</name> </context> @@ -90,26 +93,6 @@ <source>&Help</source> <translation>Көмек</translation> </message> - <message numerus="yes"> - <source>%n hour(s)</source> - <translation><numerusform>%n сағат</numerusform></translation> - </message> - <message numerus="yes"> - <source>%n day(s)</source> - <translation><numerusform>%n күн</numerusform></translation> - </message> - <message numerus="yes"> - <source>%n week(s)</source> - <translation><numerusform>%n апта</numerusform></translation> - </message> - <message> - <source>%1 and %2</source> - <translation>%1 немесе %2</translation> - </message> - <message numerus="yes"> - <source>%n year(s)</source> - <translation><numerusform>%n жыл</numerusform></translation> - </message> <message> <source>%1 behind</source> <translation>%1 қалмады</translation> @@ -138,10 +121,6 @@ <translation>Саны</translation> </message> <message> - <source>Priority:</source> - <translation>Басымдық</translation> - </message> - <message> <source>Fee:</source> <translation>Комиссия</translation> </message> @@ -169,11 +148,7 @@ <source>Confirmed</source> <translation>Растық</translation> </message> - <message> - <source>Priority</source> - <translation>Басымдық</translation> - </message> -</context> + </context> <context> <name>EditAddressDialog</name> <message> @@ -184,7 +159,7 @@ <source>&Address</source> <translation>Адрес</translation> </message> -</context> + </context> <context> <name>FreespaceChecker</name> </context> @@ -199,6 +174,9 @@ </message> </context> <context> + <name>ModalOverlay</name> + </context> +<context> <name>OpenURIDialog</name> </context> <context> @@ -212,6 +190,9 @@ <name>OverviewPage</name> </context> <context> + <name>PaymentServer</name> + </context> +<context> <name>PeerTableModel</name> </context> <context> @@ -220,6 +201,16 @@ <source>Amount</source> <translation>Саны</translation> </message> + <message> + <source>%1 and %2</source> + <translation>%1 немесе %2</translation> + </message> + </context> +<context> + <name>QObject::QObject</name> + </context> +<context> + <name>QRImageWidget</name> </context> <context> <name>RPCConsole</name> @@ -239,16 +230,15 @@ <name>ReceiveRequestDialog</name> </context> <context> + <name>RecentRequestsTableModel</name> + </context> +<context> <name>SendCoinsDialog</name> <message> <source>Amount:</source> <translation>Саны</translation> </message> <message> - <source>Priority:</source> - <translation>Басымдық</translation> - </message> - <message> <source>Fee:</source> <translation>Комиссия:</translation> </message> @@ -269,6 +259,9 @@ </message> </context> <context> + <name>SendConfirmationDialog</name> + </context> +<context> <name>ShutdownWindow</name> </context> <context> @@ -281,12 +274,30 @@ <name>TrafficGraphWidget</name> </context> <context> + <name>TransactionDesc</name> + </context> +<context> <name>TransactionDescDialog</name> </context> <context> + <name>TransactionTableModel</name> + </context> +<context> + <name>TransactionView</name> + </context> +<context> <name>UnitDisplayStatusBarControl</name> </context> <context> + <name>WalletFrame</name> + </context> +<context> + <name>WalletModel</name> + </context> +<context> + <name>WalletView</name> + </context> +<context> <name>bitcoin-core</name> <message> <source>Information</source> diff --git a/src/qt/locale/bitcoin_ko_KR.ts b/src/qt/locale/bitcoin_ko_KR.ts index 012632c0e0..9b5c1c077e 100644 --- a/src/qt/locale/bitcoin_ko_KR.ts +++ b/src/qt/locale/bitcoin_ko_KR.ts @@ -41,6 +41,77 @@ <source>&Delete</source> <translation>삭제(&D)</translation> </message> + <message> + <source>Choose the address to send coins to</source> + <translation>코인을 보내실 주소를 선택하세요</translation> + </message> + <message> + <source>Choose the address to receive coins with</source> + <translation>코인을 받으실 주소를 선택하세요</translation> + </message> + <message> + <source>C&hoose</source> + <translation>선택 (&H)</translation> + </message> + <message> + <source>Sending addresses</source> + <translation>보내는 주소들</translation> + </message> + <message> + <source>Receiving addresses</source> + <translation>받은 주소들</translation> + </message> + <message> + <source>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source> + <translation>비트코인을 보내는 계좌 주소입니다. 코인을 보내기 전에 잔고와 받는 주소를 항상 확인하세요.</translation> + </message> + <message> + <source>These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction.</source> + <translation>비트코인을 받을 수 있는 계좌 주소입니다. 매 거래마다 새로운 주소 사용을 권장합니다. </translation> + </message> + <message> + <source>&Copy Address</source> + <translation>계좌 복사(&C)</translation> + </message> + <message> + <source>Copy &Label</source> + <translation>라벨 복사(&L)</translation> + </message> + <message> + <source>&Edit</source> + <translation>편집 (&E)</translation> + </message> + <message> + <source>Export Address List</source> + <translation>주소 목록 내보내기</translation> + </message> + <message> + <source>Comma separated file (*.csv)</source> + <translation>쉼표로 구분된 파일 (*.csv)</translation> + </message> + <message> + <source>Exporting Failed</source> + <translation>내보내기 실패</translation> + </message> + <message> + <source>There was an error trying to save the address list to %1. Please try again.</source> + <translation>%1으로 주소 리스트를 저장하는 동안 오류가 발생했습니다. 다시 시도해주세요.</translation> + </message> +</context> +<context> + <name>AddressTableModel</name> + <message> + <source>Label</source> + <translation>라벨</translation> + </message> + <message> + <source>Address</source> + <translation>주소</translation> + </message> + <message> + <source>(no label)</source> + <translation>(라벨 없음)</translation> + </message> </context> <context> <name>AskPassphraseDialog</name> @@ -60,6 +131,94 @@ <source>Repeat new passphrase</source> <translation>새로운 암호 재확인</translation> </message> + <message> + <source>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>.</source> + <translation>지갑에 새로운 비밀문구를 입력하세요.<br/>비밀문구를 <b>열 개 이상의 무작위 글자</b> 혹은 <b>여덟개 이상의 단어로<b> 정하세요.</translation> + </message> + <message> + <source>Encrypt wallet</source> + <translation>지갑 암호화</translation> + </message> + <message> + <source>This operation needs your wallet passphrase to unlock the wallet.</source> + <translation>이 작업을 실행하려면 사용자 지갑의 암호가 필요합니다.</translation> + </message> + <message> + <source>Unlock wallet</source> + <translation>지갑 잠금해제</translation> + </message> + <message> + <source>This operation needs your wallet passphrase to decrypt the wallet.</source> + <translation>이 작업은 지갑을 해독하기 위해 사용자 지갑의 암호가 필요합니다.</translation> + </message> + <message> + <source>Decrypt wallet</source> + <translation>지갑 복호화</translation> + </message> + <message> + <source>Change passphrase</source> + <translation>암호 변경</translation> + </message> + <message> + <source>Enter the old passphrase and new passphrase to the wallet.</source> + <translation>지갑의 기존 암호와 새로운 암호를 입력해주세요.</translation> + </message> + <message> + <source>Confirm wallet encryption</source> + <translation>지갑 암호화 승인</translation> + </message> + <message> + <source>Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR BITCOINS</b>!</source> + <translation>경고: 만약 암호화 된 지갑의 비밀번호를 잃어버릴 경우, <b>모든 비트코인들을 잃어버릴 수 있습니다</b>!</translation> + </message> + <message> + <source>Are you sure you wish to encrypt your wallet?</source> + <translation>지갑 암호화를 허용하시겠습니까?</translation> + </message> + <message> + <source>Wallet encrypted</source> + <translation>지갑 암호화 완료</translation> + </message> + <message> + <source>%1 will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your bitcoins from being stolen by malware infecting your computer.</source> + <translation>암호화 처리 과정을 끝내기 위해 %1을 종료합니다. 지갑 암호화는 컴퓨터로의 멀웨어 감염으로 인한 비트코인 도난을 완전히 방지할 수 없음을 기억하세요.</translation> + </message> + <message> + <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source> + <translation>중요: 본인 지갑 파일에서 만든 예전 백업들은 새로 생성한 암호화된 지갑 파일로 교체됩니다. 보안상 이유로 이전에 암호화하지 않은 지갑 파일 백업은 사용할 수 없게 되니 이른 시일 내로 새로 암호화된 지갑을 사용하시기 바랍니다.</translation> + </message> + <message> + <source>Wallet encryption failed</source> + <translation>지갑 암호화 실패</translation> + </message> + <message> + <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source> + <translation>지갑 암호화는 내부 에러로 인해 실패했습니다. 당신의 지갑은 암호화 되지 않았습니다.</translation> + </message> + <message> + <source>The supplied passphrases do not match.</source> + <translation>지정한 암호가 일치하지 않습니다.</translation> + </message> + <message> + <source>Wallet unlock failed</source> + <translation>지갑 잠금해제 실패</translation> + </message> + <message> + <source>The passphrase entered for the wallet decryption was incorrect.</source> + <translation>지갑 해독을 위한 암호가 틀렸습니다.</translation> + </message> + <message> + <source>Wallet decryption failed</source> + <translation>지갑 복호화 실패</translation> + </message> + <message> + <source>Wallet passphrase was successfully changed.</source> + <translation>지갑 비밀번호가 성공적으로 변경되었습니다.</translation> + </message> + <message> + <source>Warning: The Caps Lock key is on!</source> + <translation>경고: Caps Lock키가 켜져있습니다!</translation> + </message> </context> <context> <name>BanTableModel</name> @@ -111,6 +270,14 @@ <translation>어플리케이션 종료</translation> </message> <message> + <source>&About %1</source> + <translation>%1 정보(&A)</translation> + </message> + <message> + <source>Show information about %1</source> + <translation>%1 정보를 표시합니다</translation> + </message> + <message> <source>About &Qt</source> <translation>&Qt 정보</translation> </message> @@ -123,6 +290,10 @@ <translation>옵션(&O)</translation> </message> <message> + <source>Modify configuration options for %1</source> + <translation>%1 설정 옵션 수정</translation> + </message> + <message> <source>&Encrypt Wallet...</source> <translation>지갑 암호화(&E)...</translation> </message> @@ -251,32 +422,16 @@ <translation><numerusform>비트코인 네트워크에 %n개의 연결이 활성화되어 있습니다.</numerusform></translation> </message> <message> - <source>No block source available...</source> - <translation>사용 가능한 블록이 없습니다...</translation> - </message> - <message numerus="yes"> - <source>Processed %n block(s) of transaction history.</source> - <translation><numerusform>%n 블럭 만큼의 거래 기록이 처리됨.</numerusform></translation> - </message> - <message numerus="yes"> - <source>%n hour(s)</source> - <translation><numerusform>%n시간</numerusform></translation> - </message> - <message numerus="yes"> - <source>%n day(s)</source> - <translation><numerusform>%n일</numerusform></translation> - </message> - <message numerus="yes"> - <source>%n week(s)</source> - <translation><numerusform>%n주</numerusform></translation> + <source>Indexing blocks on disk...</source> + <translation>디스크에서 블록 색인중...</translation> </message> <message> - <source>%1 and %2</source> - <translation>%1 그리고 %2</translation> + <source>Processing blocks on disk...</source> + <translation>디스크에서 블록 처리중...</translation> </message> <message numerus="yes"> - <source>%n year(s)</source> - <translation><numerusform>%n년</numerusform></translation> + <source>Processed %n block(s) of transaction history.</source> + <translation><numerusform>%n 블럭 만큼의 거래 기록이 처리됨.</numerusform></translation> </message> <message> <source>%1 behind</source> @@ -307,6 +462,14 @@ <translation>현재까지</translation> </message> <message> + <source>Show the %1 help message to get a list with possible Bitcoin command-line options</source> + <translation>사용할 수 있는 비트코인 명령줄 옵션 목록을 가져오기 위해 %1 도움말 메시지를 표시합니다.</translation> + </message> + <message> + <source>%1 client</source> + <translation>%1 클라이언트</translation> + </message> + <message> <source>Catching up...</source> <translation>블록 따라잡기...</translation> </message> @@ -356,7 +519,7 @@ <source>Wallet is <b>encrypted</b> and currently <b>locked</b></source> <translation>지갑이 암호화 되었고 현재 잠겨져 있습니다</translation> </message> -</context> + </context> <context> <name>CoinControlDialog</name> <message> @@ -376,10 +539,6 @@ <translation>금액:</translation> </message> <message> - <source>Priority:</source> - <translation>우선순위:</translation> - </message> - <message> <source>Fee:</source> <translation>수수료:</translation> </message> @@ -432,8 +591,80 @@ <translation>확인됨</translation> </message> <message> - <source>Priority</source> - <translation>우선순위</translation> + <source>Copy address</source> + <translation>주소 복사</translation> + </message> + <message> + <source>Copy label</source> + <translation>라벨 복사</translation> + </message> + <message> + <source>Copy amount</source> + <translation>거래액 복사</translation> + </message> + <message> + <source>Copy transaction ID</source> + <translation>거래 아이디 복사</translation> + </message> + <message> + <source>Lock unspent</source> + <translation>사용되지 않은 주소를 잠금 처리합니다.</translation> + </message> + <message> + <source>Unlock unspent</source> + <translation>사용되지 않은 주소를 잠금 해제합니다. </translation> + </message> + <message> + <source>Copy quantity</source> + <translation>수량 복사</translation> + </message> + <message> + <source>Copy fee</source> + <translation>수수료 복사</translation> + </message> + <message> + <source>Copy after fee</source> + <translation>수수료 이후 복사</translation> + </message> + <message> + <source>Copy bytes</source> + <translation>bytes 복사</translation> + </message> + <message> + <source>Copy dust</source> + <translation>더스트 복사</translation> + </message> + <message> + <source>Copy change</source> + <translation>잔돈 복사</translation> + </message> + <message> + <source>(%1 locked)</source> + <translation>(%1 잠금)</translation> + </message> + <message> + <source>yes</source> + <translation>예</translation> + </message> + <message> + <source>no</source> + <translation>아니요</translation> + </message> + <message> + <source>Can vary +/- %1 satoshi(s) per input.</source> + <translation>입력마다 +/- %1 사토시(s)가 변할 수 있습니다.</translation> + </message> + <message> + <source>(no label)</source> + <translation>(라벨 없음)</translation> + </message> + <message> + <source>change from %1 (%2)</source> + <translation>%1로부터 변경 (%2)</translation> + </message> + <message> + <source>(change)</source> + <translation>(잔돈)</translation> </message> </context> <context> @@ -458,6 +689,38 @@ <source>&Address</source> <translation>주소(&A)</translation> </message> + <message> + <source>New receiving address</source> + <translation>새 받는 주소</translation> + </message> + <message> + <source>New sending address</source> + <translation>새 보내는 주소</translation> + </message> + <message> + <source>Edit receiving address</source> + <translation>받는 주소 편집</translation> + </message> + <message> + <source>Edit sending address</source> + <translation>보내는 주소 편집</translation> + </message> + <message> + <source>The entered address "%1" is not a valid Bitcoin address.</source> + <translation>입력한 "%1" 주소는 올바른 비트코인 주소가 아닙니다.</translation> + </message> + <message> + <source>The entered address "%1" is already in the address book.</source> + <translation>입력된 주소는"%1" 이미 주소록에 있습니다.</translation> + </message> + <message> + <source>Could not unlock wallet.</source> + <translation>지갑을 잠금해제 할 수 없습니다.</translation> + </message> + <message> + <source>New key generation failed.</source> + <translation>새로운 키 생성이 실패하였습니다.</translation> + </message> </context> <context> <name>FreespaceChecker</name> @@ -493,6 +756,10 @@ <translation>(%1-비트)</translation> </message> <message> + <source>About %1</source> + <translation>%1 정보(&A)</translation> + </message> + <message> <source>Command-line options</source> <translation>명령줄 옵션</translation> </message> @@ -528,7 +795,11 @@ <source>Show splash screen on startup (default: %u)</source> <translation>실행시 시작화면 보기 (기본값: %u)</translation> </message> - </context> + <message> + <source>Reset all settings changed in the GUI</source> + <translation>GUI를 통해 수정된 모든 설정을 초기화</translation> + </message> +</context> <context> <name>Intro</name> <message> @@ -536,6 +807,18 @@ <translation>환영합니다</translation> </message> <message> + <source>Welcome to %1.</source> + <translation>%1에 오신것을 환영합니다.</translation> + </message> + <message> + <source>As this is the first time the program is launched, you can choose where %1 will store its data.</source> + <translation>프로그램이 처음으로 실행되고 있습니다. %1가 어디에 데이터를 저장할지 선택할 수 있습니다. </translation> + </message> + <message> + <source>%1 will download and store a copy of the Bitcoin block chain. At least %2GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source> + <translation>%1가 블럭체인의 복사본을 다운로드 저장합니다. 적어도 %2GB의 데이터가 이 폴더에 저장되며 시간이 경과할수록 점차 증가합니다. 그리고 지갑 또한 이 폴더에 저장됩니다. </translation> + </message> + <message> <source>Use the default data directory</source> <translation>기본 데이터 폴더를 사용하기</translation> </message> @@ -561,6 +844,21 @@ </message> </context> <context> + <name>ModalOverlay</name> + <message> + <source>Form</source> + <translation>유형</translation> + </message> + <message> + <source>Last block time</source> + <translation>최종 블럭 시각</translation> + </message> + <message> + <source>Hide</source> + <translation>숨기기</translation> + </message> + </context> +<context> <name>OpenURIDialog</name> <message> <source>Open URI</source> @@ -578,6 +876,10 @@ <source>Select payment request file</source> <translation>지불 요청 파일을 선택하세요</translation> </message> + <message> + <source>Select payment request file to open</source> + <translation>지불 요청 파일을 열기 위해서 선택하세요</translation> + </message> </context> <context> <name>OptionsDialog</name> @@ -590,6 +892,14 @@ <translation>메인(&M)</translation> </message> <message> + <source>Automatically start %1 after logging in to the system.</source> + <translation>시스템 로그인후에 %1을 자동으로 시작합니다.</translation> + </message> + <message> + <source>&Start %1 on system login</source> + <translation>시스템 로그인시 %1 시작(&S)</translation> + </message> + <message> <source>Size of &database cache</source> <translation>데이터베이스 캐시 크기(&D)</translation> </message> @@ -691,7 +1001,7 @@ </message> <message> <source>Port of the proxy (e.g. 9050)</source> - <translation>프록시의 포트번호입니다(예: 9050)</translation> + <translation>프록시의 포트번호입니다 (예: 9050)</translation> </message> <message> <source>Used for reaching peers via:</source> @@ -726,6 +1036,14 @@ <translation>창(&W)</translation> </message> <message> + <source>&Hide the icon from the system tray.</source> + <translation>시스템 트레이 로 부터 아이콘 숨기기(&H)</translation> + </message> + <message> + <source>Hide tray icon</source> + <translation>트레이 아이콘 숨기기</translation> + </message> + <message> <source>Show only a tray icon after minimizing the window.</source> <translation>창을 최소화 하면 트레이에 아이콘만 표시합니다.</translation> </message> @@ -746,6 +1064,10 @@ <translation>사용자 인터페이스 언어(&L):</translation> </message> <message> + <source>The user interface language can be set here. This setting will take effect after restarting %1.</source> + <translation>사용자 인터페이스 언어를 여기서 설정할 수 있습니다. 이 설정은 %1을 다시 시작할때 적용됩니다.</translation> + </message> + <message> <source>&Unit to show amounts in:</source> <translation>거래액을 표시할 단위(&U):</translation> </message> @@ -870,6 +1192,21 @@ </message> </context> <context> + <name>PaymentServer</name> + <message> + <source>Payment request error</source> + <translation>지불 요청 오류</translation> + </message> + <message> + <source>Cannot start bitcoin: click-to-pay handler</source> + <translation>비트코인을 시작할 수 없습니다: 지급제어기를 클릭하시오</translation> + </message> + <message> + <source>URI handling</source> + <translation>URI 핸들링</translation> + </message> + </context> +<context> <name>PeerTableModel</name> <message> <source>User Agent</source> @@ -879,11 +1216,7 @@ <source>Node/Service</source> <translation>노드/서비스</translation> </message> - <message> - <source>Ping Time</source> - <translation>Ping 시간</translation> - </message> -</context> + </context> <context> <name>QObject</name> <message> @@ -922,7 +1255,17 @@ <source>%1 ms</source> <translation>%1 ms</translation> </message> -</context> + <message> + <source>%1 and %2</source> + <translation>%1 그리고 %2</translation> + </message> + </context> +<context> + <name>QObject::QObject</name> + </context> +<context> + <name>QRImageWidget</name> + </context> <context> <name>RPCConsole</name> <message> @@ -950,6 +1293,10 @@ <translation>사용 중인 BerkeleyDB 버전</translation> </message> <message> + <source>Datadir</source> + <translation>데이터 폴더</translation> + </message> + <message> <source>Startup time</source> <translation>시작 시간</translation> </message> @@ -1034,6 +1381,18 @@ <translation>유저 에이전트</translation> </message> <message> + <source>Open the %1 debug log file from the current data directory. This can take a few seconds for large log files.</source> + <translation>%1 디버그 로그파일을 현재 데이터 폴더에서 엽니다. 용량이 큰 로그 파일들은 몇 초가 걸릴 수 있습니다.</translation> + </message> + <message> + <source>Decrease font size</source> + <translation>글자 크기 축소</translation> + </message> + <message> + <source>Increase font size</source> + <translation>글자 크기 확대</translation> + </message> + <message> <source>Services</source> <translation>서비스</translation> </message> @@ -1110,14 +1469,6 @@ <translation>콘솔 초기화</translation> </message> <message> - <source>&Disconnect Node</source> - <translation>끊긴 노드(&D)</translation> - </message> - <message> - <source>Ban Node for</source> - <translation>추방된 노드:</translation> - </message> - <message> <source>1 &hour</source> <translation>1시간(&H)</translation> </message> @@ -1134,8 +1485,8 @@ <translation>1년(&Y)</translation> </message> <message> - <source>&Unban Node</source> - <translation>노드 추방 취소(&U)</translation> + <source>Welcome to the %1 RPC console.</source> + <translation>%1 RPC 콘솔에 오신걸 환영합니다</translation> </message> <message> <source>Use up and down arrows to navigate history, and <b>Ctrl-L</b> to clear screen.</source> @@ -1264,6 +1615,14 @@ <source>Remove</source> <translation>삭제</translation> </message> + <message> + <source>Copy label</source> + <translation>라벨 복사</translation> + </message> + <message> + <source>Copy amount</source> + <translation>거래액 복사</translation> + </message> </context> <context> <name>ReceiveRequestDialog</name> @@ -1283,7 +1642,30 @@ <source>&Save Image...</source> <translation>이미지 저장(&S)...</translation> </message> -</context> + <message> + <source>Address</source> + <translation>주소</translation> + </message> + <message> + <source>Label</source> + <translation>라벨</translation> + </message> + </context> +<context> + <name>RecentRequestsTableModel</name> + <message> + <source>Date</source> + <translation>날짜</translation> + </message> + <message> + <source>Label</source> + <translation>라벨</translation> + </message> + <message> + <source>(no label)</source> + <translation>(라벨 없음)</translation> + </message> + </context> <context> <name>SendCoinsDialog</name> <message> @@ -1319,10 +1701,6 @@ <translation>거래액:</translation> </message> <message> - <source>Priority:</source> - <translation>우선순위:</translation> - </message> - <message> <source>Fee:</source> <translation>수수료:</translation> </message> @@ -1391,10 +1769,6 @@ <translation>(Smart fee가 아직 초기화되지 않았습니다. 블록 분석이 완료될 때 까지 기다려주십시오...)</translation> </message> <message> - <source>Confirmation time:</source> - <translation>승인 시간:</translation> - </message> - <message> <source>normal</source> <translation>일반</translation> </message> @@ -1434,6 +1808,38 @@ <source>S&end</source> <translation>보내기(&E)</translation> </message> + <message> + <source>Copy quantity</source> + <translation>수량 복사</translation> + </message> + <message> + <source>Copy amount</source> + <translation>거래액 복사</translation> + </message> + <message> + <source>Copy fee</source> + <translation>수수료 복사</translation> + </message> + <message> + <source>Copy after fee</source> + <translation>수수료 이후 복사</translation> + </message> + <message> + <source>Copy bytes</source> + <translation>bytes 복사</translation> + </message> + <message> + <source>Copy dust</source> + <translation>더스트 복사</translation> + </message> + <message> + <source>Copy change</source> + <translation>잔돈 복사</translation> + </message> + <message> + <source>(no label)</source> + <translation>(라벨 없음)</translation> + </message> </context> <context> <name>SendCoinsEntry</name> @@ -1443,11 +1849,11 @@ </message> <message> <source>Pay &To:</source> - <translation>송금할 대상(&T) : </translation> + <translation>송금할 대상(&T):</translation> </message> <message> <source>&Label:</source> - <translation>라벨(&L)</translation> + <translation>라벨(&L):</translation> </message> <message> <source>Choose previously used address</source> @@ -1507,16 +1913,23 @@ </message> <message> <source>Pay To:</source> - <translation>송금할 대상 : </translation> + <translation>송금할 대상:</translation> </message> <message> <source>Memo:</source> <translation>메모:</translation> </message> -</context> + </context> +<context> + <name>SendConfirmationDialog</name> + </context> <context> <name>ShutdownWindow</name> <message> + <source>%1 is shutting down...</source> + <translation>%1이 종료 중입니다...</translation> + </message> + <message> <source>Do not shut down the computer until this window disappears.</source> <translation>창이 사라지기 전까지 컴퓨터를 끄지마시오.</translation> </message> @@ -1607,7 +2020,7 @@ <source>Reset all verify message fields</source> <translation>모든 검증 메시지 필드 재설정</translation> </message> -</context> + </context> <context> <name>SplashScreen</name> <message> @@ -1623,11 +2036,152 @@ </message> </context> <context> + <name>TransactionDesc</name> + <message> + <source>Date</source> + <translation>날짜</translation> + </message> + </context> +<context> <name>TransactionDescDialog</name> <message> <source>This pane shows a detailed description of the transaction</source> <translation>이 창은 거래의 세부내역을 보여줍니다</translation> </message> + </context> +<context> + <name>TransactionTableModel</name> + <message> + <source>Date</source> + <translation>날짜</translation> + </message> + <message> + <source>Type</source> + <translation>형식</translation> + </message> + <message> + <source>Label</source> + <translation>라벨</translation> + </message> + <message> + <source>Received with</source> + <translation>받은 주소</translation> + </message> + <message> + <source>Sent to</source> + <translation>보낸 주소</translation> + </message> + <message> + <source>(no label)</source> + <translation>(라벨 없음)</translation> + </message> + </context> +<context> + <name>TransactionView</name> + <message> + <source>Received with</source> + <translation>받은 주소</translation> + </message> + <message> + <source>Sent to</source> + <translation>보낸 주소</translation> + </message> + <message> + <source>Abandon transaction</source> + <translation>버려진 트랜잭션</translation> + </message> + <message> + <source>Copy address</source> + <translation>주소 복사</translation> + </message> + <message> + <source>Copy label</source> + <translation>라벨 복사</translation> + </message> + <message> + <source>Copy amount</source> + <translation>거래액 복사</translation> + </message> + <message> + <source>Copy transaction ID</source> + <translation>트랜잭션 아이디 복사</translation> + </message> + <message> + <source>Copy raw transaction</source> + <translation>로우 트랜잭션 복사</translation> + </message> + <message> + <source>Copy full transaction details</source> + <translation>거래 세부 내역 복사</translation> + </message> + <message> + <source>Edit label</source> + <translation>라벨 수정</translation> + </message> + <message> + <source>Show transaction details</source> + <translation>거래 세부 내역 보기</translation> + </message> + <message> + <source>Export Transaction History</source> + <translation>거래 기록 내보내기</translation> + </message> + <message> + <source>Comma separated file (*.csv)</source> + <translation>쉼표로 구분된 파일 (*.csv)</translation> + </message> + <message> + <source>Confirmed</source> + <translation>확인됨</translation> + </message> + <message> + <source>Watch-only</source> + <translation>모니터링 지갑</translation> + </message> + <message> + <source>Date</source> + <translation>날짜</translation> + </message> + <message> + <source>Type</source> + <translation>형식</translation> + </message> + <message> + <source>Label</source> + <translation>라벨</translation> + </message> + <message> + <source>Address</source> + <translation>주소</translation> + </message> + <message> + <source>ID</source> + <translation>아이디</translation> + </message> + <message> + <source>Exporting Failed</source> + <translation>내보내기 실패</translation> + </message> + <message> + <source>There was an error trying to save the transaction history to %1.</source> + <translation>%1으로 거래 기록을 저장하는데 에러가 있었습니다.</translation> + </message> + <message> + <source>Exporting Successful</source> + <translation>내보내기 성공</translation> + </message> + <message> + <source>The transaction history was successfully saved to %1.</source> + <translation>거래 기록이 성공적으로 %1에 저장되었습니다.</translation> + </message> + <message> + <source>Range:</source> + <translation>범위:</translation> + </message> + <message> + <source>to</source> + <translation>상대방</translation> + </message> </context> <context> <name>UnitDisplayStatusBarControl</name> @@ -1637,6 +2191,55 @@ </message> </context> <context> + <name>WalletFrame</name> + <message> + <source>No wallet has been loaded.</source> + <translation>지갑 불러오기가 안됩니다.</translation> + </message> +</context> +<context> + <name>WalletModel</name> + <message> + <source>Send Coins</source> + <translation>코인 보내기</translation> + </message> +</context> +<context> + <name>WalletView</name> + <message> + <source>&Export</source> + <translation>내보내기 (&E)</translation> + </message> + <message> + <source>Export the data in the current tab to a file</source> + <translation>현재 탭에 있는 데이터를 파일로 내보내기</translation> + </message> + <message> + <source>Backup Wallet</source> + <translation>지갑 백업</translation> + </message> + <message> + <source>Wallet Data (*.dat)</source> + <translation>지갑 데이터 (*.dat)</translation> + </message> + <message> + <source>Backup Failed</source> + <translation>백업 실패</translation> + </message> + <message> + <source>There was an error trying to save the wallet data to %1.</source> + <translation>지갑 데이터를 %1 폴더에 저장하는 동안 오류가 발생했습니다. </translation> + </message> + <message> + <source>Backup Successful</source> + <translation>백업 성공</translation> + </message> + <message> + <source>The wallet data was successfully saved to %1.</source> + <translation>지갑 정보가 %1에 성공적으로 저장되었습니다.</translation> + </message> +</context> +<context> <name>bitcoin-core</name> <message> <source>Options:</source> @@ -1671,10 +2274,6 @@ <translation>블록 축소: 마지막 지갑 동기화 지점이 축소된 데이터보다 과거의 것 입니다. -reindex가 필요합니다 (정지된 노드의 경우 모든 블록체인을 재다운로드합니다)</translation> </message> <message> - <source>Reduce storage requirements by pruning (deleting) old blocks. This mode is incompatible with -txindex and -rescan. Warning: Reverting this setting requires re-downloading the entire blockchain. (default: 0 = disable pruning blocks, >%u = target size in MiB to use for block files)</source> - <translation>오래된 블록을 제거(축소)하여 디스크 용량을 줄입니다. 이 모드는 -txindex 와 -rescan 과 호환되지 않습니다. 경고: 이 모드를 취소하면 모든 블록체인을 다시 다운로드 받아야 합니다. (기본값:0 = 블록 축소 비활성화, >%u = 블록파일에 사용할 용량을 MiB단위로 지정)</translation> - </message> - <message> <source>Rescans are not possible in pruned mode. You will need to use -reindex which will download the whole blockchain again.</source> <translation>블록 축소 모드에서는 재검색이 불가능 합니다. -reindex 명령을 사용해서 모든 블록체인을 다시 다운로드 해야 합니다.</translation> </message> @@ -1699,16 +2298,12 @@ <translation>HTTP 서버를 시작할 수 없습니다. 자세한 사항은 디버그 로그를 확인 하세요.</translation> </message> <message> - <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> - <translation>외부 접속을 승인합니다</translation> - </message> - <message> <source>Bitcoin Core</source> <translation>비트코인 코어</translation> </message> <message> - <source>-fallbackfee is set very high! This is the transaction fee you may pay when fee estimates are not available.</source> - <translation>-fallbackfee은 너무 높습니다! 이것은 수수료 예측을 이용할 수 없을 때 지불되는 트랜잭션 수수료입니다.</translation> + <source>The %s developers</source> + <translation>%s 코어 개발자</translation> </message> <message> <source>A fee rate (in %s/kB) that will be used when fee estimation has insufficient data (default: %s)</source> @@ -1723,20 +2318,36 @@ <translation>선택된 주소로 고정하며 항상 리슨(Listen)합니다. IPv6 프로토콜인 경우 [host]:port 방식의 명령어 표기법을 사용합니다.</translation> </message> <message> + <source>Cannot obtain a lock on data directory %s. %s is probably already running.</source> + <translation>%s 데이터 디렉토리에 락을 걸 수 없었습니다. %s가 이미 실행 중인 것으로 보입니다.</translation> + </message> + <message> <source>Delete all wallet transactions and only recover those parts of the blockchain through -rescan on startup</source> <translation>시작시 모든 지갑 트랜잭션을 삭제하고 -rescan을 통하여 블록체인만 복구합니다.</translation> </message> <message> - <source>Distributed under the MIT software license, see the accompanying file COPYING or <http://www.opensource.org/licenses/mit-license.php>.</source> - <translation>MIT 소프트웨어 라이센스에 따라 배포됩니다. 동봉된 파일 혹은 <http://www.opensource.org/licenses/mit-license.php>를 참조하세요.</translation> + <source>Error loading %s: You can't enable HD on a already existing non-HD wallet</source> + <translation>%s 불러오기 오류: 비-HD 지갑이 존재하는 상태에서 HD 지갑을 활성화 할 수 없습니다</translation> + </message> + <message> + <source>Error reading %s! All keys read correctly, but transaction data or address book entries might be missing or incorrect.</source> + <translation>%s 불러오기 오류: 주소 키는 모두 정확하게 로드되었으나 거래 데이터와 주소록 필드에서 누락이나 오류가 존재할 수 있습니다.</translation> </message> <message> <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source> <translation>지갑 거래가 바뀌면 명령을 실행합니다.(%s 안의 명령어가 TxID로 바뀝니다)</translation> </message> <message> - <source>Force relay of transactions from whitelisted peers even they violate local relay policy (default: %d)</source> - <translation>피어들이 로컬 중계 정책을 위반하더라도 화이트 리스트에 포함된 피어인경우 강제로 중계하기 (기본값: %d)</translation> + <source>Maximum total fees (in %s) to use in a single wallet transaction or raw transaction; setting this too low may abort large transactions (default: %s)</source> + <translation>하나의 지갑 트랜잭션에서의 총 수수료(%s)의 최대치; 너무 낮게 설정하면 큰 트랜잭션이 중지 됩니다 (기본값: %s)</translation> + </message> + <message> + <source>Please check that your computer's date and time are correct! If your clock is wrong, %s will not work properly.</source> + <translation>컴퓨터의 날짜와 시간이 올바른지 확인하십시오! 시간이 잘못되면 %s은 제대로 동작하지 않습니다.</translation> + </message> + <message> + <source>Please contribute if you find %s useful. Visit %s for further information about the software.</source> + <translation>%s가 유용하다고 생각한다면 프로젝트에 공헌해주세요. 이 소프트웨어에 대한 보다 자세한 정보는 %s를 방문해주십시오.</translation> </message> <message> <source>Set the number of script verification threads (%u to %d, 0 = auto, <0 = leave that many cores free, default: %d)</source> @@ -1747,24 +2358,20 @@ <translation>블록 데이터베이스에 미래의 블록이 포함되어 있습니다. 이것은 사용자의 컴퓨터의 날짜와 시간이 올바르게 설정되어 있지 않을때 나타날 수 있습니다. 만약 사용자의 컴퓨터의 날짜와 시간이 올바르다고 확신할 때에만 블록 데이터 베이스의 재구성을 하십시오</translation> </message> <message> - <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source> - <translation>이 빌드 버전은 정식 출시 전 테스트의 목적이며, 예기치 않은 위험과 오류가 발생할 수 있습니다. 채굴과 상점용 소프트웨어로 사용하는 것을 권하지 않습니다.</translation> + <source>Unable to rewind the database to a pre-fork state. You will need to redownload the blockchain</source> + <translation>데이터베이스를 포크 전 상태로 돌리지 못했습니다. 블록체인을 다시 다운로드 해주십시오.</translation> </message> <message> <source>Use UPnP to map the listening port (default: 1 when listening and no -proxy)</source> <translation>리슨(Listen) 포트를 할당하기 위해 UPnP 사용 (기본값: 열려있거나 -proxy 옵션을 사용하지 않을 시 1)</translation> </message> <message> - <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source> - <translation>경고 : 모든 네트워크가 동의해야 하나, 일부 채굴자들에게 문제가 있는 것으로 보입니다. </translation> - </message> - <message> - <source>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</source> - <translation>경고: 현재 비트코인 버전이 다른 네트워크 참여자들과 동일하지 않는 것 같습니다. 당신 또는 다른 참여자들이 동일한 비트코인 버전으로 업그레이드 할 필요가 있습니다.</translation> + <source>You need to rebuild the database using -reindex-chainstate to change -txindex</source> + <translation>-txindex를 바꾸기 위해서는 -reindex-chainstate를 사용해서 데이터베이스를 재구성해야 합니다. </translation> </message> <message> - <source>Whitelist peers connecting from the given netmask or IP address. Can be specified multiple times.</source> - <translation>설정된 넷마스크 혹은 IP 주소로 화이트리스트에 포함된 피어에 접속합니다. 이 설정은 복수로 지정 할 수 있습니다.</translation> + <source>%s corrupt, salvage failed</source> + <translation>%s 손상되었고 복구가 실패하였습니다</translation> </message> <message> <source>-maxmempool must be at least %d MB</source> @@ -1779,18 +2386,26 @@ <translation>사용자 에이전트 문자열에 코멘트 첨부</translation> </message> <message> + <source>Attempt to recover private keys from a corrupt wallet on startup</source> + <translation>시작시 망가진 wallet.dat에서 개인키 복원을 시도합니다</translation> + </message> + <message> <source>Block creation options:</source> <translation>블록 생성 옵션:</translation> </message> <message> - <source>Connect only to the specified node(s)</source> - <translation>지정된 노드에만 연결하기</translation> + <source>Cannot resolve -%s address: '%s'</source> + <translation>%s 주소를 확인할 수 없습니다: '%s'</translation> </message> <message> <source>Connection options:</source> <translation>연결 설정 : </translation> </message> <message> + <source>Copyright (C) %i-%i</source> + <translation>Copyright (C) %i-%i</translation> + </message> + <message> <source>Corrupted block database detected</source> <translation>손상된 블록 데이터베이스가 감지되었습니다</translation> </message> @@ -1835,6 +2450,22 @@ <translation>지갑 데이터베이스 환경 초기화하는데 오류 %s</translation> </message> <message> + <source>Error loading %s</source> + <translation>%s 불러오기 오류</translation> + </message> + <message> + <source>Error loading %s: Wallet corrupted</source> + <translation>%s 불러오기 오류: 지갑 오류</translation> + </message> + <message> + <source>Error loading %s: Wallet requires newer version of %s</source> + <translation>%s 불러오기 에러: 지갑은 새 버전의 %s이 필요합니다</translation> + </message> + <message> + <source>Error loading %s: You can't disable HD on a already existing HD wallet</source> + <translation>%s 불러오기 오류: 이미 HD 지갑이 존재하는 상태에서 HD 지갑을 비활성화 할 수 없습니다</translation> + </message> + <message> <source>Error loading block database</source> <translation>블록 데이터베이스를 불러오는데 오류</translation> </message> @@ -1859,10 +2490,18 @@ <translation>올바르지 않거나 생성된 블록을 찾을 수 없습니다. 잘못된 네트워크 자료 디렉토리?</translation> </message> <message> + <source>Initialization sanity check failed. %s is shutting down.</source> + <translation>무결성 확인 초기화가 실패했습니다. %s가 종료됩니다.</translation> + </message> + <message> <source>Invalid -onion address: '%s'</source> <translation>잘못된 -onion 주소입니다: '%s'</translation> </message> <message> + <source>Invalid amount for -%s=<amount>: '%s'</source> + <translation>유효하지 않은 금액 -%s=<amount>: '%s'</translation> + </message> + <message> <source>Invalid amount for -fallbackfee=<amount>: '%s'</source> <translation>유효하지 않은 금액 -fallbackfee=<amount>: '%s'</translation> </message> @@ -1871,12 +2510,12 @@ <translation>트랜잭션 메모리 풀의 용량을 <n>메가바이트 아래로 유지하기 (기본값: %u)</translation> </message> <message> - <source>Location of the auth cookie (default: data dir)</source> - <translation>인증 쿠키의 위치 (기본값: data dir)</translation> + <source>Loading banlist...</source> + <translation>추방리스트를 불러오는 중...</translation> </message> <message> - <source>Minimum bytes per sigop in transactions we relay and mine (default: %u)</source> - <translation>중계 및 채굴을 할 때 트랜잭션에서의 sigop 당 데이터의 최소 크기 (기본값: %u)</translation> + <source>Location of the auth cookie (default: data dir)</source> + <translation>인증 쿠키의 위치 (기본값: data dir)</translation> </message> <message> <source>Not enough file descriptors available.</source> @@ -1887,6 +2526,10 @@ <translation>오직 <net> 네트워크로 로만 접속 (IPv4, IPv6 혹은 onion)</translation> </message> <message> + <source>Print this help message and exit</source> + <translation>도움말 메시지 출력 후 종료</translation> + </message> + <message> <source>Print version and exit</source> <translation>버전 출력후 종료</translation> </message> @@ -1899,6 +2542,18 @@ <translation>블록 축소 모드는 -txindex와 호환되지 않습니다.</translation> </message> <message> + <source>Rebuild chain state and block index from the blk*.dat files on disk</source> + <translation>현재의 blk*.dat 파일들로부터 블록체인 색인을 재구성합니다.</translation> + </message> + <message> + <source>Rebuild chain state from the currently indexed blocks</source> + <translation>현재 색인 된 블록들로부터 블록체인을 재구성합니다.</translation> + </message> + <message> + <source>Rewinding blocks...</source> + <translation>블록 되감는중...</translation> + </message> + <message> <source>Set database cache size in megabytes (%d to %d, default: %d)</source> <translation>데이터베이스 케시 크기를 메가바이트로 설정(%d 부터 %d, 기본값: %d)</translation> </message> @@ -1911,6 +2566,14 @@ <translation>데이터 폴더 안에 지갑 파일을 선택하세요.</translation> </message> <message> + <source>The source code is available from %s.</source> + <translation>소스코드는 %s 에서 확인하실 수 있습니다.</translation> + </message> + <message> + <source>Unable to bind to %s on this computer. %s is probably already running.</source> + <translation>이 컴퓨터의 %s에 바인딩 할 수 없습니다. 아마도 %s이 실행중인 것 같습니다.</translation> + </message> + <message> <source>Unsupported argument -benchmark ignored, use -debug=bench.</source> <translation>지원하지 않는 인수 -benchmark 은 무시됩니다, -debug=bench 형태로 사용하세요.</translation> </message> @@ -1947,6 +2610,10 @@ <translation>지갑 디버깅/테스트 옵션:</translation> </message> <message> + <source>Wallet needed to be rewritten: restart %s to complete</source> + <translation>지갑을 새로 써야 합니다: 완성하기 위하여 %s을 다시 시작하십시오.</translation> + </message> + <message> <source>Wallet options:</source> <translation>지갑 옵션:</translation> </message> @@ -1995,10 +2662,6 @@ <translation>중계 및 채굴을 할 때 데이터 운송 트랜잭션에서 데이터의 최대 크기 (기본값: %u)</translation> </message> <message> - <source>Query for peer addresses via DNS lookup, if low on addresses (default: 1 unless -connect)</source> - <translation>DNS lookup를 통해 피어 주소에 대한 쿼리 보내기 (기본값: 1 -connect 예외)</translation> - </message> - <message> <source>Randomize credentials for every proxy connection. This enables Tor stream isolation (default: %u)</source> <translation>인증정보를 프록시 연결마다 무작위로 합니다. 이는 Tor 스트림을 격리시킬 수 있습니다 (기본값: %u)</translation> </message> @@ -2011,10 +2674,6 @@ <translation>거래액이 수수료를 지불하기엔 너무 작습니다</translation> </message> <message> - <source>This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit <https://www.openssl.org/> and cryptographic software written by Eric Young and UPnP software written by Thomas Bernard.</source> - <translation>이 프로그램에는 OpenSSL 툴킷<https://www.openssl.org/> 사용 목적으로 개발한 OpenSSL 프로젝트를 포함하고 있으며, 암호화 프로그램은 Eric Young이, UPnP 프로그램은 Thomas Bernard가 작성했습니다.</translation> - </message> - <message> <source>Whitelisted peers cannot be DoS banned and their transactions are always relayed, even if they are already in the mempool, useful e.g. for a gateway</source> <translation>화이트리스트에 포함된 피어는 이미 메모리풀에 포함되어 있어도 DoS 추방이 되지 않으며 그들의 트랜잭션이 항상 중계됩니다, 이는 예를 들면 게이트웨이에서 유용합니다.</translation> </message> @@ -2123,10 +2782,6 @@ <translation>거래액이 너무 적습니다</translation> </message> <message> - <source>Transaction amounts must be positive</source> - <translation>거래액은 반드시 정수여야합니다.</translation> - </message> - <message> <source>Transaction too large for fee policy</source> <translation>수수료 정책에 비해 트랜잭션이 너무 큽니다</translation> </message> @@ -2187,10 +2842,6 @@ <translation>-maxtxfee값이 너무 큽니다! 하나의 트랜잭션에 너무 큰 수수료가 지불 됩니다.</translation> </message> <message> - <source>-paytxfee is set very high! This is the transaction fee you will pay if you send a transaction.</source> - <translation>-paytxfee값이 너무 큽니다! 이 값은 송금할때 지불할 송금 수수료입니다.</translation> - </message> - <message> <source>Do not keep transactions in the mempool longer than <n> hours (default: %u)</source> <translation>메모리 풀에 있는 트랜잭션 기록을 <n>시간 후 부터는 유지하지 않기 (기본값: %u)</translation> </message> @@ -2239,14 +2890,22 @@ <translation>Tor 서비스를 이용하여 피어에게 연결하기 위해 분리된 SOCKS5 프록시를 사용 (기본값: %s)</translation> </message> <message> - <source>Username and hashed password for JSON-RPC connections. The field <userpw> comes in the format: <USERNAME>:<SALT>$<HASH>. A canonical python script is included in share/rpcuser. This option can be specified multiple times</source> - <translation>JSON-RPC 연결시 사용자 이름과 해시화된 암호문. <userpw> 필드는 <USERNAME>:<SALT>$<HASH> 포멧으로 구성되어 있습니다. 전형적 파이썬 스크립트에선 share/rpcuser가 포함되어 있습니다. 이 옵션은 여러번 지정할 수 있습니다.</translation> - </message> - <message> <source>Warning: Unknown block versions being mined! It's possible unknown rules are in effect</source> <translation>경고: 알려지지 않은 버전의 블록이 채굴되었습니다. 알려지지 않은 규칙이 적용되었을 가능성이 있습니다.</translation> </message> <message> + <source>Warning: Wallet file corrupt, data salvaged! Original %s saved as %s in %s; if your balance or transactions are incorrect you should restore from a backup.</source> + <translation>경고 : 지갑파일이 손상되어 데이터가 복구되었습니다. 원래의 %s 파일은 %s 후에 %s 이름으로 저장됩니다. 잔액과 거래 내역이 정확하지 않다면 백업 파일로 부터 복원해야 합니다. </translation> + </message> + <message> + <source>Whitelist peers connecting from the given IP address (e.g. 1.2.3.4) or CIDR notated network (e.g. 1.2.3.0/24). Can be specified multiple times.</source> + <translation>설정된 IP주소 (보기 1.2.3.4) 혹은 CIDR로 작성된 네트워크 (보기 1.2.3.0/24)로 화이트리스트에 포함된 피어에 접속합니다. 이 설정은 복수로 지정 할 수 있습니다.</translation> + </message> + <message> + <source>(default: %s)</source> + <translation>(기본값: %s)</translation> + </message> + <message> <source>Always query for peer addresses via DNS lookup (default: %u)</source> <translation>DNS lookup을 통해 항상 피어주소에 대한 쿼리 보내기 (기본값: %u)</translation> </message> @@ -2323,6 +2982,10 @@ <translation>트랜잭션을 보낼 때 검증되지 않은 잔돈 쓰기 (기본값: %u)</translation> </message> <message> + <source>Starting network threads...</source> + <translation>네트워크 스레드 시작중...</translation> + </message> + <message> <source>Threshold for disconnecting misbehaving peers (default: %u)</source> <translation>이상행동 네트워크 참여자의 연결을 차단시키기 위한 한계치 (기본값: %u)</translation> </message> diff --git a/src/qt/locale/bitcoin_ku_IQ.ts b/src/qt/locale/bitcoin_ku_IQ.ts index da5e41a358..a0d8510413 100644 --- a/src/qt/locale/bitcoin_ku_IQ.ts +++ b/src/qt/locale/bitcoin_ku_IQ.ts @@ -25,7 +25,14 @@ <source>&Delete</source> <translation>&سڕینەوە</translation> </message> -</context> + </context> +<context> + <name>AddressTableModel</name> + <message> + <source>Address</source> + <translation>ناوونیشان</translation> + </message> + </context> <context> <name>AskPassphraseDialog</name> </context> @@ -70,10 +77,6 @@ <translation>کۆ:</translation> </message> <message> - <source>Priority:</source> - <translation>لەپێشی:</translation> - </message> - <message> <source>Fee:</source> <translation>تێچوون:</translation> </message> @@ -86,10 +89,14 @@ <translation>رێکەت</translation> </message> <message> - <source>Priority</source> - <translation>لەپێشی</translation> + <source>yes</source> + <translation>بەڵێ</translation> </message> -</context> + <message> + <source>no</source> + <translation>نەخێر</translation> + </message> + </context> <context> <name>EditAddressDialog</name> </context> @@ -119,6 +126,9 @@ </message> </context> <context> + <name>ModalOverlay</name> + </context> +<context> <name>OpenURIDialog</name> </context> <context> @@ -136,6 +146,9 @@ </message> </context> <context> + <name>PaymentServer</name> + </context> +<context> <name>PeerTableModel</name> </context> <context> @@ -146,20 +159,42 @@ </message> </context> <context> + <name>QObject::QObject</name> + </context> +<context> + <name>QRImageWidget</name> + </context> +<context> <name>RPCConsole</name> <message> <source>&Information</source> <translation>&زانیاری</translation> </message> <message> + <source>General</source> + <translation>گشتی</translation> + </message> + <message> + <source>Network</source> + <translation>تۆڕ</translation> + </message> + <message> <source>Name</source> <translation>ناو</translation> </message> <message> + <source>Sent</source> + <translation>نێدرا</translation> + </message> + <message> <source>Version</source> <translation>وەشان</translation> </message> <message> + <source>Services</source> + <translation>خزمەتگوزاریەکان</translation> + </message> + <message> <source>&Open</source> <translation>&کردنەوە</translation> </message> @@ -172,6 +207,34 @@ <translation>گشتییەکان</translation> </message> <message> + <source>In:</source> + <translation>لە ناو</translation> + </message> + <message> + <source>Out:</source> + <translation>لەدەرەوە</translation> + </message> + <message> + <source>1 &hour</source> + <translation>1&سات</translation> + </message> + <message> + <source>1 &day</source> + <translation>1&ڕۆژ</translation> + </message> + <message> + <source>1 &week</source> + <translation>1&هەفتە</translation> + </message> + <message> + <source>1 &year</source> + <translation>1&ساڵ</translation> + </message> + <message> + <source>never</source> + <translation>هەرگیز</translation> + </message> + <message> <source>Yes</source> <translation>بەڵێ</translation> </message> @@ -202,9 +265,24 @@ <source>Remove</source> <translation>سڕینەوە</translation> </message> -</context> + </context> <context> <name>ReceiveRequestDialog</name> + <message> + <source>Address</source> + <translation>ناوونیشان</translation> + </message> + <message> + <source>Amount</source> + <translation>سەرجەم</translation> + </message> + </context> +<context> + <name>RecentRequestsTableModel</name> + <message> + <source>Date</source> + <translation>رێکەت</translation> + </message> </context> <context> <name>SendCoinsDialog</name> @@ -213,10 +291,6 @@ <translation>کۆ:</translation> </message> <message> - <source>Priority:</source> - <translation>لەپێشی:</translation> - </message> - <message> <source>Fee:</source> <translation>تێچوون:</translation> </message> @@ -233,6 +307,13 @@ </message> </context> <context> + <name>SendConfirmationDialog</name> + <message> + <source>Yes</source> + <translation>بەڵێ</translation> + </message> +</context> +<context> <name>ShutdownWindow</name> </context> <context> @@ -245,12 +326,54 @@ <name>TrafficGraphWidget</name> </context> <context> + <name>TransactionDesc</name> + <message> + <source>Date</source> + <translation>رێکەت</translation> + </message> + <message> + <source>Amount</source> + <translation>سەرجەم</translation> + </message> + </context> +<context> <name>TransactionDescDialog</name> </context> <context> + <name>TransactionTableModel</name> + <message> + <source>Date</source> + <translation>رێکەت</translation> + </message> + </context> +<context> + <name>TransactionView</name> + <message> + <source>Date</source> + <translation>رێکەت</translation> + </message> + <message> + <source>Address</source> + <translation>ناوونیشان</translation> + </message> + </context> +<context> <name>UnitDisplayStatusBarControl</name> </context> <context> + <name>WalletFrame</name> + </context> +<context> + <name>WalletModel</name> + </context> +<context> + <name>WalletView</name> + <message> + <source>&Export</source> + <translation>&هەناردن</translation> + </message> + </context> +<context> <name>bitcoin-core</name> <message> <source>Options:</source> diff --git a/src/qt/locale/bitcoin_ky.ts b/src/qt/locale/bitcoin_ky.ts index 14cb9c2020..da364c3bbc 100644 --- a/src/qt/locale/bitcoin_ky.ts +++ b/src/qt/locale/bitcoin_ky.ts @@ -9,6 +9,17 @@ <source>&Delete</source> <translation>Ө&чүрүү</translation> </message> + </context> +<context> + <name>AddressTableModel</name> + <message> + <source>Address</source> + <translation>Дарек</translation> + </message> + <message> + <source>(no label)</source> + <translation>(аты жок)</translation> + </message> </context> <context> <name>AskPassphraseDialog</name> @@ -65,6 +76,10 @@ <source>Date</source> <translation>Дата</translation> </message> + <message> + <source>(no label)</source> + <translation>(аты жок)</translation> + </message> </context> <context> <name>EditAddressDialog</name> @@ -72,7 +87,7 @@ <source>&Address</source> <translation>&Дарек</translation> </message> -</context> + </context> <context> <name>FreespaceChecker</name> </context> @@ -91,6 +106,9 @@ </message> </context> <context> + <name>ModalOverlay</name> + </context> +<context> <name>OpenURIDialog</name> </context> <context> @@ -136,12 +154,21 @@ <name>OverviewPage</name> </context> <context> + <name>PaymentServer</name> + </context> +<context> <name>PeerTableModel</name> </context> <context> <name>QObject</name> </context> <context> + <name>QObject::QObject</name> + </context> +<context> + <name>QRImageWidget</name> + </context> +<context> <name>RPCConsole</name> <message> <source>&Information</source> @@ -181,6 +208,29 @@ </context> <context> <name>ReceiveRequestDialog</name> + <message> + <source>Address</source> + <translation>Дарек</translation> + </message> + <message> + <source>Message</source> + <translation>Билдирүү</translation> + </message> + </context> +<context> + <name>RecentRequestsTableModel</name> + <message> + <source>Date</source> + <translation>Дата</translation> + </message> + <message> + <source>Message</source> + <translation>Билдирүү</translation> + </message> + <message> + <source>(no label)</source> + <translation>(аты жок)</translation> + </message> </context> <context> <name>SendCoinsDialog</name> @@ -192,6 +242,10 @@ <source>S&end</source> <translation>&Жөнөтүү</translation> </message> + <message> + <source>(no label)</source> + <translation>(аты жок)</translation> + </message> </context> <context> <name>SendCoinsEntry</name> @@ -205,6 +259,9 @@ </message> </context> <context> + <name>SendConfirmationDialog</name> + </context> +<context> <name>ShutdownWindow</name> </context> <context> @@ -225,12 +282,58 @@ <name>TrafficGraphWidget</name> </context> <context> + <name>TransactionDesc</name> + <message> + <source>%1/offline</source> + <translation>%1/тармакта эмес</translation> + </message> + <message> + <source>Date</source> + <translation>Дата</translation> + </message> + <message> + <source>Message</source> + <translation>Билдирүү</translation> + </message> + </context> +<context> <name>TransactionDescDialog</name> </context> <context> + <name>TransactionTableModel</name> + <message> + <source>Date</source> + <translation>Дата</translation> + </message> + <message> + <source>(no label)</source> + <translation>(аты жок)</translation> + </message> + </context> +<context> + <name>TransactionView</name> + <message> + <source>Date</source> + <translation>Дата</translation> + </message> + <message> + <source>Address</source> + <translation>Дарек</translation> + </message> + </context> +<context> <name>UnitDisplayStatusBarControl</name> </context> <context> + <name>WalletFrame</name> + </context> +<context> + <name>WalletModel</name> + </context> +<context> + <name>WalletView</name> + </context> +<context> <name>bitcoin-core</name> <message> <source>Information</source> diff --git a/src/qt/locale/bitcoin_la.ts b/src/qt/locale/bitcoin_la.ts index dc532fe011..d84dd7e4e2 100644 --- a/src/qt/locale/bitcoin_la.ts +++ b/src/qt/locale/bitcoin_la.ts @@ -25,7 +25,10 @@ <source>&Delete</source> <translation>&Dele</translation> </message> -</context> + </context> +<context> + <name>AddressTableModel</name> + </context> <context> <name>AskPassphraseDialog</name> <message> @@ -44,7 +47,7 @@ <source>Repeat new passphrase</source> <translation>Itera novam tesseram</translation> </message> -</context> + </context> <context> <name>BanTableModel</name> </context> @@ -191,10 +194,6 @@ <translation>Optiones mandati initiantis</translation> </message> <message> - <source>No block source available...</source> - <translation>Nulla fons frustorum absens...</translation> - </message> - <message> <source>%1 behind</source> <translation>%1 post</translation> </message> @@ -242,7 +241,7 @@ <source>Wallet is <b>encrypted</b> and currently <b>locked</b></source> <translation>Cassidile <b>cifratum</b> est et iam nunc <b>seratum</b></translation> </message> -</context> + </context> <context> <name>CoinControlDialog</name> <message> @@ -276,7 +275,7 @@ <source>&Address</source> <translation>&Inscriptio</translation> </message> -</context> + </context> <context> <name>FreespaceChecker</name> </context> @@ -307,6 +306,17 @@ </message> </context> <context> + <name>ModalOverlay</name> + <message> + <source>Form</source> + <translation>Schema</translation> + </message> + <message> + <source>Last block time</source> + <translation>Hora postremi frusti</translation> + </message> + </context> +<context> <name>OpenURIDialog</name> </context> <context> @@ -428,6 +438,9 @@ </message> </context> <context> + <name>PaymentServer</name> + </context> +<context> <name>PeerTableModel</name> </context> <context> @@ -442,6 +455,12 @@ </message> </context> <context> + <name>QObject::QObject</name> + </context> +<context> + <name>QRImageWidget</name> + </context> +<context> <name>RPCConsole</name> <message> <source>N/A</source> @@ -531,6 +550,9 @@ </message> </context> <context> + <name>RecentRequestsTableModel</name> + </context> +<context> <name>SendCoinsDialog</name> <message> <source>Send Coins</source> @@ -572,7 +594,7 @@ <source>S&end</source> <translation>&Mitte</translation> </message> -</context> + </context> <context> <name>SendCoinsEntry</name> <message> @@ -609,6 +631,9 @@ </message> </context> <context> + <name>SendConfirmationDialog</name> + </context> +<context> <name>ShutdownWindow</name> </context> <context> @@ -677,7 +702,7 @@ <source>Reset all verify message fields</source> <translation>Reconstitue omnes campos verificandi nuntii</translation> </message> -</context> + </context> <context> <name>SplashScreen</name> <message> @@ -689,16 +714,34 @@ <name>TrafficGraphWidget</name> </context> <context> + <name>TransactionDesc</name> + </context> +<context> <name>TransactionDescDialog</name> <message> <source>This pane shows a detailed description of the transaction</source> <translation>Haec tabula monstrat descriptionem verbosam transactionis</translation> </message> -</context> + </context> +<context> + <name>TransactionTableModel</name> + </context> +<context> + <name>TransactionView</name> + </context> <context> <name>UnitDisplayStatusBarControl</name> </context> <context> + <name>WalletFrame</name> + </context> +<context> + <name>WalletModel</name> + </context> +<context> + <name>WalletView</name> + </context> +<context> <name>bitcoin-core</name> <message> <source>Options:</source> @@ -725,10 +768,6 @@ <translation>Operare infere sicut daemon et mandata accipe</translation> </message> <message> - <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> - <translation>Accipe conexiones externas (praedefinitum: 1 nisi -proxy neque -connect)</translation> - </message> - <message> <source>Bitcoin Core</source> <translation>Bitcoin Nucleus</translation> </message> @@ -741,18 +780,10 @@ <translation>Facere mandatum quotiescumque cassidilis transactio mutet (%s in mandato sbstituitur ab TxID)</translation> </message> <message> - <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source> - <translation>Hoc est prae-dimittum experimentala aedes - utere eo periculo tuo proprio - nolite utere fodendo vel applicationibus mercatoriis</translation> - </message> - <message> <source>Block creation options:</source> <translation>Optiones creandi frustorum:</translation> </message> <message> - <source>Connect only to the specified node(s)</source> - <translation>Conecte sole ad nodos specificatos (vel nodum specificatum)</translation> - </message> - <message> <source>Corrupted block database detected</source> <translation>Corruptum databasum frustorum invenitur</translation> </message> @@ -817,10 +848,6 @@ <translation>Magnitudo transactionis nimis parva</translation> </message> <message> - <source>Transaction amounts must be positive</source> - <translation>Necesse est magnitudines transactionum positivas esse.</translation> - </message> - <message> <source>Transaction too large</source> <translation>Transactio nimis magna</translation> </message> diff --git a/src/qt/locale/bitcoin_lt.ts b/src/qt/locale/bitcoin_lt.ts index 1f6cda1f52..67fee9ae42 100644 --- a/src/qt/locale/bitcoin_lt.ts +++ b/src/qt/locale/bitcoin_lt.ts @@ -41,7 +41,10 @@ <source>&Delete</source> <translation>&Trinti</translation> </message> -</context> + </context> +<context> + <name>AddressTableModel</name> + </context> <context> <name>AskPassphraseDialog</name> <message> @@ -60,7 +63,7 @@ <source>Repeat new passphrase</source> <translation>Pakartokite naują slaptafrazę</translation> </message> -</context> + </context> <context> <name>BanTableModel</name> <message> @@ -258,7 +261,7 @@ <source>Wallet is <b>encrypted</b> and currently <b>locked</b></source> <translation>Piniginė <b>užšifruota</b> ir šiuo metu <b>užrakinta</b></translation> </message> -</context> + </context> <context> <name>CoinControlDialog</name> <message> @@ -278,10 +281,6 @@ <translation>Suma:</translation> </message> <message> - <source>Priority:</source> - <translation>Pirmumas:</translation> - </message> - <message> <source>Fee:</source> <translation>Mokestis:</translation> </message> @@ -321,11 +320,7 @@ <source>Confirmed</source> <translation>Patvirtintas</translation> </message> - <message> - <source>Priority</source> - <translation>Pirmumas</translation> - </message> -</context> + </context> <context> <name>EditAddressDialog</name> <message> @@ -340,7 +335,7 @@ <source>&Address</source> <translation>&Adresas</translation> </message> -</context> + </context> <context> <name>FreespaceChecker</name> <message> @@ -379,6 +374,17 @@ </message> </context> <context> + <name>ModalOverlay</name> + <message> + <source>Form</source> + <translation>Forma</translation> + </message> + <message> + <source>Last block time</source> + <translation>Paskutinio bloko laikas</translation> + </message> + </context> +<context> <name>OpenURIDialog</name> </context> <context> @@ -540,6 +546,9 @@ </message> </context> <context> + <name>PaymentServer</name> + </context> +<context> <name>PeerTableModel</name> </context> <context> @@ -562,6 +571,12 @@ </message> </context> <context> + <name>QObject::QObject</name> + </context> +<context> + <name>QRImageWidget</name> + </context> +<context> <name>RPCConsole</name> <message> <source>N/A</source> @@ -703,6 +718,9 @@ </message> </context> <context> + <name>RecentRequestsTableModel</name> + </context> +<context> <name>SendCoinsDialog</name> <message> <source>Send Coins</source> @@ -725,10 +743,6 @@ <translation>Suma:</translation> </message> <message> - <source>Priority:</source> - <translation>Pirmumas:</translation> - </message> - <message> <source>Fee:</source> <translation>Mokestis:</translation> </message> @@ -768,7 +782,7 @@ <source>S&end</source> <translation>&Siųsti</translation> </message> -</context> + </context> <context> <name>SendCoinsEntry</name> <message> @@ -805,6 +819,9 @@ </message> </context> <context> + <name>SendConfirmationDialog</name> + </context> +<context> <name>ShutdownWindow</name> </context> <context> @@ -869,16 +886,34 @@ </message> </context> <context> + <name>TransactionDesc</name> + </context> +<context> <name>TransactionDescDialog</name> <message> <source>This pane shows a detailed description of the transaction</source> <translation>Šis langas sandorio detalų aprašymą</translation> </message> -</context> + </context> +<context> + <name>TransactionTableModel</name> + </context> +<context> + <name>TransactionView</name> + </context> <context> <name>UnitDisplayStatusBarControl</name> </context> <context> + <name>WalletFrame</name> + </context> +<context> + <name>WalletModel</name> + </context> +<context> + <name>WalletView</name> + </context> +<context> <name>bitcoin-core</name> <message> <source>Options:</source> @@ -905,10 +940,6 @@ <translation>Bitcoin branduolys</translation> </message> <message> - <source>Connect only to the specified node(s)</source> - <translation>Prisijungti tik prie nurodyto mazgo</translation> - </message> - <message> <source>Error opening block database</source> <translation>Klaida atveriant blokų duombazę</translation> </message> diff --git a/src/qt/locale/bitcoin_lv_LV.ts b/src/qt/locale/bitcoin_lv_LV.ts index 38333531e4..2953da443a 100644 --- a/src/qt/locale/bitcoin_lv_LV.ts +++ b/src/qt/locale/bitcoin_lv_LV.ts @@ -37,7 +37,10 @@ <source>&Delete</source> <translation>&Dzēst</translation> </message> -</context> + </context> +<context> + <name>AddressTableModel</name> + </context> <context> <name>AskPassphraseDialog</name> <message> @@ -56,7 +59,7 @@ <source>Repeat new passphrase</source> <translation>Jaunā parole vēlreiz</translation> </message> -</context> + </context> <context> <name>BanTableModel</name> </context> @@ -227,14 +230,6 @@ <translation>&Komandrindas iespējas</translation> </message> <message> - <source>No block source available...</source> - <translation>Nav pieejams neviens bloku avots...</translation> - </message> - <message> - <source>%1 and %2</source> - <translation>%1 un %2</translation> - </message> - <message> <source>%1 behind</source> <translation>%1 aizmugurē</translation> </message> @@ -278,7 +273,7 @@ <source>Wallet is <b>encrypted</b> and currently <b>locked</b></source> <translation>Maciņš ir <b>šifrēts</b> un pašlaik <b>slēgts</b></translation> </message> -</context> + </context> <context> <name>CoinControlDialog</name> <message> @@ -294,10 +289,6 @@ <translation>Daudzums:</translation> </message> <message> - <source>Priority:</source> - <translation>Prioritāte:</translation> - </message> - <message> <source>Fee:</source> <translation>Maksa:</translation> </message> @@ -337,11 +328,7 @@ <source>Confirmed</source> <translation>Apstiprināts</translation> </message> - <message> - <source>Priority</source> - <translation>Prioritāte</translation> - </message> -</context> + </context> <context> <name>EditAddressDialog</name> <message> @@ -356,7 +343,7 @@ <source>&Address</source> <translation>&Adrese</translation> </message> -</context> + </context> <context> <name>FreespaceChecker</name> <message> @@ -419,6 +406,17 @@ </message> </context> <context> + <name>ModalOverlay</name> + <message> + <source>Form</source> + <translation>Forma</translation> + </message> + <message> + <source>Last block time</source> + <translation>Pēdējā bloka laiks</translation> + </message> + </context> +<context> <name>OpenURIDialog</name> <message> <source>Open URI</source> @@ -436,7 +434,7 @@ <source>Select payment request file</source> <translation>Izvēlies maksājuma pieprasījuma datni</translation> </message> -</context> + </context> <context> <name>OptionsDialog</name> <message> @@ -628,6 +626,9 @@ </message> </context> <context> + <name>PaymentServer</name> + </context> +<context> <name>PeerTableModel</name> </context> <context> @@ -648,6 +649,16 @@ <source>N/A</source> <translation>N/A</translation> </message> + <message> + <source>%1 and %2</source> + <translation>%1 un %2</translation> + </message> + </context> +<context> + <name>QObject::QObject</name> + </context> +<context> + <name>QRImageWidget</name> </context> <context> <name>RPCConsole</name> @@ -810,7 +821,7 @@ <source>Remove</source> <translation>Noņemt</translation> </message> -</context> + </context> <context> <name>ReceiveRequestDialog</name> <message> @@ -829,7 +840,10 @@ <source>&Save Image...</source> <translation>&Saglabāt Attēlu...</translation> </message> -</context> + </context> +<context> + <name>RecentRequestsTableModel</name> + </context> <context> <name>SendCoinsDialog</name> <message> @@ -865,10 +879,6 @@ <translation>Daudzums:</translation> </message> <message> - <source>Priority:</source> - <translation>Prioritāte:</translation> - </message> - <message> <source>Fee:</source> <translation>Maksa:</translation> </message> @@ -916,7 +926,7 @@ <source>S&end</source> <translation>&Sūtīt</translation> </message> -</context> + </context> <context> <name>SendCoinsEntry</name> <message> @@ -967,7 +977,10 @@ <source>Memo:</source> <translation>Memo:</translation> </message> -</context> + </context> +<context> + <name>SendConfirmationDialog</name> + </context> <context> <name>ShutdownWindow</name> <message> @@ -1041,7 +1054,7 @@ <source>Reset all verify message fields</source> <translation>Atiestatīt visus laukus</translation> </message> -</context> + </context> <context> <name>SplashScreen</name> <message> @@ -1057,16 +1070,34 @@ </message> </context> <context> + <name>TransactionDesc</name> + </context> +<context> <name>TransactionDescDialog</name> <message> <source>This pane shows a detailed description of the transaction</source> <translation>Šis panelis parāda transakcijas detaļas</translation> </message> -</context> + </context> +<context> + <name>TransactionTableModel</name> + </context> +<context> + <name>TransactionView</name> + </context> <context> <name>UnitDisplayStatusBarControl</name> </context> <context> + <name>WalletFrame</name> + </context> +<context> + <name>WalletModel</name> + </context> +<context> + <name>WalletView</name> + </context> +<context> <name>bitcoin-core</name> <message> <source>Options:</source> @@ -1105,10 +1136,6 @@ <translation>Bloka izveidošanas iestatījumi:</translation> </message> <message> - <source>Connect only to the specified node(s)</source> - <translation>Savienoties tikai ar norādītajām nodēm.</translation> - </message> - <message> <source>Connection options:</source> <translation>Savienojuma iestatījumi:</translation> </message> @@ -1161,10 +1188,6 @@ <translation>Transakcijas summa ir pārāk maza</translation> </message> <message> - <source>Transaction amounts must be positive</source> - <translation>Transakcijas summai ir jābūt pozitīvai</translation> - </message> - <message> <source>Transaction too large</source> <translation>Transakcija ir pārāk liela</translation> </message> diff --git a/src/qt/locale/bitcoin_mk_MK.ts b/src/qt/locale/bitcoin_mk_MK.ts index b696111a53..e11e415ec5 100644 --- a/src/qt/locale/bitcoin_mk_MK.ts +++ b/src/qt/locale/bitcoin_mk_MK.ts @@ -41,7 +41,10 @@ <source>&Delete</source> <translation>&Избриши</translation> </message> -</context> + </context> +<context> + <name>AddressTableModel</name> + </context> <context> <name>AskPassphraseDialog</name> <message> @@ -56,7 +59,7 @@ <source>Repeat new passphrase</source> <translation>Повторете ја новата тајна фраза</translation> </message> -</context> + </context> <context> <name>BanTableModel</name> </context> @@ -178,26 +181,6 @@ <source>Processed %n block(s) of transaction history.</source> <translation><numerusform>Обработен %n блок од историјата на трансакции.</numerusform><numerusform>Обработени %n блокови од историјата на трансакции.</numerusform></translation> </message> - <message numerus="yes"> - <source>%n hour(s)</source> - <translation><numerusform>%n час</numerusform><numerusform>%n часови</numerusform></translation> - </message> - <message numerus="yes"> - <source>%n day(s)</source> - <translation><numerusform>%n ден</numerusform><numerusform>%n денови</numerusform></translation> - </message> - <message numerus="yes"> - <source>%n week(s)</source> - <translation><numerusform>%n недела</numerusform><numerusform>%n недели</numerusform></translation> - </message> - <message> - <source>%1 and %2</source> - <translation>%1 и %2</translation> - </message> - <message numerus="yes"> - <source>%n year(s)</source> - <translation><numerusform>%n година</numerusform><numerusform>%n години</numerusform></translation> - </message> <message> <source>%1 behind</source> <translation>%1 позади</translation> @@ -256,10 +239,6 @@ <translation>Сума:</translation> </message> <message> - <source>Priority:</source> - <translation>Приоритет:</translation> - </message> - <message> <source>Fee:</source> <translation>Провизија:</translation> </message> @@ -283,11 +262,7 @@ <source>Date</source> <translation>Дата</translation> </message> - <message> - <source>Priority</source> - <translation>Приоритет</translation> - </message> -</context> + </context> <context> <name>EditAddressDialog</name> <message> @@ -302,7 +277,7 @@ <source>&Address</source> <translation>&Адреса</translation> </message> -</context> + </context> <context> <name>FreespaceChecker</name> <message> @@ -329,6 +304,9 @@ </message> </context> <context> + <name>ModalOverlay</name> + </context> +<context> <name>OpenURIDialog</name> <message> <source>Open URI</source> @@ -382,6 +360,9 @@ </message> </context> <context> + <name>PaymentServer</name> + </context> +<context> <name>PeerTableModel</name> </context> <context> @@ -410,7 +391,17 @@ <source>%1 ms</source> <translation>%1 мс</translation> </message> -</context> + <message> + <source>%1 and %2</source> + <translation>%1 и %2</translation> + </message> + </context> +<context> + <name>QObject::QObject</name> + </context> +<context> + <name>QRImageWidget</name> + </context> <context> <name>RPCConsole</name> <message> @@ -495,7 +486,10 @@ <source>&Save Image...</source> <translation>&Сними Слика...</translation> </message> -</context> + </context> +<context> + <name>RecentRequestsTableModel</name> + </context> <context> <name>SendCoinsDialog</name> <message> @@ -507,10 +501,6 @@ <translation>Сума:</translation> </message> <message> - <source>Priority:</source> - <translation>Приоритет:</translation> - </message> - <message> <source>Fee:</source> <translation>Провизија:</translation> </message> @@ -543,6 +533,9 @@ </message> </context> <context> + <name>SendConfirmationDialog</name> + </context> +<context> <name>ShutdownWindow</name> </context> <context> @@ -555,12 +548,30 @@ <name>TrafficGraphWidget</name> </context> <context> + <name>TransactionDesc</name> + </context> +<context> <name>TransactionDescDialog</name> </context> <context> + <name>TransactionTableModel</name> + </context> +<context> + <name>TransactionView</name> + </context> +<context> <name>UnitDisplayStatusBarControl</name> </context> <context> + <name>WalletFrame</name> + </context> +<context> + <name>WalletModel</name> + </context> +<context> + <name>WalletView</name> + </context> +<context> <name>bitcoin-core</name> <message> <source>Options:</source> diff --git a/src/qt/locale/bitcoin_mn.ts b/src/qt/locale/bitcoin_mn.ts index d9ef0d127b..6e13d21288 100644 --- a/src/qt/locale/bitcoin_mn.ts +++ b/src/qt/locale/bitcoin_mn.ts @@ -37,7 +37,10 @@ <source>&Delete</source> <translation>&Устгах</translation> </message> -</context> + </context> +<context> + <name>AddressTableModel</name> + </context> <context> <name>AskPassphraseDialog</name> <message> @@ -52,7 +55,7 @@ <source>Repeat new passphrase</source> <translation>Шинэ нууц үгийг давтана уу</translation> </message> -</context> + </context> <context> <name>BanTableModel</name> </context> @@ -174,7 +177,7 @@ <source>Wallet is <b>encrypted</b> and currently <b>locked</b></source> <translation>Түрүйвч <b>цоожтой</b> ба одоогоор цоож <b>хаалттай</b> байна</translation> </message> -</context> + </context> <context> <name>CoinControlDialog</name> <message> @@ -212,7 +215,7 @@ <source>&Address</source> <translation>&Хаяг</translation> </message> -</context> + </context> <context> <name>FreespaceChecker</name> </context> @@ -235,6 +238,13 @@ </message> </context> <context> + <name>ModalOverlay</name> + <message> + <source>Last block time</source> + <translation>Сүүлийн блокийн хугацаа</translation> + </message> + </context> +<context> <name>OpenURIDialog</name> </context> <context> @@ -276,6 +286,9 @@ </message> </context> <context> + <name>PaymentServer</name> + </context> +<context> <name>PeerTableModel</name> </context> <context> @@ -290,6 +303,12 @@ </message> </context> <context> + <name>QObject::QObject</name> + </context> +<context> + <name>QRImageWidget</name> + </context> +<context> <name>RPCConsole</name> <message> <source>N/A</source> @@ -370,7 +389,7 @@ <source>Remove</source> <translation>Устгах</translation> </message> -</context> + </context> <context> <name>ReceiveRequestDialog</name> <message> @@ -379,6 +398,9 @@ </message> </context> <context> + <name>RecentRequestsTableModel</name> + </context> +<context> <name>SendCoinsDialog</name> <message> <source>Send Coins</source> @@ -424,7 +446,7 @@ <source>S&end</source> <translation>Яв&уул</translation> </message> -</context> + </context> <context> <name>SendCoinsEntry</name> <message> @@ -461,6 +483,9 @@ </message> </context> <context> + <name>SendConfirmationDialog</name> + </context> +<context> <name>ShutdownWindow</name> <message> <source>Do not shut down the computer until this window disappears.</source> @@ -493,16 +518,34 @@ <name>TrafficGraphWidget</name> </context> <context> + <name>TransactionDesc</name> + </context> +<context> <name>TransactionDescDialog</name> <message> <source>This pane shows a detailed description of the transaction</source> <translation>Гүйлгээний дэлгэрэнгүйг энэ бичил цонх харуулж байна</translation> </message> -</context> + </context> +<context> + <name>TransactionTableModel</name> + </context> +<context> + <name>TransactionView</name> + </context> <context> <name>UnitDisplayStatusBarControl</name> </context> <context> + <name>WalletFrame</name> + </context> +<context> + <name>WalletModel</name> + </context> +<context> + <name>WalletView</name> + </context> +<context> <name>bitcoin-core</name> <message> <source>Options:</source> diff --git a/src/qt/locale/bitcoin_ms_MY.ts b/src/qt/locale/bitcoin_ms_MY.ts index acfb38e418..0108332dd7 100644 --- a/src/qt/locale/bitcoin_ms_MY.ts +++ b/src/qt/locale/bitcoin_ms_MY.ts @@ -34,7 +34,10 @@ Alihkan fail data ke dalam tab semasa</translation> <source>&Delete</source> <translation>&Padam</translation> </message> -</context> + </context> +<context> + <name>AddressTableModel</name> + </context> <context> <name>AskPassphraseDialog</name> </context> @@ -61,7 +64,7 @@ Alihkan fail data ke dalam tab semasa</translation> <source>&Address</source> <translation>Alamat</translation> </message> -</context> + </context> <context> <name>FreespaceChecker</name> </context> @@ -72,6 +75,9 @@ Alihkan fail data ke dalam tab semasa</translation> <name>Intro</name> </context> <context> + <name>ModalOverlay</name> + </context> +<context> <name>OpenURIDialog</name> </context> <context> @@ -81,12 +87,21 @@ Alihkan fail data ke dalam tab semasa</translation> <name>OverviewPage</name> </context> <context> + <name>PaymentServer</name> + </context> +<context> <name>PeerTableModel</name> </context> <context> <name>QObject</name> </context> <context> + <name>QObject::QObject</name> + </context> +<context> + <name>QRImageWidget</name> + </context> +<context> <name>RPCConsole</name> </context> <context> @@ -100,6 +115,9 @@ Alihkan fail data ke dalam tab semasa</translation> </message> </context> <context> + <name>RecentRequestsTableModel</name> + </context> +<context> <name>SendCoinsDialog</name> <message> <source>Balance:</source> @@ -110,6 +128,9 @@ Alihkan fail data ke dalam tab semasa</translation> <name>SendCoinsEntry</name> </context> <context> + <name>SendConfirmationDialog</name> + </context> +<context> <name>ShutdownWindow</name> </context> <context> @@ -122,12 +143,35 @@ Alihkan fail data ke dalam tab semasa</translation> <name>TrafficGraphWidget</name> </context> <context> + <name>TransactionDesc</name> + </context> +<context> <name>TransactionDescDialog</name> </context> <context> + <name>TransactionTableModel</name> + </context> +<context> + <name>TransactionView</name> + </context> +<context> <name>UnitDisplayStatusBarControl</name> </context> <context> + <name>WalletFrame</name> + </context> +<context> + <name>WalletModel</name> + </context> +<context> + <name>WalletView</name> + <message> + <source>Export the data in the current tab to a file</source> + <translation> +Alihkan fail data ke dalam tab semasa</translation> + </message> + </context> +<context> <name>bitcoin-core</name> </context> </TS>
\ No newline at end of file diff --git a/src/qt/locale/bitcoin_nb.ts b/src/qt/locale/bitcoin_nb.ts index 4538fd6e1e..183cbac80a 100644 --- a/src/qt/locale/bitcoin_nb.ts +++ b/src/qt/locale/bitcoin_nb.ts @@ -41,7 +41,10 @@ <source>&Delete</source> <translation>&Slett</translation> </message> -</context> + </context> +<context> + <name>AddressTableModel</name> + </context> <context> <name>AskPassphraseDialog</name> <message> @@ -60,7 +63,7 @@ <source>Repeat new passphrase</source> <translation>Gjenta ny adgangsfrase</translation> </message> -</context> + </context> <context> <name>BanTableModel</name> <message> @@ -115,6 +118,10 @@ <translation> &Om %1</translation> </message> <message> + <source>Show information about %1</source> + <translation>Vis informasjon om %1</translation> + </message> + <message> <source>About &Qt</source> <translation>Om &Qt</translation> </message> @@ -127,6 +134,10 @@ <translation>&Innstillinger...</translation> </message> <message> + <source>Modify configuration options for %1</source> + <translation>Endre innstilinger for %1</translation> + </message> + <message> <source>&Encrypt Wallet...</source> <translation>&Krypter Lommebok...</translation> </message> @@ -254,34 +265,10 @@ <source>%n active connection(s) to Bitcoin network</source> <translation><numerusform>%n aktiv forbindelse til Bitcoin-nettverket</numerusform><numerusform>%n aktive forbindelser til Bitcoin-nettverket</numerusform></translation> </message> - <message> - <source>No block source available...</source> - <translation>Ingen kilde for blokker tilgjengelig...</translation> - </message> <message numerus="yes"> <source>Processed %n block(s) of transaction history.</source> <translation><numerusform>Lastet %n blokk med transaksjonshistorikk.</numerusform><numerusform>Lastet %n blokker med transaksjonshistorikk.</numerusform></translation> </message> - <message numerus="yes"> - <source>%n hour(s)</source> - <translation><numerusform>%n time</numerusform><numerusform>%n timer</numerusform></translation> - </message> - <message numerus="yes"> - <source>%n day(s)</source> - <translation><numerusform>%n dag</numerusform><numerusform>%n dager</numerusform></translation> - </message> - <message numerus="yes"> - <source>%n week(s)</source> - <translation><numerusform>%n uke</numerusform><numerusform>%n uker</numerusform></translation> - </message> - <message> - <source>%1 and %2</source> - <translation>%1 og %2</translation> - </message> - <message numerus="yes"> - <source>%n year(s)</source> - <translation><numerusform>%n år</numerusform><numerusform>%n år</numerusform></translation> - </message> <message> <source>%1 behind</source> <translation>%1 bak</translation> @@ -311,6 +298,10 @@ <translation>Oppdatert</translation> </message> <message> + <source>%1 client</source> + <translation>%1 klient</translation> + </message> + <message> <source>Catching up...</source> <translation>Laster ned...</translation> </message> @@ -360,7 +351,7 @@ <source>Wallet is <b>encrypted</b> and currently <b>locked</b></source> <translation>Lommeboken er <b>kryptert</b> og for tiden <b>låst</b></translation> </message> -</context> + </context> <context> <name>CoinControlDialog</name> <message> @@ -380,10 +371,6 @@ <translation>Beløp:</translation> </message> <message> - <source>Priority:</source> - <translation>Prioritet:</translation> - </message> - <message> <source>Fee:</source> <translation>Avgift:</translation> </message> @@ -435,11 +422,7 @@ <source>Confirmed</source> <translation>Bekreftet</translation> </message> - <message> - <source>Priority</source> - <translation>Prioritet</translation> - </message> -</context> + </context> <context> <name>EditAddressDialog</name> <message> @@ -462,7 +445,7 @@ <source>&Address</source> <translation>&Adresse</translation> </message> -</context> + </context> <context> <name>FreespaceChecker</name> <message> @@ -497,6 +480,10 @@ <translation> (%1-bit)</translation> </message> <message> + <source>About %1</source> + <translation>Om %1</translation> + </message> + <message> <source>Command-line options</source> <translation>Kommandolinjevalg</translation> </message> @@ -540,6 +527,10 @@ <translation>Velkommen</translation> </message> <message> + <source>Welcome to %1.</source> + <translation>Velkommen til %1.</translation> + </message> + <message> <source>Use the default data directory</source> <translation>Bruk standard datamappe</translation> </message> @@ -565,6 +556,21 @@ </message> </context> <context> + <name>ModalOverlay</name> + <message> + <source>Form</source> + <translation>Skjema</translation> + </message> + <message> + <source>Last block time</source> + <translation>Tidspunkt for siste blokk</translation> + </message> + <message> + <source>Hide</source> + <translation>Skjul</translation> + </message> + </context> +<context> <name>OpenURIDialog</name> <message> <source>Open URI</source> @@ -582,7 +588,7 @@ <source>Select payment request file</source> <translation>Velg fil for betalingsetterspørring</translation> </message> -</context> + </context> <context> <name>OptionsDialog</name> <message> @@ -730,6 +736,10 @@ <translation>&Vindu</translation> </message> <message> + <source>Hide tray icon</source> + <translation>Skjul søppel ikon</translation> + </message> + <message> <source>Show only a tray icon after minimizing the window.</source> <translation>Vis kun ikon i systemkurv etter minimering av vinduet.</translation> </message> @@ -874,6 +884,9 @@ </message> </context> <context> + <name>PaymentServer</name> + </context> +<context> <name>PeerTableModel</name> <message> <source>User Agent</source> @@ -883,11 +896,7 @@ <source>Node/Service</source> <translation>Node/Tjeneste</translation> </message> - <message> - <source>Ping Time</source> - <translation>Ping-tid</translation> - </message> -</context> + </context> <context> <name>QObject</name> <message> @@ -926,7 +935,17 @@ <source>%1 ms</source> <translation>%1 ms</translation> </message> -</context> + <message> + <source>%1 and %2</source> + <translation>%1 og %2</translation> + </message> + </context> +<context> + <name>QObject::QObject</name> + </context> +<context> + <name>QRImageWidget</name> + </context> <context> <name>RPCConsole</name> <message> @@ -1038,6 +1057,14 @@ <translation>Brukeragent</translation> </message> <message> + <source>Decrease font size</source> + <translation>Forminsk font størrelsen</translation> + </message> + <message> + <source>Increase font size</source> + <translation>Forstørr font størrelse</translation> + </message> + <message> <source>Services</source> <translation>Tjenester</translation> </message> @@ -1114,14 +1141,6 @@ <translation>Tøm konsoll</translation> </message> <message> - <source>&Disconnect Node</source> - <translation>&Koble fra node</translation> - </message> - <message> - <source>Ban Node for</source> - <translation>Steng node ute for</translation> - </message> - <message> <source>1 &hour</source> <translation>1 &time</translation> </message> @@ -1138,10 +1157,6 @@ <translation>1 &år</translation> </message> <message> - <source>&Unban Node</source> - <translation>Fjern &Utestengning av Node</translation> - </message> - <message> <source>Use up and down arrows to navigate history, and <b>Ctrl-L</b> to clear screen.</source> <translation>Bruk opp og ned pil for å navigere historikken, og <b>Ctrl-L</b> for å tømme skjermen.</translation> </message> @@ -1268,7 +1283,7 @@ <source>Remove</source> <translation>Fjern</translation> </message> -</context> + </context> <context> <name>ReceiveRequestDialog</name> <message> @@ -1287,7 +1302,10 @@ <source>&Save Image...</source> <translation>&Lagre Bilde...</translation> </message> -</context> + </context> +<context> + <name>RecentRequestsTableModel</name> + </context> <context> <name>SendCoinsDialog</name> <message> @@ -1323,10 +1341,6 @@ <translation>Beløp:</translation> </message> <message> - <source>Priority:</source> - <translation>Prioritet:</translation> - </message> - <message> <source>Fee:</source> <translation>Gebyr:</translation> </message> @@ -1395,10 +1409,6 @@ <translation>(Smartgebyr ikke innført ennå. Dette tar vanligvis noen blokker...)</translation> </message> <message> - <source>Confirmation time:</source> - <translation>Bekreftelsestid:</translation> - </message> - <message> <source>normal</source> <translation>normal</translation> </message> @@ -1438,7 +1448,7 @@ <source>S&end</source> <translation>S&end</translation> </message> -</context> + </context> <context> <name>SendCoinsEntry</name> <message> @@ -1517,7 +1527,10 @@ <source>Memo:</source> <translation>Memo:</translation> </message> -</context> + </context> +<context> + <name>SendConfirmationDialog</name> + </context> <context> <name>ShutdownWindow</name> <message> @@ -1611,7 +1624,7 @@ <source>Reset all verify message fields</source> <translation>Tilbakestill alle felter for meldingsverifikasjon</translation> </message> -</context> + </context> <context> <name>SplashScreen</name> <message> @@ -1627,12 +1640,21 @@ </message> </context> <context> + <name>TransactionDesc</name> + </context> +<context> <name>TransactionDescDialog</name> <message> <source>This pane shows a detailed description of the transaction</source> <translation>Her vises en detaljert beskrivelse av transaksjonen</translation> </message> -</context> + </context> +<context> + <name>TransactionTableModel</name> + </context> +<context> + <name>TransactionView</name> + </context> <context> <name>UnitDisplayStatusBarControl</name> <message> @@ -1641,6 +1663,15 @@ </message> </context> <context> + <name>WalletFrame</name> + </context> +<context> + <name>WalletModel</name> + </context> +<context> + <name>WalletView</name> + </context> +<context> <name>bitcoin-core</name> <message> <source>Options:</source> @@ -1675,10 +1706,6 @@ <translation>Beskjæring: siste lommeboksynkronisering går utenfor beskjærte data. Du må bruke -reindex (laster ned hele blokkjeden igjen for beskjærte noder)</translation> </message> <message> - <source>Reduce storage requirements by pruning (deleting) old blocks. This mode is incompatible with -txindex and -rescan. Warning: Reverting this setting requires re-downloading the entire blockchain. (default: 0 = disable pruning blocks, >%u = target size in MiB to use for block files)</source> - <translation>Reduser lagringsbehovet ved beskjæring (sletting) av gamle blokker. Denne modusen er ikke kompatibel med -txindex og -rescan. Advarsel: Tilbakestilling av denne innstillingen krever at hele blokkjeden må lastes ned på nytt. (Standardverdi: 0 = deaktiver beskjæring av blokker, >%u = mål for størrelse i MiB å bruke for blokkfiler)</translation> - </message> - <message> <source>Rescans are not possible in pruned mode. You will need to use -reindex which will download the whole blockchain again.</source> <translation>Omsøk er ikke mulig i beskjært modus. Du vil måtte bruke -reindex som vil laste nede hele blokkjeden på nytt.</translation> </message> @@ -1703,10 +1730,6 @@ <translation>Kunne ikke starte HTTP server. Se debug logg for detaljer.</translation> </message> <message> - <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> - <translation>Ta imot tilkoblinger fra utsiden (standardverdi: 1 hvis uten -proxy eller -connect)</translation> - </message> - <message> <source>Bitcoin Core</source> <translation>Bitcoin Core</translation> </message> @@ -1719,10 +1742,6 @@ <translation>Slett alle transaksjoner i lommeboken og gjenopprett kun de delene av blokkjeden gjennom -rescan ved oppstart</translation> </message> <message> - <source>Distributed under the MIT software license, see the accompanying file COPYING or <http://www.opensource.org/licenses/mit-license.php>.</source> - <translation>Distribuert under MIT programvarelisensen, se medfølgende fil COPYING eller <http://www.opensource.org/licenses/mit-license.php>.</translation> - </message> - <message> <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source> <translation>Kjør kommando når en lommeboktransaksjon endres (%s i kommando er erstattet med TxID)</translation> </message> @@ -1735,26 +1754,10 @@ <translation>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.</translation> </message> <message> - <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source> - <translation>Dette er en forhåndssluppet testversjon - bruk på egen risiko - ikke for bruk til blokkutvinning eller bedriftsapplikasjoner</translation> - </message> - <message> <source>Use UPnP to map the listening port (default: 1 when listening and no -proxy)</source> <translation>Bruk UPnP for lytteport (standardverdi: 1 ved lytting og uten -proxy)</translation> </message> <message> - <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source> - <translation>Advarsel: Nettverket ser ikke ut til å være enig! Noen minere ser ut til å ha problemer.</translation> - </message> - <message> - <source>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</source> - <translation>Advarsel: Vi ser ikke ut til å være enige med våre noder! Du må oppgradere, eller andre noder må oppgradere.</translation> - </message> - <message> - <source>Whitelist peers connecting from the given netmask or IP address. Can be specified multiple times.</source> - <translation>Hvitelist noder som kobler til fra den oppgitte nettmasken eller IP-adressen. Kan oppgis flere ganger.</translation> - </message> - <message> <source>-maxmempool must be at least %d MB</source> <translation>-maxmempool må være minst %d MB</translation> </message> @@ -1767,10 +1770,6 @@ <translation>Valg for opprettelse av blokker:</translation> </message> <message> - <source>Connect only to the specified node(s)</source> - <translation>Koble kun til angitt(e) node(r)</translation> - </message> - <message> <source>Connection options:</source> <translation>Innstillinger for tilkobling:</translation> </message> @@ -1815,6 +1814,10 @@ <translation>Feil under oppstart av lommeboken sitt databasemiljø %s!</translation> </message> <message> + <source>Error loading %s</source> + <translation>Feil ved lasting av %s</translation> + </message> + <message> <source>Error loading block database</source> <translation>Feil ved lasting av blokkdatabase</translation> </message> @@ -1855,6 +1858,14 @@ <translation>Bare koble til noder i nettverket <net> (IPv4, IPv6 eller onion)</translation> </message> <message> + <source>Print this help message and exit</source> + <translation>Skriv ut denne hjelpemeldingen og avslutt</translation> + </message> + <message> + <source>Print version and exit</source> + <translation>Skriv ut denne versjonen og avslutt</translation> + </message> + <message> <source>Prune cannot be configured with a negative value.</source> <translation>Beskjæringsmodus kan ikke konfigureres med en negativ verdi.</translation> </message> @@ -1875,6 +1886,10 @@ <translation>Angi lommebokfil (inne i datamappe)</translation> </message> <message> + <source>The source code is available from %s.</source> + <translation>Kildekoden er tilgjengelig fra %s.</translation> + </message> + <message> <source>Unsupported argument -benchmark ignored, use -debug=bench.</source> <translation>Ustøttet argument -benchmark ble ignorert, bruk -debug=bench.</translation> </message> @@ -1955,10 +1970,6 @@ <translation>Maksimal størrelse på data i databærende transaksjoner vi videresender og ufører graving på (standardverdi: %u)</translation> </message> <message> - <source>Query for peer addresses via DNS lookup, if low on addresses (default: 1 unless -connect)</source> - <translation>Søk etter nodeadresser via DNS-oppslag, hvis vi har få adresser å koble til (standard: 1 med mindre -connect)</translation> - </message> - <message> <source>Randomize credentials for every proxy connection. This enables Tor stream isolation (default: %u)</source> <translation>Bruk tilfeldig identitet for hver proxytilkobling. Dette muliggjør TOR stream isolasjon (standardverdi: %u)</translation> </message> @@ -1971,10 +1982,6 @@ <translation>Transaksjonsbeløpet er for lite til å sendes etter at gebyret er fratrukket</translation> </message> <message> - <source>This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit <https://www.openssl.org/> and cryptographic software written by Eric Young and UPnP software written by Thomas Bernard.</source> - <translation>Dette produktet inneholder programvare utviklet av OpenSSL Project for bruk i OpenSSL Toolkit <https://www.openssl.org/> og kryptografisk programvare skrevet av Eric Young og UPnP-programvare skrevet av Thomas Bernard.</translation> - </message> - <message> <source>Whitelisted peers cannot be DoS banned and their transactions are always relayed, even if they are already in the mempool, useful e.g. for a gateway</source> <translation>Hvitlistede noder kan ikke DoS-blokkeres, og deres transaksjoner videresendes alltid, selv om de allerede er i minnelageret. Nyttig f.eks. for en gateway.</translation> </message> @@ -2083,10 +2090,6 @@ <translation>Transaksjonen er for liten</translation> </message> <message> - <source>Transaction amounts must be positive</source> - <translation>Transaksjonsbeløpet må være positivt</translation> - </message> - <message> <source>Transaction too large for fee policy</source> <translation>Transaksjon for stor for gebyrpolitikken</translation> </message> @@ -2147,10 +2150,6 @@ <translation>-maxtxfee er satt veldig høyt! Så stort gebyr kan bli betalt ved en enkelt transaksjon.</translation> </message> <message> - <source>-paytxfee is set very high! This is the transaction fee you will pay if you send a transaction.</source> - <translation>-paytxfee er satt veldig høyt! Dette er transaksjonsgebyret du betaler når du sender transaksjoner.</translation> - </message> - <message> <source>Do not keep transactions in the mempool longer than <n> hours (default: %u)</source> <translation>Ikke hold transaksjoner i minnet lenger enn <n> timer (standard: %u)</translation> </message> @@ -2195,10 +2194,6 @@ <translation>Bruk separate SOCKS5 proxyer for å nå noder via Tor skjulte tjenester (standardverdi: %s)</translation> </message> <message> - <source>Username and hashed password for JSON-RPC connections. The field <userpw> comes in the format: <USERNAME>:<SALT>$<HASH>. A canonical python script is included in share/rpcuser. This option can be specified multiple times</source> - <translation>Brukernavn og hashet passord for JSON-RPC tilkoblinger. Feltet <userpw> kommer i formatet: <USERNAME>:<SALT>$<HASH>. Et Python-skript er inkludert i share/rpcuser. Dette alternativet kan angis flere ganger</translation> - </message> - <message> <source>(default: %s)</source> <translation>(standardverdi: %s)</translation> </message> @@ -2259,10 +2254,6 @@ <translation>Angi størrelse på nøkkel-lager til <n> (standardverdi: %u)</translation> </message> <message> - <source>Set minimum block size in bytes (default: %u)</source> - <translation>Sett minimum blokkstørrelse i bytes (standardverdi: %u)</translation> - </message> - <message> <source>Set the number of threads to service RPC calls (default: %d)</source> <translation>Sett antall tråder til betjening av RPC-kall (standardverdi: %d)</translation> </message> diff --git a/src/qt/locale/bitcoin_ne.ts b/src/qt/locale/bitcoin_ne.ts new file mode 100644 index 0000000000..f7fb0e5a6e --- /dev/null +++ b/src/qt/locale/bitcoin_ne.ts @@ -0,0 +1,555 @@ +<TS language="ne" version="2.1"> +<context> + <name>AddressBookPage</name> + <message> + <source>Right-click to edit address or label</source> + <translation>ठेगाना वा लेबल सम्पादन गर्न दायाँ-क्लिक गर्नुहोस्</translation> + </message> + <message> + <source>Create a new address</source> + <translation>नयाँ ठेगाना सिर्जना गर्नुहोस्</translation> + </message> + <message> + <source>&New</source> + <translation>&amp;नयाँ</translation> + </message> + <message> + <source>Copy the currently selected address to the system clipboard</source> + <translation>भर्खरै चयन गरेको ठेगाना प्रणाली क्लिपबोर्डमा कपी गर्नुहोस्</translation> + </message> + <message> + <source>&Copy</source> + <translation>&amp;कपी गर्नुहोस्</translation> + </message> + <message> + <source>C&lose</source> + <translation>बन्द गर्नुहोस्</translation> + </message> + <message> + <source>Delete the currently selected address from the list</source> + <translation>भर्खरै चयन गरेको ठेगाना सूचीबाट मेटाउनुहोस्</translation> + </message> + <message> + <source>Export the data in the current tab to a file</source> + <translation>वर्तमान ट्याबको डाटालाई फाइलमा निर्यात गर्नुहोस् </translation> + </message> + <message> + <source>&Export</source> + <translation>&amp;निर्यात गर्नुहोस्</translation> + </message> + <message> + <source>&Delete</source> + <translation>&amp;मेटाउनुहोस्</translation> + </message> + </context> +<context> + <name>AddressTableModel</name> + </context> +<context> + <name>AskPassphraseDialog</name> + <message> + <source>Passphrase Dialog</source> + <translation>पासफ्रेज संवाद</translation> + </message> + <message> + <source>Enter passphrase</source> + <translation>पासफ्रेज प्रवेश गर्नुहोस्</translation> + </message> + <message> + <source>New passphrase</source> + <translation>नयाँ पासफ्रेज</translation> + </message> + <message> + <source>Repeat new passphrase</source> + <translation>नयाँ पासफ्रेज दोहोर्याउनुहोस्</translation> + </message> + </context> +<context> + <name>BanTableModel</name> + <message> + <source>IP/Netmask</source> + <translation>IP/नेटमास्क</translation> + </message> + <message> + <source>Banned Until</source> + <translation>प्रतिबन्धित समय</translation> + </message> +</context> +<context> + <name>BitcoinGUI</name> + <message> + <source>Sign &message...</source> + <translation>सन्देशमा &amp;हस्ताक्षर गर्नुहोस्...</translation> + </message> + <message> + <source>Synchronizing with network...</source> + <translation>नेटवर्कमा समिकरण हुँदै...</translation> + </message> + <message> + <source>&Overview</source> + <translation>शारांश</translation> + </message> + <message> + <source>Node</source> + <translation>नोड</translation> + </message> + <message> + <source>Show general overview of wallet</source> + <translation>वालेटको साधारण शारांश देखाउनुहोस्</translation> + </message> + <message> + <source>&Transactions</source> + <translation>&amp;कारोबार</translation> + </message> + <message> + <source>Browse transaction history</source> + <translation>कारोबारको इतिहास हेर्नुहोस्</translation> + </message> + <message> + <source>E&xit</source> + <translation>बाहिर निस्कनुहोस्</translation> + </message> + <message> + <source>Quit application</source> + <translation>एप्लिकेसन बन्द गर्नुहोस्</translation> + </message> + <message> + <source>&About %1</source> + <translation>&amp;बारेमा %1</translation> + </message> + <message> + <source>Show information about %1</source> + <translation>%1 को बारेमा सूचना देखाउनुहोस्</translation> + </message> + <message> + <source>About &Qt</source> + <translation>&amp;Qt</translation> + </message> + <message> + <source>Show information about Qt</source> + <translation>Qt को बारेमा सूचना देखाउनुहोस्</translation> + </message> + <message> + <source>&Options...</source> + <translation>&amp;विकल्प...</translation> + </message> + <message> + <source>Modify configuration options for %1</source> + <translation>%1 का लागि कन्फिगुरेसनको विकल्प परिमार्जन गर्नुहोस</translation> + </message> + <message> + <source>&Encrypt Wallet...</source> + <translation>&amp;वालेटलाई इन्क्रिप्ट गर्नुहोस्...</translation> + </message> + <message> + <source>&Backup Wallet...</source> + <translation>&amp;वालेटलाई ब्याकअप गर्नुहोस्...</translation> + </message> + <message> + <source>&Change Passphrase...</source> + <translation>&amp;पासफ्रेज परिवर्तन गर्नुहोस्...</translation> + </message> + <message> + <source>&Sending addresses...</source> + <translation>&amp;पठाउने ठेगानाहरू...</translation> + </message> + <message> + <source>&Receiving addresses...</source> + <translation>&amp;प्राप्त गर्ने ठेगानाहरू...</translation> + </message> + <message> + <source>Open &URI...</source> + <translation>URI &amp;खोल्नुहोस्...</translation> + </message> + <message> + <source>Reindexing blocks on disk...</source> + <translation>डिस्कमा ब्लकलाई पुनः सूचीकरण गरिँदै...</translation> + </message> + <message> + <source>Send coins to a Bitcoin address</source> + <translation>बिटकोइन ठेगानामा सिक्का पठाउनुहोस्</translation> + </message> + <message> + <source>Backup wallet to another location</source> + <translation>वालेटलाई अर्को ठेगानामा ब्याकअप गर्नुहोस्</translation> + </message> + <message> + <source>Change the passphrase used for wallet encryption</source> + <translation>वालेट इन्क्रिप्सनमा प्रयोग हुने इन्क्रिप्सन पासफ्रेज परिवर्तन गर्नुहोस्</translation> + </message> + <message> + <source>&Debug window</source> + <translation>&amp;डिबग विन्डो</translation> + </message> + <message> + <source>Open debugging and diagnostic console</source> + <translation>डिबगिङ र डायाग्नोस्टिक कन्सोल खोल्नुहोस्</translation> + </message> + </context> +<context> + <name>CoinControlDialog</name> + <message> + <source>Amount</source> + <translation>रकम</translation> + </message> + </context> +<context> + <name>EditAddressDialog</name> + </context> +<context> + <name>FreespaceChecker</name> + </context> +<context> + <name>HelpMessageDialog</name> + </context> +<context> + <name>Intro</name> + </context> +<context> + <name>ModalOverlay</name> + </context> +<context> + <name>OpenURIDialog</name> + </context> +<context> + <name>OptionsDialog</name> + </context> +<context> + <name>OverviewPage</name> + <message> + <source>The displayed information may be out of date. Your wallet automatically synchronizes with the Bitcoin network after a connection is established, but this process has not completed yet.</source> + <translation>देखाइएको सूचना पूरानो हुन सक्छ । कनेक्सन स्थापित भएपछि, तपाईंको वालेट बिटकोइन नेटवर्कमा स्वचालित रूपमा समिकरण हुन्छ , तर यो प्रक्रिया अहिले सम्म पूरा भएको छैन ।</translation> + </message> + <message> + <source>Watch-only:</source> + <translation>हेर्ने-मात्र:</translation> + </message> + <message> + <source>Available:</source> + <translation>उपलब्ध:</translation> + </message> + <message> + <source>Your current spendable balance</source> + <translation>तपाईंको खर्च गर्न मिल्ने ब्यालेन्स</translation> + </message> + <message> + <source>Pending:</source> + <translation>विचाराधिन:</translation> + </message> + <message> + <source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source> + <translation>अझै पुष्टि हुन बाँकी र खर्च गर्न मिल्ने ब्यालेन्समा गणना गर्न नमिल्ने जम्मा कारोबार</translation> + </message> + <message> + <source>Immature:</source> + <translation>अपरिपक्व:</translation> + </message> + <message> + <source>Mined balance that has not yet matured</source> + <translation>अझै परिपक्व नभएको खनन गरिएको ब्यालेन्स</translation> + </message> + <message> + <source>Balances</source> + <translation>ब्यालेन्स</translation> + </message> + <message> + <source>Mined balance in watch-only addresses that has not yet matured</source> + <translation>अहिलेसम्म परिपक्व नभएको खनन गरिएको, हेर्ने-मात्र ठेगानामा रहेको ब्यालेन्स</translation> + </message> + <message> + <source>Current total balance in watch-only addresses</source> + <translation>हेर्ने-मात्र ठेगानामा रहेको हालको जम्मा ब्यालेन्स</translation> + </message> +</context> +<context> + <name>PaymentServer</name> + </context> +<context> + <name>PeerTableModel</name> + <message> + <source>User Agent</source> + <translation>प्रयोगकर्ता एजेन्ट</translation> + </message> + <message> + <source>Node/Service</source> + <translation>नोड/सेव</translation> + </message> + </context> +<context> + <name>QObject</name> + <message> + <source>Amount</source> + <translation>रकम</translation> + </message> + </context> +<context> + <name>QObject::QObject</name> + </context> +<context> + <name>QRImageWidget</name> + </context> +<context> + <name>RPCConsole</name> + <message> + <source>User Agent</source> + <translation>प्रयोगकर्ता एजेन्ट</translation> + </message> + <message> + <source>Ping Time</source> + <translation>पिङ समय</translation> + </message> + </context> +<context> + <name>ReceiveCoinsDialog</name> + </context> +<context> + <name>ReceiveRequestDialog</name> + </context> +<context> + <name>RecentRequestsTableModel</name> + </context> +<context> + <name>SendCoinsDialog</name> + </context> +<context> + <name>SendCoinsEntry</name> + <message> + <source>The fee will be deducted from the amount being sent. The recipient will receive less bitcoins than you enter in the amount field. If multiple recipients are selected, the fee is split equally.</source> + <translation>पठाइँदै गरेको रकमबाट शुल्क कटौती गरिनेछ । प्राप्तकर्ताले तपाईंले रकम क्षेत्रमा प्रवेष गरेको भन्दा थोरै बिटकोइन प्राप्त गर्ने छन् । धेरै प्राप्तकर्ता चयन गरिएको छ भने समान रूपमा शुल्क विभाजित गरिनेछ ।</translation> + </message> + <message> + <source>A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source> + <translation>बिटकोइनमा संलग्न गरिएको सन्देश: तपाईंको मध्यस्थको लागि कारोबारको साथमा भण्डारण गरिने URI । नोट: यो सन्देश बिटकोइन नेटवर्क मार्फत पठाइने छैन ।</translation> + </message> + </context> +<context> + <name>SendConfirmationDialog</name> + </context> +<context> + <name>ShutdownWindow</name> + </context> +<context> + <name>SignVerifyMessageDialog</name> + <message> + <source>You can sign messages/agreements with your addresses to prove you can receive bitcoins 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.</source> + <translation>आफ्नो ठेगानामा पठाइएको बिटकोइन प्राप्त गर्न सकिन्छ भनेर प्रमाणित गर्न तपाईंले ती ठेगानाले सन्देश/सम्झौताहरूमा हस्ताक्षर गर्न सक्नुहुन्छ । फिसिङ आक्रमणले तपाईंलाई छक्याएर अरूका लागि तपाईंको परिचयमा हस्ताक्षर गराउने प्रयास गर्न सक्ने भएकाले अस्पष्ट वा जथाभावीमा हस्ताक्षर गर्दा ध्यान दिनुहोस् । आफू सहमत भएको पूर्ण विस्तृत-कथनमा मात्र हस्ताक्षर गर्नुहोस् ।</translation> + </message> + </context> +<context> + <name>SplashScreen</name> + </context> +<context> + <name>TrafficGraphWidget</name> + </context> +<context> + <name>TransactionDesc</name> + </context> +<context> + <name>TransactionDescDialog</name> + </context> +<context> + <name>TransactionTableModel</name> + </context> +<context> + <name>TransactionView</name> + </context> +<context> + <name>UnitDisplayStatusBarControl</name> + </context> +<context> + <name>WalletFrame</name> + </context> +<context> + <name>WalletModel</name> + </context> +<context> + <name>WalletView</name> + </context> +<context> + <name>bitcoin-core</name> + <message> + <source>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</source> + <translation>ब्लक डाटाबेसमा भविष्यबाट आए जस्तो देखिने एउटा ब्लक हुन्छ । तपाईंको कम्प्युटरको मिति र समय गलत तरिकाले सेट गरिएकाले यस्तो हुन सक्छ । तपाईं आफ्नो कम्प्युटरको मिति र समय सही छ भनेर पक्का हुनुहुन्छ भने मात्र ब्लक डाटाबेस पुनर्निर्माण गर्नुहोस् ।</translation> + </message> + <message> + <source>Unable to rewind the database to a pre-fork state. You will need to redownload the blockchain</source> + <translation>प्रि-फर्क अवस्थामा डाटाबेस रिवाइन्ड गर्न सकिएन । तपाईंले फेरि ब्लकचेन डाउनलोड गर्नु पर्ने हुन्छ</translation> + </message> + <message> + <source>Use UPnP to map the listening port (default: 1 when listening and no -proxy)</source> + <translation>UPnP प्रयोग गरेर सुन्ने पोर्टलाई म्याप गर्नुहोस् (सुन्दा र -प्रोक्सी नहुँदा डिफल्ट: 1)</translation> + </message> + <message> + <source>You need to rebuild the database using -reindex-chainstate to change -txindex</source> + <translation>तपाईंले -चेनस्टेट-पुनः सूचकांकबाट -txindex परिवर्तन प्रयोग गरेर डाटाबेस पुनर्निर्माण गर्नु आवश्यक छ</translation> + </message> + <message> + <source>%s corrupt, salvage failed</source> + <translation>%s मा क्षति, बचाव विफल भयो</translation> + </message> + <message> + <source>-maxmempool must be at least %d MB</source> + <translation>-maxmempool कम्तिमा %d MB को हुनुपर्छ ।</translation> + </message> + <message> + <source><category> can be:</source> + <translation>&lt;वर्ग&gt; निम्न आकारको हुनसक्छ:</translation> + </message> + <message> + <source>Append comment to the user agent string</source> + <translation>प्रयोगकर्ता एजेन्ट स्ट्रिङमा टिप्पणी जोड्नुहोस्</translation> + </message> + <message> + <source>Attempt to recover private keys from a corrupt wallet on startup</source> + <translation>स्टार्टअपमा क्षति पूगेको वालेटबाट निजी की प्राप्त गर्न प्रयास गर्नुहोस्</translation> + </message> + <message> + <source>Block creation options:</source> + <translation>ब्लक सिर्जनाको बिकल्प:</translation> + </message> + <message> + <source>Cannot resolve -%s address: '%s'</source> + <translation>-%s ठेगाना: &apos;%s&apos; निश्चय गर्न सकिँदैन</translation> + </message> + <message> + <source>Change index out of range</source> + <translation>सूचकांक परिवर्तन सीमा भन्दा बाहर</translation> + </message> + <message> + <source>Connection options:</source> + <translation>कनेक्सनको विकल्प:</translation> + </message> + <message> + <source>Copyright (C) %i-%i</source> + <translation>सर्वाधिकार (C) %i-%i</translation> + </message> + <message> + <source>Corrupted block database detected</source> + <translation>क्षति पुगेको ब्लक डाटाबेस फेला पर</translation> + </message> + <message> + <source>Debugging/Testing options:</source> + <translation>डिबगिङ/परीक्षणका विकल्पहरू:</translation> + </message> + <message> + <source>Do not load the wallet and disable wallet RPC calls</source> + <translation>वालेट लोड नगर्नुहोस् र वालेट RPC कलहरू अक्षम गर्नुहोस्</translation> + </message> + <message> + <source>Do you want to rebuild the block database now?</source> + <translation>तपाईं अहिले ब्लक डेटाबेस पुनर्निर्माण गर्न चाहनुहुन्छ ?</translation> + </message> + <message> + <source>Unable to bind to %s on this computer. %s is probably already running.</source> + <translation>यो कम्प्युटरको %s मा बाँध्न सकिएन । %s सम्भवित रूपमा पहिलैबाट चलिरहेको छ ।</translation> + </message> + <message> + <source>Unsupported argument -benchmark ignored, use -debug=bench.</source> + <translation>असमर्थित तर्क -बेन्चमार्कलाई बेवास्ता गरियो, -डिबग=बेन्च प्रयोग गर्नुहोस् ।</translation> + </message> + <message> + <source>Unsupported argument -debugnet ignored, use -debug=net.</source> + <translation>असमर्थित तर्क -डिबगनेटलाई बेवास्ता गरियो, -डिबग=नेट प्रयोग गर्नुहोस् । </translation> + </message> + <message> + <source>Unsupported argument -tor found, use -onion.</source> + <translation>असमर्थित तर्क -टोर फेला पर्यो, -ओनियन प्रयोग गर्नुहोस् । </translation> + </message> + <message> + <source>Use UPnP to map the listening port (default: %u)</source> + <translation>UPnP प्रयोग गरेर सुन्ने पोर्ट म्याप गर्नुहोस् (डिफल्ट: %u) </translation> + </message> + <message> + <source>Verifying blocks...</source> + <translation>ब्लक प्रमाणित गरिँदै...</translation> + </message> + <message> + <source>Verifying wallet...</source> + <translation>वालेट प्रमाणित गरिँदै...</translation> + </message> + <message> + <source>Wallet %s resides outside data directory %s</source> + <translation>वालेट %s डाटा निर्देशिका %s बाहिरमा बस्छ</translation> + </message> + <message> + <source>Wallet debugging/testing options:</source> + <translation>वालेट डिबगिङ/परीक्षणका विकल्पहरू:</translation> + </message> + <message> + <source>Wallet needed to be rewritten: restart %s to complete</source> + <translation>वालेट फेरि लेख्नु आवश्यक छ: पूरा गर्न %s लाई पुन: सुरु गर्नुहोस्</translation> + </message> + <message> + <source>Wallet options:</source> + <translation>वालेटका विकल्पहरू:</translation> + </message> + <message> + <source>Allow JSON-RPC connections from specified source. Valid for <ip> are a single IP (e.g. 1.2.3.4), a network/netmask (e.g. 1.2.3.4/255.255.255.0) or a network/CIDR (e.g. 1.2.3.4/24). This option can be specified multiple times</source> + <translation>निर्दिष्ट गरिएको स्रोतबाट आएको JSON-RPC कनेक्सनलाई अनुमति दिनुहोस् । एकल IP (e.g. 1.2.3.4), नेटवर्क/नेटमास्क (उदाहरण 1.2.3.4/255.255.255.0) वा नेटवर्क/CIDR (उदाहरण 1.2.3.4/24) &lt;ip&gt; का लागि मान्य छन् । यो विकल्पलाई धेरै पटक निर्दिष्ट गर्न सकिन्छ</translation> + </message> + <message> + <source>Bind to given address and whitelist peers connecting to it. Use [host]:port notation for IPv6</source> + <translation>दिइएको ठेगानामा बाँध्नुहोस् र यसमा कनेक्ट गर्ने सहकर्मीलाई श्वेतसूचीमा राख्नुहोस् । IPv6 लागि [होस्ट]:पोर्ट संकेतन प्रयोग गर्नुहोस्</translation> + </message> + <message> + <source>Bind to given address to listen for JSON-RPC connections. Use [host]:port notation for IPv6. This option can be specified multiple times (default: bind to all interfaces)</source> + <translation>JSON-RPC कनेक्सन सुन्नको लागि दिइएको ठेगानामा बाँध्नुहोस् । IPv6 लागि [होस्ट]:पोर्ट संकेतन प्रयोग गर्नुहोस् । यो विकल्पलाई धेरै पटक निर्दिष्ट गर्न सकिन्छ (डिफल्ट: सबै इन्टरफेसमा बाँध्नुहोस्)</translation> + </message> + <message> + <source>Create new files with system default permissions, instead of umask 077 (only effective with disabled wallet functionality)</source> + <translation>umask 077 को सट्टामा प्रणालीको डिफल्ट अनुमतिको साथमा नयाँ फाइलहरू सिर्जना गर्नुहोस् । (असक्षम गरिएको वालेट कार्यक्षमतामा मात्र प्रभावकारी हुने)</translation> + </message> + <message> + <source>Discover own IP addresses (default: 1 when listening and no -externalip or -proxy)</source> + <translation>आफ्नै IP ठेगाना पत्ता लगाउनुहोस् (सुन्दा र -बाहिरीआइपी वा -प्रोक्सी नहुँदा डिफल्ट: 1 )</translation> + </message> + <message> + <source>Error: Listening for incoming connections failed (listen returned error %s)</source> + <translation>त्रुटि: आगमन कनेक्सनमा सुन्ने कार्य असफल भयो (सुन्ने कार्यले त्रुटि %s फर्कायो)</translation> + </message> + <message> + <source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source> + <translation>सान्दर्भिक चेतावनी प्राप्त गर्दा आदेश कार्यान्वयन गर्नुहोस् नभए धेरै लामो फोर्क देखा पर्न सक्छ । (cmd को %s लाई सन्देशले प्रतिस्थापन गर्छ)</translation> + </message> + <message> + <source>Fees (in %s/kB) smaller than this are considered zero fee for relaying, mining and transaction creation (default: %s)</source> + <translation>रिले, खनन वा कारोबारको सिर्जनाको लागि यो भन्दा कम शुल्क (%s/kB मा) लाई शून्य शुल्कको रूपमा लिइन्छ । (डिफल्ट: %s)</translation> + </message> + <message> + <source>If paytxfee is not set, include enough fee so transactions begin confirmation on average within n blocks (default: %u)</source> + <translation>paytxfee सेट गरिएको छैन भने, औसतमा n ब्लक भित्र कारोबार पुष्टिकरण सुरु होस् भन्नका लागि पर्याप्त शुल्क समावेश गर्नुहोस् (डिफल्ट: %u)</translation> + </message> + <message> + <source>Invalid amount for -maxtxfee=<amount>: '%s' (must be at least the minrelay fee of %s to prevent stuck transactions)</source> + <translation>maxtxfee=&lt;रकम&gt;: का लागि अमान्य रकम &apos;%s&apos; (कारोबारलाई अड्कन नदिन अनिवार्य रूपमा कम्तिमा %s को न्यूनतम रिले शुल्क हुनु पर्छ)</translation> + </message> + <message> + <source>Maximum size of data in data carrier transactions we relay and mine (default: %u)</source> + <translation>हामीले रिले र खनन गर्ने डाटा वाहक कारोबारको डाटाको अधिकतम आकार (डिफल्ट: %u)</translation> + </message> + <message> + <source>Randomize credentials for every proxy connection. This enables Tor stream isolation (default: %u)</source> + <translation>हरेक प्रोक्सी कनेक्सनका लागि क्रेडिन्सियल अनियमित बनाउनुहोस् । यसले टोर स्ट्रिमको अलगावलाई सक्षम पार्छ (डिफल्ट: %u)</translation> + </message> + <message> + <source>Set maximum size of high-priority/low-fee transactions in bytes (default: %d)</source> + <translation>बाइटमा उच्च-प्राथमिकता/कम शुल्कको कारोबारको अधिकतम आकार सेट गर्नुहोस् (डिफल्ट: %d)</translation> + </message> + <message> + <source>The transaction amount is too small to send after the fee has been deducted</source> + <translation>कारोबार रकम शुल्क कटौती गरेपछि पठाउँदा धेरै नै सानो हुन्छ</translation> + </message> + <message> + <source>Use hierarchical deterministic key generation (HD) after BIP32. Only has effect during wallet creation/first start</source> + <translation>BIP32 पछि पदानुक्रमित निर्धारक की सिर्जना (HD) प्रयोग गर्नुहोस् ।. केवल वालेट सिर्जना/पहिलो सुरुवातको समयमा प्रभाव पार्छ</translation> + </message> + <message> + <source>Whitelisted peers cannot be DoS banned and their transactions are always relayed, even if they are already in the mempool, useful e.g. for a gateway</source> + <translation>श्वेतसूचीका सहकर्मी पहिलैबाट मेमपूल, उपयोगीमा भए पनि उनीहरूलाई DoS banned गर्न सकिँदैन र उनीहरूको कारोबार सधैं रिले हुन्छ, उदाहरण, गेटवेको लाग</translation> + </message> + <message> + <source>You need to rebuild the database using -reindex to go back to unpruned mode. This will redownload the entire blockchain</source> + <translation>तपाईंले काटछाँट नगरेको मोडमा जान पुनः सूचकांक प्रयोग गरेर डाटाबेस पुनर्निर्माण गर्नु पर्ने हुन्छ । यसले सम्पूर्ण ब्लकचेनलाई फेरि डाउनलोड गर्नेछ</translation> + </message> + </context> +</TS>
\ No newline at end of file diff --git a/src/qt/locale/bitcoin_nl.ts b/src/qt/locale/bitcoin_nl.ts index 781c5a8fd6..2b625b5a07 100644 --- a/src/qt/locale/bitcoin_nl.ts +++ b/src/qt/locale/bitcoin_nl.ts @@ -41,6 +41,77 @@ <source>&Delete</source> <translation>&Verwijder</translation> </message> + <message> + <source>Choose the address to send coins to</source> + <translation>Kies het adres om munten naar te versturen</translation> + </message> + <message> + <source>Choose the address to receive coins with</source> + <translation>Kies het adres om munten op te ontvangen</translation> + </message> + <message> + <source>C&hoose</source> + <translation>K&iezen</translation> + </message> + <message> + <source>Sending addresses</source> + <translation>Verzendadressen</translation> + </message> + <message> + <source>Receiving addresses</source> + <translation>Ontvangstadressen</translation> + </message> + <message> + <source>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source> + <translation>Dit zijn uw Bitcoinadressen om betalingen mee te verzenden. Controleer altijd het bedrag en het ontvangstadres voordat u uw bitcoins verzendt.</translation> + </message> + <message> + <source>These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction.</source> + <translation>Dit zijn uw Bitcoin-adressen waarmee u betalingen kunt ontvangen. We raden u aan om een nieuw ontvangstadres voor elke transactie te gebruiken.</translation> + </message> + <message> + <source>&Copy Address</source> + <translation>&Kopiëer Adres</translation> + </message> + <message> + <source>Copy &Label</source> + <translation>Kopieer &Label</translation> + </message> + <message> + <source>&Edit</source> + <translation>&Bewerk</translation> + </message> + <message> + <source>Export Address List</source> + <translation>Exporteer adreslijst</translation> + </message> + <message> + <source>Comma separated file (*.csv)</source> + <translation>Kommagescheiden bestand (*.csv)</translation> + </message> + <message> + <source>Exporting Failed</source> + <translation>Export mislukt</translation> + </message> + <message> + <source>There was an error trying to save the address list to %1. Please try again.</source> + <translation>Een fout is opgetreden tijdens het opslaan van deze adreslijst naar %1. Probeer het nogmaals.</translation> + </message> +</context> +<context> + <name>AddressTableModel</name> + <message> + <source>Label</source> + <translation>Label</translation> + </message> + <message> + <source>Address</source> + <translation>Adres</translation> + </message> + <message> + <source>(no label)</source> + <translation>(geen label)</translation> + </message> </context> <context> <name>AskPassphraseDialog</name> @@ -60,6 +131,94 @@ <source>Repeat new passphrase</source> <translation>Herhaal nieuw wachtwoord</translation> </message> + <message> + <source>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>.</source> + <translation>Voer een nieuw wachtwoord in voor uw portemonnee.<br/>Gebruik een wachtwoord van <b>tien of meer willekeurige karakters</b>, of <b>acht of meer woorden</b>.</translation> + </message> + <message> + <source>Encrypt wallet</source> + <translation>Versleutel portemonnee</translation> + </message> + <message> + <source>This operation needs your wallet passphrase to unlock the wallet.</source> + <translation>Deze operatie vereist uw portemonneewachtwoord om de portemonnee te openen.</translation> + </message> + <message> + <source>Unlock wallet</source> + <translation>Open portemonnee</translation> + </message> + <message> + <source>This operation needs your wallet passphrase to decrypt the wallet.</source> + <translation>Deze operatie vereist uw portemonneewachtwoord om de portemonnee te ontsleutelen</translation> + </message> + <message> + <source>Decrypt wallet</source> + <translation>Ontsleutel portemonnee</translation> + </message> + <message> + <source>Change passphrase</source> + <translation>Wijzig wachtwoord</translation> + </message> + <message> + <source>Enter the old passphrase and new passphrase to the wallet.</source> + <translation>Voer het oude en nieuwe wachtwoord in voor uw portemonnee.</translation> + </message> + <message> + <source>Confirm wallet encryption</source> + <translation>Bevestig versleuteling van de portemonnee</translation> + </message> + <message> + <source>Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR BITCOINS</b>!</source> + <translation>Waarschuwing: Als u uw portemonnee versleutelt en uw wachtwoord vergeet, zult u <b>AL UW BITCOINS VERLIEZEN</b>!</translation> + </message> + <message> + <source>Are you sure you wish to encrypt your wallet?</source> + <translation>Weet u zeker dat u uw portemonnee wilt versleutelen?</translation> + </message> + <message> + <source>Wallet encrypted</source> + <translation>Portemonnee versleuteld</translation> + </message> + <message> + <source>%1 will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your bitcoins from being stolen by malware infecting your computer.</source> + <translation>%1 zal nu afsluiten om het versleutelingsproces te voltooien. Onthoud dat het versleutelen van uw portemonnee u niet volledig kan beschermen: Malware kan uw computer infecteren en uw bitcoins stelen.</translation> + </message> + <message> + <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source> + <translation>BELANGRIJK: Elke eerder gemaakte backup van uw portemonneebestand dient u te vervangen door het nieuw gegenereerde, versleutelde portemonneebestand. Om veiligheidsredenen zullen eerdere backups van het niet-versleutelde portemonneebestand onbruikbaar worden zodra u uw nieuwe, versleutelde, portemonnee begint te gebruiken.</translation> + </message> + <message> + <source>Wallet encryption failed</source> + <translation>Portemonneeversleuteling mislukt</translation> + </message> + <message> + <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source> + <translation>Portemonneeversleuteling mislukt door een interne fout. Uw portemonnee is niet versleuteld.</translation> + </message> + <message> + <source>The supplied passphrases do not match.</source> + <translation>De opgegeven wachtwoorden komen niet overeen</translation> + </message> + <message> + <source>Wallet unlock failed</source> + <translation>Portemonnee openen mislukt</translation> + </message> + <message> + <source>The passphrase entered for the wallet decryption was incorrect.</source> + <translation>Het opgegeven wachtwoord voor de portemonnee-ontsleuteling is niet correct.</translation> + </message> + <message> + <source>Wallet decryption failed</source> + <translation>Portemonnee-ontsleuteling mislukt</translation> + </message> + <message> + <source>Wallet passphrase was successfully changed.</source> + <translation>Portemonneewachtwoord is met succes gewijzigd.</translation> + </message> + <message> + <source>Warning: The Caps Lock key is on!</source> + <translation>Waarschuwing: De Caps-Lock-toets staat aan!</translation> + </message> </context> <context> <name>BanTableModel</name> @@ -270,34 +429,10 @@ <source>Processing blocks on disk...</source> <translation>Bezig met verwerken van blokken op harde schijf...</translation> </message> - <message> - <source>No block source available...</source> - <translation>Geen bron voor blokken beschikbaar...</translation> - </message> <message numerus="yes"> <source>Processed %n block(s) of transaction history.</source> <translation><numerusform>%n blok aan transactiegeschiedenis verwerkt.</numerusform><numerusform>%n blokken aan transactiegeschiedenis verwerkt.</numerusform></translation> </message> - <message numerus="yes"> - <source>%n hour(s)</source> - <translation><numerusform>%n uur</numerusform><numerusform>%n uren</numerusform></translation> - </message> - <message numerus="yes"> - <source>%n day(s)</source> - <translation><numerusform>%n dag</numerusform><numerusform>%n dagen</numerusform></translation> - </message> - <message numerus="yes"> - <source>%n week(s)</source> - <translation><numerusform>%n week</numerusform><numerusform>%n weken</numerusform></translation> - </message> - <message> - <source>%1 and %2</source> - <translation>%1 en %2</translation> - </message> - <message numerus="yes"> - <source>%n year(s)</source> - <translation><numerusform>%n jaar</numerusform><numerusform>%n jaren</numerusform></translation> - </message> <message> <source>%1 behind</source> <translation>%1 achter</translation> @@ -384,7 +519,7 @@ <source>Wallet is <b>encrypted</b> and currently <b>locked</b></source> <translation>Portemonnee is <b>versleuteld</b> en momenteel <b>gesloten</b></translation> </message> -</context> + </context> <context> <name>CoinControlDialog</name> <message> @@ -404,10 +539,6 @@ <translation>Bedrag:</translation> </message> <message> - <source>Priority:</source> - <translation>Prioriteit:</translation> - </message> - <message> <source>Fee:</source> <translation>Transactiekosten:</translation> </message> @@ -460,8 +591,84 @@ <translation>Bevestigd</translation> </message> <message> - <source>Priority</source> - <translation>Prioriteit</translation> + <source>Copy address</source> + <translation>Kopieer adres</translation> + </message> + <message> + <source>Copy label</source> + <translation>Kopieer label</translation> + </message> + <message> + <source>Copy amount</source> + <translation>Kopieer bedrag</translation> + </message> + <message> + <source>Copy transaction ID</source> + <translation>Kopieer transactie-ID</translation> + </message> + <message> + <source>Lock unspent</source> + <translation>Blokeer ongebruikte</translation> + </message> + <message> + <source>Unlock unspent</source> + <translation>Deblokkeer ongebruikte</translation> + </message> + <message> + <source>Copy quantity</source> + <translation>Kopieer aantal</translation> + </message> + <message> + <source>Copy fee</source> + <translation>Kopieer vergoeding</translation> + </message> + <message> + <source>Copy after fee</source> + <translation>Kopieer na vergoeding</translation> + </message> + <message> + <source>Copy bytes</source> + <translation>Kopieer bytes</translation> + </message> + <message> + <source>Copy dust</source> + <translation>Kopieër stof</translation> + </message> + <message> + <source>Copy change</source> + <translation>Kopieer wijziging</translation> + </message> + <message> + <source>(%1 locked)</source> + <translation>(%1 geblokkeerd)</translation> + </message> + <message> + <source>yes</source> + <translation>ja</translation> + </message> + <message> + <source>no</source> + <translation>nee</translation> + </message> + <message> + <source>This label turns red if any recipient receives an amount smaller than the current dust threshold.</source> + <translation>Dit label wordt rood, als een ontvanger een bedrag van minder dan de huidige dust-drempel gekregen heeft.</translation> + </message> + <message> + <source>Can vary +/- %1 satoshi(s) per input.</source> + <translation>Kan per input +/- %1 satoshi(s) variëren.</translation> + </message> + <message> + <source>(no label)</source> + <translation>(geen label)</translation> + </message> + <message> + <source>change from %1 (%2)</source> + <translation>wijzig van %1 (%2)</translation> + </message> + <message> + <source>(change)</source> + <translation>(wijzig)</translation> </message> </context> <context> @@ -486,6 +693,38 @@ <source>&Address</source> <translation>&Adres</translation> </message> + <message> + <source>New receiving address</source> + <translation>Nieuw ontvangstadres</translation> + </message> + <message> + <source>New sending address</source> + <translation>Nieuw verzendadres</translation> + </message> + <message> + <source>Edit receiving address</source> + <translation>Bewerk ontvangstadres</translation> + </message> + <message> + <source>Edit sending address</source> + <translation>Bewerk verzendadres</translation> + </message> + <message> + <source>The entered address "%1" is not a valid Bitcoin address.</source> + <translation>Het opgegeven adres "%1" is een ongeldig Bitcoinadres.</translation> + </message> + <message> + <source>The entered address "%1" is already in the address book.</source> + <translation>Het opgegeven adres "%1" bestaat al in uw adresboek.</translation> + </message> + <message> + <source>Could not unlock wallet.</source> + <translation>Kon de portemonnee niet openen.</translation> + </message> + <message> + <source>New key generation failed.</source> + <translation>Genereren nieuwe sleutel mislukt.</translation> + </message> </context> <context> <name>FreespaceChecker</name> @@ -609,6 +848,21 @@ </message> </context> <context> + <name>ModalOverlay</name> + <message> + <source>Form</source> + <translation>Vorm</translation> + </message> + <message> + <source>Last block time</source> + <translation>Tijd laatste blok</translation> + </message> + <message> + <source>Hide</source> + <translation>Verbergen</translation> + </message> + </context> +<context> <name>OpenURIDialog</name> <message> <source>Open URI</source> @@ -626,6 +880,10 @@ <source>Select payment request file</source> <translation>Selecteer betalingsverzoek bestand</translation> </message> + <message> + <source>Select payment request file to open</source> + <translation>Selecteer betalingsverzoekbestand om te openen</translation> + </message> </context> <context> <name>OptionsDialog</name> @@ -938,6 +1196,97 @@ </message> </context> <context> + <name>PaymentServer</name> + <message> + <source>Payment request error</source> + <translation>Fout bij betalingsverzoek</translation> + </message> + <message> + <source>Cannot start bitcoin: click-to-pay handler</source> + <translation>Kan bitcoin niet starten: click-to-pay handler</translation> + </message> + <message> + <source>URI handling</source> + <translation>URI-behandeling</translation> + </message> + <message> + <source>Payment request fetch URL is invalid: %1</source> + <translation>URL om betalingsverzoek te verkrijgen is ongeldig: %1</translation> + </message> + <message> + <source>Invalid payment address %1</source> + <translation>Ongeldig betalingsadres %1</translation> + </message> + <message> + <source>URI cannot be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters.</source> + <translation>URI kan niet verwerkt worden! Dit kan het gevolg zijn van een ongeldig Bitcoin adres of misvormde URI parameters.</translation> + </message> + <message> + <source>Payment request file handling</source> + <translation>Betalingsverzoek bestandsafhandeling</translation> + </message> + <message> + <source>Payment request file cannot be read! This can be caused by an invalid payment request file.</source> + <translation>Betalingsverzoekbestand kan niet gelezen of verwerkt worden! Dit kan veroorzaakt worden door een ongeldig betalingsverzoekbestand.</translation> + </message> + <message> + <source>Payment request rejected</source> + <translation>Betalingsverzoek geweigerd</translation> + </message> + <message> + <source>Payment request network doesn't match client network.</source> + <translation>Betalingsaanvraagnetwerk komt niet overeen met klantennetwerk.</translation> + </message> + <message> + <source>Payment request expired.</source> + <translation>Betalingsverzoek verlopen.</translation> + </message> + <message> + <source>Payment request is not initialized.</source> + <translation>Betalingsaanvraag is niet geïnitialiseerd.</translation> + </message> + <message> + <source>Unverified payment requests to custom payment scripts are unsupported.</source> + <translation>Niet-geverifieerde betalingsverzoeken naar aangepaste betalingsscripts worden niet ondersteund.</translation> + </message> + <message> + <source>Invalid payment request.</source> + <translation>Ongeldig betalingsverzoek.</translation> + </message> + <message> + <source>Requested payment amount of %1 is too small (considered dust).</source> + <translation>Het gevraagde betalingsbedrag van %1 is te weinig (beschouwd als stof).</translation> + </message> + <message> + <source>Refund from %1</source> + <translation>Restitutie van %1</translation> + </message> + <message> + <source>Payment request %1 is too large (%2 bytes, allowed %3 bytes).</source> + <translation>Betalingsverzoek %1 is te groot (%2 bytes, toegestaan %3 bytes).</translation> + </message> + <message> + <source>Error communicating with %1: %2</source> + <translation>Fout bij communiceren met %1: %2</translation> + </message> + <message> + <source>Payment request cannot be parsed!</source> + <translation>Betalingsverzoek kan niet worden verwerkt!</translation> + </message> + <message> + <source>Bad response from server %1</source> + <translation>Ongeldige respons van server %1</translation> + </message> + <message> + <source>Network request error</source> + <translation>Fout bij netwerkverzoek</translation> + </message> + <message> + <source>Payment acknowledged</source> + <translation>Betaling bevestigd</translation> + </message> +</context> +<context> <name>PeerTableModel</name> <message> <source>User Agent</source> @@ -947,11 +1296,7 @@ <source>Node/Service</source> <translation>Node/Dienst</translation> </message> - <message> - <source>Ping Time</source> - <translation>Ping tijd</translation> - </message> -</context> + </context> <context> <name>QObject</name> <message> @@ -990,6 +1335,32 @@ <source>%1 ms</source> <translation>%1 ms</translation> </message> + <message> + <source>%1 and %2</source> + <translation>%1 en %2</translation> + </message> + </context> +<context> + <name>QObject::QObject</name> + </context> +<context> + <name>QRImageWidget</name> + <message> + <source>&Save Image...</source> + <translation>&Sla afbeelding op...</translation> + </message> + <message> + <source>&Copy Image</source> + <translation>&Afbeelding kopiëren</translation> + </message> + <message> + <source>Save QR Code</source> + <translation>Sla QR-code op</translation> + </message> + <message> + <source>PNG Image (*.png)</source> + <translation>PNG afbeelding (*.png)</translation> + </message> </context> <context> <name>RPCConsole</name> @@ -1194,14 +1565,6 @@ <translation>Maak console leeg</translation> </message> <message> - <source>&Disconnect Node</source> - <translation>&Verbreek Verbinding Node</translation> - </message> - <message> - <source>Ban Node for</source> - <translation>Ban Node voor</translation> - </message> - <message> <source>1 &hour</source> <translation>1 &uur</translation> </message> @@ -1218,10 +1581,6 @@ <translation>1 &jaar</translation> </message> <message> - <source>&Unban Node</source> - <translation>&Maak Ban Ongedaan voor Node</translation> - </message> - <message> <source>Welcome to the %1 RPC console.</source> <translation>Welkom bij de %1 RPC-console.</translation> </message> @@ -1352,6 +1711,18 @@ <source>Remove</source> <translation>Verwijder</translation> </message> + <message> + <source>Copy label</source> + <translation>Kopieer label</translation> + </message> + <message> + <source>Copy message</source> + <translation>Kopieer bericht</translation> + </message> + <message> + <source>Copy amount</source> + <translation>Kopieer bedrag</translation> + </message> </context> <context> <name>ReceiveRequestDialog</name> @@ -1371,6 +1742,73 @@ <source>&Save Image...</source> <translation>&Sla afbeelding op...</translation> </message> + <message> + <source>Request payment to %1</source> + <translation>Betalingsverzoek tot %1</translation> + </message> + <message> + <source>Payment information</source> + <translation>Betalingsinformatie</translation> + </message> + <message> + <source>URI</source> + <translation>URI</translation> + </message> + <message> + <source>Address</source> + <translation>Adres</translation> + </message> + <message> + <source>Amount</source> + <translation>Bedrag</translation> + </message> + <message> + <source>Label</source> + <translation>Label</translation> + </message> + <message> + <source>Message</source> + <translation>Bericht</translation> + </message> + <message> + <source>Resulting URI too long, try to reduce the text for label / message.</source> + <translation>Resulterende URI te lang, probeer de tekst korter te maken voor het label/bericht.</translation> + </message> + <message> + <source>Error encoding URI into QR Code.</source> + <translation>Fout tijdens encoderen URI in QR-code</translation> + </message> +</context> +<context> + <name>RecentRequestsTableModel</name> + <message> + <source>Date</source> + <translation>Datum</translation> + </message> + <message> + <source>Label</source> + <translation>Label</translation> + </message> + <message> + <source>Message</source> + <translation>Bericht</translation> + </message> + <message> + <source>(no label)</source> + <translation>(geen label)</translation> + </message> + <message> + <source>(no message)</source> + <translation>(geen bericht)</translation> + </message> + <message> + <source>(no amount requested)</source> + <translation>(geen bedrag aangevraagd)</translation> + </message> + <message> + <source>Requested</source> + <translation>Verzoek ingediend</translation> + </message> </context> <context> <name>SendCoinsDialog</name> @@ -1407,10 +1845,6 @@ <translation>Bedrag:</translation> </message> <message> - <source>Priority:</source> - <translation>Prioriteit:</translation> - </message> - <message> <source>Fee:</source> <translation>Kosten:</translation> </message> @@ -1479,10 +1913,6 @@ <translation>(Slimme transactiekosten is nog niet geïnitialiseerd. Dit duurt meestal een paar blokken...)</translation> </message> <message> - <source>Confirmation time:</source> - <translation>Bevestigings tijd:</translation> - </message> - <message> <source>normal</source> <translation>normaal</translation> </message> @@ -1522,6 +1952,106 @@ <source>S&end</source> <translation>V&erstuur</translation> </message> + <message> + <source>Copy quantity</source> + <translation>Kopieer aantal</translation> + </message> + <message> + <source>Copy amount</source> + <translation>Kopieer bedrag</translation> + </message> + <message> + <source>Copy fee</source> + <translation>Kopieer vergoeding</translation> + </message> + <message> + <source>Copy after fee</source> + <translation>Kopieer na vergoeding</translation> + </message> + <message> + <source>Copy bytes</source> + <translation>Kopieer bytes</translation> + </message> + <message> + <source>Copy dust</source> + <translation>Kopieër stof</translation> + </message> + <message> + <source>Copy change</source> + <translation>Kopieer wijziging</translation> + </message> + <message> + <source>%1 to %2</source> + <translation>%1 tot %2</translation> + </message> + <message> + <source>Are you sure you want to send?</source> + <translation>Weet u zeker dat u wilt verzenden?</translation> + </message> + <message> + <source>added as transaction fee</source> + <translation>toegevoegd als transactiekosten</translation> + </message> + <message> + <source>Total Amount %1</source> + <translation>Totaalbedrag %1</translation> + </message> + <message> + <source>or</source> + <translation>of</translation> + </message> + <message> + <source>Confirm send coins</source> + <translation>Bevestig versturen munten</translation> + </message> + <message> + <source>The recipient address is not valid. Please recheck.</source> + <translation>Het adres van de ontvanger is niet geldig. Gelieve opnieuw te controleren.</translation> + </message> + <message> + <source>The amount to pay must be larger than 0.</source> + <translation>Het ingevoerde bedrag moet groter zijn dan 0.</translation> + </message> + <message> + <source>The amount exceeds your balance.</source> + <translation>Het bedrag is hoger dan uw huidige saldo.</translation> + </message> + <message> + <source>The total exceeds your balance when the %1 transaction fee is included.</source> + <translation>Het totaal overschrijdt uw huidige saldo wanneer de %1 transactiekosten worden meegerekend.</translation> + </message> + <message> + <source>Duplicate address found: addresses should only be used once each.</source> + <translation>Dubbel adres gevonden: adressen mogen maar één keer worden gebruikt worden.</translation> + </message> + <message> + <source>Transaction creation failed!</source> + <translation>Transactiecreatie mislukt</translation> + </message> + <message> + <source>A fee higher than %1 is considered an absurdly high fee.</source> + <translation>Een vergoeding van meer dan %1 wordt beschouwd als een absurd hoge vergoeding.</translation> + </message> + <message> + <source>Payment request expired.</source> + <translation>Betalingsverzoek verlopen.</translation> + </message> + <message> + <source>Pay only the required fee of %1</source> + <translation>Betaal alleen de verplichte transactiekosten van %1</translation> + </message> + <message> + <source>Warning: Invalid Bitcoin address</source> + <translation>Waarschuwing: Ongeldig Bitcoinadres</translation> + </message> + <message> + <source>Warning: Unknown change address</source> + <translation>Waarschuwing: Onbekend wisselgeldadres</translation> + </message> + <message> + <source>(no label)</source> + <translation>(geen label)</translation> + </message> </context> <context> <name>SendCoinsEntry</name> @@ -1601,6 +2131,17 @@ <source>Memo:</source> <translation>Memo:</translation> </message> + <message> + <source>Enter a label for this address to add it to your address book</source> + <translation>Vul een label in voor dit adres om het toe te voegen aan uw adresboek</translation> + </message> +</context> +<context> + <name>SendConfirmationDialog</name> + <message> + <source>Yes</source> + <translation>Ja</translation> + </message> </context> <context> <name>ShutdownWindow</name> @@ -1699,6 +2240,58 @@ <source>Reset all verify message fields</source> <translation>Verwijder alles in de invulvelden</translation> </message> + <message> + <source>Click "Sign Message" to generate signature</source> + <translation>Klik op "Onderteken Bericht" om de handtekening te genereren</translation> + </message> + <message> + <source>The entered address is invalid.</source> + <translation>Het opgegeven adres is ongeldig.</translation> + </message> + <message> + <source>Please check the address and try again.</source> + <translation>Controleer het adres en probeer het opnieuw.</translation> + </message> + <message> + <source>The entered address does not refer to a key.</source> + <translation>Het opgegeven adres verwijst niet naar een sleutel.</translation> + </message> + <message> + <source>Wallet unlock was cancelled.</source> + <translation>Portemonnee-ontsleuteling is geannuleerd.</translation> + </message> + <message> + <source>Private key for the entered address is not available.</source> + <translation>Geheime sleutel voor het ingevoerde adres is niet beschikbaar.</translation> + </message> + <message> + <source>Message signing failed.</source> + <translation>Ondertekenen van het bericht is mislukt.</translation> + </message> + <message> + <source>Message signed.</source> + <translation>Bericht ondertekend.</translation> + </message> + <message> + <source>The signature could not be decoded.</source> + <translation>De handtekening kon niet worden gedecodeerd.</translation> + </message> + <message> + <source>Please check the signature and try again.</source> + <translation>Controleer de handtekening en probeer het opnieuw.</translation> + </message> + <message> + <source>The signature did not match the message digest.</source> + <translation>De handtekening hoort niet bij het bericht.</translation> + </message> + <message> + <source>Message verification failed.</source> + <translation>Berichtverificatie mislukt.</translation> + </message> + <message> + <source>Message verified.</source> + <translation>Bericht geverifiëerd.</translation> + </message> </context> <context> <name>SplashScreen</name> @@ -1715,11 +2308,440 @@ </message> </context> <context> + <name>TransactionDesc</name> + <message> + <source>Open until %1</source> + <translation>Open tot %1</translation> + </message> + <message> + <source>conflicted with a transaction with %1 confirmations</source> + <translation>geconflicteerd met een transactie met %1 confirmaties</translation> + </message> + <message> + <source>%1/offline</source> + <translation>%1/offline</translation> + </message> + <message> + <source>0/unconfirmed, %1</source> + <translation>0/onbevestigd, %1</translation> + </message> + <message> + <source>in memory pool</source> + <translation>in geheugenpoel</translation> + </message> + <message> + <source>not in memory pool</source> + <translation>niet in geheugenpoel</translation> + </message> + <message> + <source>abandoned</source> + <translation>opgegeven</translation> + </message> + <message> + <source>%1/unconfirmed</source> + <translation>%1/onbevestigd</translation> + </message> + <message> + <source>%1 confirmations</source> + <translation>%1 bevestigingen</translation> + </message> + <message> + <source>Status</source> + <translation>Status</translation> + </message> + <message> + <source>, has not been successfully broadcast yet</source> + <translation>, is nog niet met succes uitgezonden</translation> + </message> + <message> + <source>Date</source> + <translation>Datum</translation> + </message> + <message> + <source>Source</source> + <translation>Bron</translation> + </message> + <message> + <source>Generated</source> + <translation>Gegenereerd</translation> + </message> + <message> + <source>From</source> + <translation>Van</translation> + </message> + <message> + <source>unknown</source> + <translation>onbekend</translation> + </message> + <message> + <source>To</source> + <translation>Aan</translation> + </message> + <message> + <source>own address</source> + <translation>eigen adres</translation> + </message> + <message> + <source>watch-only</source> + <translation>alleen-bekijkbaar</translation> + </message> + <message> + <source>label</source> + <translation>label</translation> + </message> + <message> + <source>Credit</source> + <translation>Credit</translation> + </message> + <message> + <source>not accepted</source> + <translation>niet geaccepteerd</translation> + </message> + <message> + <source>Debit</source> + <translation>Debet</translation> + </message> + <message> + <source>Total debit</source> + <translation>Totaal debit</translation> + </message> + <message> + <source>Total credit</source> + <translation>Totaal credit</translation> + </message> + <message> + <source>Transaction fee</source> + <translation>Transactiekosten</translation> + </message> + <message> + <source>Net amount</source> + <translation>Netto bedrag</translation> + </message> + <message> + <source>Message</source> + <translation>Bericht</translation> + </message> + <message> + <source>Comment</source> + <translation>Opmerking</translation> + </message> + <message> + <source>Transaction ID</source> + <translation>Transactie-ID</translation> + </message> + <message> + <source>Output index</source> + <translation>Output index</translation> + </message> + <message> + <source>Merchant</source> + <translation>Handelaar</translation> + </message> + <message> + <source>Generated coins must mature %1 blocks before they can be spent. When you generated this block, it was broadcast to the network to be added to the block chain. If it fails to get into the chain, its state will change to "not accepted" and it won't be spendable. This may occasionally happen if another node generates a block within a few seconds of yours.</source> + <translation>Gegenereerde munten moeten %1 blokken rijpen voordat ze kunnen worden besteed. Toen dit blok gegenereerd werd, werd het uitgezonden naar het netwerk om aan de blokketen toegevoegd te worden. Als het niet lukt om in de keten toegevoegd te worden, zal de status te veranderen naar "niet geaccepteerd" en zal het niet besteedbaar zijn. Dit kan soms gebeuren als een ander knooppunt een blok genereert binnen een paar seconden na die van u.</translation> + </message> + <message> + <source>Debug information</source> + <translation>Debug-informatie</translation> + </message> + <message> + <source>Transaction</source> + <translation>Transactie</translation> + </message> + <message> + <source>Inputs</source> + <translation>Inputs</translation> + </message> + <message> + <source>Amount</source> + <translation>Bedrag</translation> + </message> + <message> + <source>true</source> + <translation>waar</translation> + </message> + <message> + <source>false</source> + <translation>onwaar</translation> + </message> +</context> +<context> <name>TransactionDescDialog</name> <message> <source>This pane shows a detailed description of the transaction</source> <translation>Dit venster laat een uitgebreide beschrijving van de transactie zien</translation> </message> + <message> + <source>Details for %1</source> + <translation>Details voor %1</translation> + </message> +</context> +<context> + <name>TransactionTableModel</name> + <message> + <source>Date</source> + <translation>Datum</translation> + </message> + <message> + <source>Type</source> + <translation>Type</translation> + </message> + <message> + <source>Label</source> + <translation>Label</translation> + </message> + <message> + <source>Open until %1</source> + <translation>Open tot %1</translation> + </message> + <message> + <source>Offline</source> + <translation>Offline</translation> + </message> + <message> + <source>Unconfirmed</source> + <translation>Onbevestigd</translation> + </message> + <message> + <source>Abandoned</source> + <translation>Opgegeven</translation> + </message> + <message> + <source>Confirming (%1 of %2 recommended confirmations)</source> + <translation>Bevestigen (%1 van %2 aanbevolen bevestigingen)</translation> + </message> + <message> + <source>Confirmed (%1 confirmations)</source> + <translation>Bevestigd (%1 bevestigingen)</translation> + </message> + <message> + <source>Conflicted</source> + <translation>Conflicterend</translation> + </message> + <message> + <source>Immature (%1 confirmations, will be available after %2)</source> + <translation>Niet beschikbaar (%1 bevestigingen, zal beschikbaar zijn na %2)</translation> + </message> + <message> + <source>This block was not received by any other nodes and will probably not be accepted!</source> + <translation>Dit blok is niet ontvangen bij andere nodes en zal waarschijnlijk niet worden geaccepteerd!</translation> + </message> + <message> + <source>Generated but not accepted</source> + <translation>Gegenereerd maar niet geaccepteerd</translation> + </message> + <message> + <source>Received with</source> + <translation>Ontvangen met</translation> + </message> + <message> + <source>Received from</source> + <translation>Ontvangen van</translation> + </message> + <message> + <source>Sent to</source> + <translation>Verzonden aan</translation> + </message> + <message> + <source>Payment to yourself</source> + <translation>Betaling aan uzelf</translation> + </message> + <message> + <source>Mined</source> + <translation>Gedolven</translation> + </message> + <message> + <source>watch-only</source> + <translation>alleen-bekijkbaar</translation> + </message> + <message> + <source>(n/a)</source> + <translation>(nvt)</translation> + </message> + <message> + <source>(no label)</source> + <translation>(geen label)</translation> + </message> + <message> + <source>Transaction status. Hover over this field to show number of confirmations.</source> + <translation>Transactiestatus. Houd de cursor boven dit veld om het aantal bevestigingen te laten zien.</translation> + </message> + <message> + <source>Date and time that the transaction was received.</source> + <translation>Datum en tijd waarop deze transactie is ontvangen.</translation> + </message> + <message> + <source>Type of transaction.</source> + <translation>Type transactie.</translation> + </message> + <message> + <source>Whether or not a watch-only address is involved in this transaction.</source> + <translation>Of er een alleen-bekijken-adres is betrokken bij deze transactie.</translation> + </message> + <message> + <source>User-defined intent/purpose of the transaction.</source> + <translation>Door gebruiker gedefinieerde intentie/doel van de transactie.</translation> + </message> + <message> + <source>Amount removed from or added to balance.</source> + <translation>Bedrag verwijderd van of toegevoegd aan saldo.</translation> + </message> +</context> +<context> + <name>TransactionView</name> + <message> + <source>All</source> + <translation>Alles</translation> + </message> + <message> + <source>Today</source> + <translation>Vandaag</translation> + </message> + <message> + <source>This week</source> + <translation>Deze week</translation> + </message> + <message> + <source>This month</source> + <translation>Deze maand</translation> + </message> + <message> + <source>Last month</source> + <translation>Vorige maand</translation> + </message> + <message> + <source>This year</source> + <translation>Dit jaar</translation> + </message> + <message> + <source>Range...</source> + <translation>Bereik...</translation> + </message> + <message> + <source>Received with</source> + <translation>Ontvangen met</translation> + </message> + <message> + <source>Sent to</source> + <translation>Verzonden aan</translation> + </message> + <message> + <source>To yourself</source> + <translation>Aan uzelf</translation> + </message> + <message> + <source>Mined</source> + <translation>Gedolven</translation> + </message> + <message> + <source>Other</source> + <translation>Anders</translation> + </message> + <message> + <source>Enter address or label to search</source> + <translation>Vul adres of label in om te zoeken</translation> + </message> + <message> + <source>Min amount</source> + <translation>Min. bedrag</translation> + </message> + <message> + <source>Abandon transaction</source> + <translation>Doe afstand van transactie</translation> + </message> + <message> + <source>Copy address</source> + <translation>Kopieer adres</translation> + </message> + <message> + <source>Copy label</source> + <translation>Kopieer label</translation> + </message> + <message> + <source>Copy amount</source> + <translation>Kopieer bedrag</translation> + </message> + <message> + <source>Copy transaction ID</source> + <translation>Kopieer transactie-ID</translation> + </message> + <message> + <source>Copy raw transaction</source> + <translation>Kopieer ruwe transactie</translation> + </message> + <message> + <source>Copy full transaction details</source> + <translation>Kopieer volledige transactiedetials</translation> + </message> + <message> + <source>Edit label</source> + <translation>Bewerk label</translation> + </message> + <message> + <source>Show transaction details</source> + <translation>Toon transactiedetails</translation> + </message> + <message> + <source>Export Transaction History</source> + <translation>Exporteer transactiegeschiedenis</translation> + </message> + <message> + <source>Comma separated file (*.csv)</source> + <translation>Kommagescheiden bestand (*.csv)</translation> + </message> + <message> + <source>Confirmed</source> + <translation>Bevestigd</translation> + </message> + <message> + <source>Watch-only</source> + <translation>Alleen-bekijkbaar</translation> + </message> + <message> + <source>Date</source> + <translation>Datum</translation> + </message> + <message> + <source>Type</source> + <translation>Type</translation> + </message> + <message> + <source>Label</source> + <translation>Label</translation> + </message> + <message> + <source>Address</source> + <translation>Adres</translation> + </message> + <message> + <source>ID</source> + <translation>ID</translation> + </message> + <message> + <source>Exporting Failed</source> + <translation>Export mislukt</translation> + </message> + <message> + <source>There was an error trying to save the transaction history to %1.</source> + <translation>Er is een fout opgetreden bij het opslaan van de transactiegeschiedenis naar %1.</translation> + </message> + <message> + <source>Exporting Successful</source> + <translation>Export succesvol</translation> + </message> + <message> + <source>The transaction history was successfully saved to %1.</source> + <translation>De transactiegeschiedenis was succesvol bewaard in %1.</translation> + </message> + <message> + <source>Range:</source> + <translation>Bereik:</translation> + </message> + <message> + <source>to</source> + <translation>naar</translation> + </message> </context> <context> <name>UnitDisplayStatusBarControl</name> @@ -1729,6 +2751,55 @@ </message> </context> <context> + <name>WalletFrame</name> + <message> + <source>No wallet has been loaded.</source> + <translation>Er is geen portemonnee geladen.</translation> + </message> +</context> +<context> + <name>WalletModel</name> + <message> + <source>Send Coins</source> + <translation>Verstuur munten</translation> + </message> +</context> +<context> + <name>WalletView</name> + <message> + <source>&Export</source> + <translation>&Exporteer</translation> + </message> + <message> + <source>Export the data in the current tab to a file</source> + <translation>Exporteer de data in de huidige tab naar een bestand</translation> + </message> + <message> + <source>Backup Wallet</source> + <translation>Portemonnee backuppen</translation> + </message> + <message> + <source>Wallet Data (*.dat)</source> + <translation>Portemonneedata (*.dat)</translation> + </message> + <message> + <source>Backup Failed</source> + <translation>Backup mislukt</translation> + </message> + <message> + <source>There was an error trying to save the wallet data to %1.</source> + <translation>Er is een fout opgetreden bij het wegschrijven van de portemonneedata naar %1.</translation> + </message> + <message> + <source>Backup Successful</source> + <translation>Backup succesvol</translation> + </message> + <message> + <source>The wallet data was successfully saved to %1.</source> + <translation>De portemonneedata is succesvol opgeslagen in %1.</translation> + </message> +</context> +<context> <name>bitcoin-core</name> <message> <source>Options:</source> @@ -1763,10 +2834,6 @@ <translation>Snoei: laatste portemoneesynchronisatie gaat verder dan de gesnoeide data. U moet -reindex gebruiken (download opnieuw de gehele blokketen voor een weggesnoeide node)</translation> </message> <message> - <source>Reduce storage requirements by pruning (deleting) old blocks. This mode is incompatible with -txindex and -rescan. Warning: Reverting this setting requires re-downloading the entire blockchain. (default: 0 = disable pruning blocks, >%u = target size in MiB to use for block files)</source> - <translation>Beperk benodigde opslag door snoeien (verwijderen) van oude blokken. Deze modus is niet-compatibele met -txindex en -rescan. Waarschuwing: Terugzetten van deze instellingen vereist opnieuw downloaden van gehele de blokketen. (standaard:0 = uitzetten snoeimodus, >%u = doelgrootte in MiB voor blokbestanden)</translation> - </message> - <message> <source>Rescans are not possible in pruned mode. You will need to use -reindex which will download the whole blockchain again.</source> <translation>Herscannen is niet mogelijk in de snoeimodus. U moet -reindex gebruiken dat de hele blokketen opnieuw zal downloaden.</translation> </message> @@ -1791,16 +2858,12 @@ <translation>Niet mogelijk ok HTTP-server te starten. Zie debuglogboek voor details.</translation> </message> <message> - <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> - <translation>Accepteer verbindingen van buitenaf (standaard: 1 als geen -proxy of -connect is opgegeven)</translation> - </message> - <message> <source>Bitcoin Core</source> <translation>Bitcoin Core</translation> </message> <message> - <source>-fallbackfee is set very high! This is the transaction fee you may pay when fee estimates are not available.</source> - <translation>-fallbackfee is zeer hoog ingesteld! Dit zijn de transactie kosten die u mogelijk betaald wanneer de schattingen niet beschikbaar zijn.</translation> + <source>The %s developers</source> + <translation>De %s ontwikkelaars</translation> </message> <message> <source>A fee rate (in %s/kB) that will be used when fee estimation has insufficient data (default: %s)</source> @@ -1823,8 +2886,8 @@ <translation>Verwijder alle transacties van de portemonnee en herstel alleen de delen van de blokketen door -rescan tijdens het opstarten</translation> </message> <message> - <source>Distributed under the MIT software license, see the accompanying file COPYING or <http://www.opensource.org/licenses/mit-license.php>.</source> - <translation>Uitgegeven onder de MIT-softwarelicentie, zie het bijgevoegde bestand COPYING of <http://www.opensource.org/licenses/mit-license.php>.</translation> + <source>Error loading %s: You can't enable HD on a already existing non-HD wallet</source> + <translation>Fout bij het laden van %s: Je kan HD niet activeren voor een reeds bestaande niet-HD portemonnee</translation> </message> <message> <source>Error reading %s! All keys read correctly, but transaction data or address book entries might be missing or incorrect.</source> @@ -1835,10 +2898,6 @@ <translation>Voer opdracht uit zodra een portemonneetransactie verandert (%s in cmd wordt vervangen door TxID)</translation> </message> <message> - <source>Force relay of transactions from whitelisted peers even they violate local relay policy (default: %d)</source> - <translation>Forceer het doorsturen van transacties van goedgekeurde peers, zelfs wanneer deze niet voldoen aan de lokale doorstuur regels (standaard: %d)</translation> - </message> - <message> <source>Maximum allowed median peer time offset adjustment. Local perspective of time may be influenced by peers forward or backward by this amount. (default: %u seconds)</source> <translation>Maximum toegestane peer tijd compensatie. Lokaal perspectief van tijd mag worden beinvloed door peers die met deze hoeveelheid voor of achter lopen. (standaard: %u seconden)</translation> </message> @@ -1851,6 +2910,10 @@ <translation>Waarschuwing: Controleer dat de datum en tijd van uw computer correct zijn ingesteld! Bij een onjuist ingestelde klok zal %s niet goed werken.</translation> </message> <message> + <source>Please contribute if you find %s useful. Visit %s for further information about the software.</source> + <translation>Gelieve bij te dragen als je %s nuttig vindt. Bezoek %s voor meer informatie over de software.</translation> + </message> + <message> <source>Set the number of script verification threads (%u to %d, 0 = auto, <0 = leave that many cores free, default: %d)</source> <translation>Kies het aantal scriptverificatie processen (%u tot %d, 0 = auto, <0 = laat dit aantal kernen vrij, standaard: %d)</translation> </message> @@ -1859,30 +2922,22 @@ <translation>De blokdatabase bevat een blok dat lijkt uit de toekomst te komen. Dit kan gebeuren omdat de datum en tijd van uw computer niet goed staat. Herbouw de blokdatabase pas nadat u de datum en tijd van uw computer correct heeft ingesteld.</translation> </message> <message> - <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source> - <translation>Dit is een prerelease testversie – gebruik op eigen risico! Gebruik deze niet voor het delven van munten of handelsdoeleinden</translation> + <source>Unable to rewind the database to a pre-fork state. You will need to redownload the blockchain</source> + <translation>Niet mogelijk om de databank terug te draaien naar een staat voor de vork. Je zal je blokketen opnieuw moeten downloaden</translation> </message> <message> <source>Use UPnP to map the listening port (default: 1 when listening and no -proxy)</source> <translation>Gebruik UPnP om de luisterende poort te mappen (standaard: 1 als er geluisterd worden en geen -proxy is meegegeven)</translation> </message> <message> - <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source> - <translation>Waarschuwing: Het lijkt erop dat het netwerk geen consensus kan vinden! Sommige delvers lijken problemen te ondervinden.</translation> - </message> - <message> - <source>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</source> - <translation>Waarschuwing: Het lijkt erop dat we geen consensus kunnen vinden met onze peers! Mogelijk dient u te upgraden, of andere nodes moeten wellicht upgraden.</translation> - </message> - <message> - <source>Whitelist peers connecting from the given netmask or IP address. Can be specified multiple times.</source> - <translation>Goedgekeurde peers die verbinden van het ingegeven netmask of IP adres. Kan meerdere keren gespecificeerd worden.</translation> - </message> - <message> <source>You need to rebuild the database using -reindex-chainstate to change -txindex</source> <translation>Om -txindex te kunnen veranderen dient u de database opnieuw te bouwen met gebruik van -reindex-chainstate.</translation> </message> <message> + <source>%s corrupt, salvage failed</source> + <translation>%s corrupt, veiligstellen mislukt</translation> + </message> + <message> <source>-maxmempool must be at least %d MB</source> <translation>-maxmempool moet tenminste %d MB zijn</translation> </message> @@ -1911,10 +2966,6 @@ <translation>Wijzigingsindex buiten bereik</translation> </message> <message> - <source>Connect only to the specified node(s)</source> - <translation>Verbind alleen naar de gespecificeerde node(s)</translation> - </message> - <message> <source>Connection options:</source> <translation>Verbindingsopties:</translation> </message> @@ -1979,6 +3030,10 @@ <translation>Fout bij laden %s: Portemonnee vereist een nieuwere versie van %s</translation> </message> <message> + <source>Error loading %s: You can't disable HD on a already existing HD wallet</source> + <translation>Fout bij het laden van %s: Je kan HD niet deactiveren voor een reeds bestaande HD portemonnee</translation> + </message> + <message> <source>Error loading block database</source> <translation>Fout bij het laden van blokkendatabase</translation> </message> @@ -2031,10 +3086,6 @@ <translation>Locatie van de auth cookie (standaard: data dir)</translation> </message> <message> - <source>Minimum bytes per sigop in transactions we relay and mine (default: %u)</source> - <translation>Minimum aantal bytes dat er per sigop in een transactie gerelayed en gemined worden (standaard: %u)</translation> - </message> - <message> <source>Not enough file descriptors available.</source> <translation>Niet genoeg file descriptors beschikbaar.</translation> </message> @@ -2067,6 +3118,10 @@ <translation>Herbouw ketenstaat vanuit de huidige geindexeerde blokken</translation> </message> <message> + <source>Rewinding blocks...</source> + <translation>Blokken aan het terugdraaien...</translation> + </message> + <message> <source>Set database cache size in megabytes (%d to %d, default: %d)</source> <translation>Zet database cache grootte in megabytes (%d tot %d, standaard: %d)</translation> </message> @@ -2079,6 +3134,10 @@ <translation>Specificeer het portemonnee bestand (vanuit de gegevensmap)</translation> </message> <message> + <source>The source code is available from %s.</source> + <translation>De broncode is beschikbaar van %s.</translation> + </message> + <message> <source>Unable to bind to %s on this computer. %s is probably already running.</source> <translation>Niet in staat om %s te verbinden op deze computer. %s draait waarschijnlijk al.</translation> </message> @@ -2171,10 +3230,6 @@ <translation>Maximale grootte va n de gegevens in gegevensdragertransacties die we doorgeven en mijnen (standaard: %u)</translation> </message> <message> - <source>Query for peer addresses via DNS lookup, if low on addresses (default: 1 unless -connect)</source> - <translation>Query voor peeradressen via DNS- lookup , als laag op adressen (standaard: 1 unless -connect)</translation> - </message> - <message> <source>Randomize credentials for every proxy connection. This enables Tor stream isolation (default: %u)</source> <translation>Gebruik willekeurige inloggegevens voor elke proxyverbinding. Dit maakt streamislatie voor Tor mogelijk (standaard: %u)</translation> </message> @@ -2187,8 +3242,8 @@ <translation>Het transactiebedrag is te klein om te versturen nadat de transactiekosten in mindering zijn gebracht</translation> </message> <message> - <source>This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit <https://www.openssl.org/> and cryptographic software written by Eric Young and UPnP software written by Thomas Bernard.</source> - <translation>Dit product bevat software dat ontwikkeld is door het OpenSSL Project voor gebruik in de OpenSSL Toolkit <https://www.openssl.org/> en cryptografische software geschreven door Eric Young en UPnP software geschreven door Thomas Bernard.</translation> + <source>Use hierarchical deterministic key generation (HD) after BIP32. Only has effect during wallet creation/first start</source> + <translation>Gebruik hiërarchische deterministische sleutelgeneratie (HD) na BIP32. Dit heeft enkel effect bij het aanmaken van portemonnees of het eerste gebruik</translation> </message> <message> <source>Whitelisted peers cannot be DoS banned and their transactions are always relayed, even if they are already in the mempool, useful e.g. for a gateway</source> @@ -2196,7 +3251,7 @@ </message> <message> <source>You need to rebuild the database using -reindex to go back to unpruned mode. This will redownload the entire blockchain</source> - <translation>U moet de database herbouwen met -reindex om terug te gaan naar de ongesnoeide modus. Dit zal de gehele blokkketen opnieuw downloaden.</translation> + <translation>U moet de database herbouwen met -reindex om terug te gaan naar de ongesnoeide modus. Dit zal de gehele blokketen opnieuw downloaden.</translation> </message> <message> <source>(default: %u)</source> @@ -2299,10 +3354,6 @@ <translation>Transactiebedrag te klein</translation> </message> <message> - <source>Transaction amounts must be positive</source> - <translation>Transactiebedragen moeten positief zijn</translation> - </message> - <message> <source>Transaction too large for fee policy</source> <translation>De transactie is te groot voor het transactiekostenbeleid</translation> </message> @@ -2367,18 +3418,22 @@ <translation>-maxtxfee staat zeer hoog! Transactiekosten van de grootte kunnen worden gebruikt in een enkele transactie.</translation> </message> <message> - <source>-paytxfee is set very high! This is the transaction fee you will pay if you send a transaction.</source> - <translation>-paytxfee staat zeer hoog! Dit is de transactiekosten die u betaalt als u een transactie doet.</translation> - </message> - <message> <source>Do not keep transactions in the mempool longer than <n> hours (default: %u)</source> <translation>Bewaar transactie niet langer dan <n> uren in de geheugenpool (standaard: %u)</translation> </message> <message> + <source>Equivalent bytes per sigop in transactions for relay and mining (default: %u)</source> + <translation>Equivalent byter per sigop in transactions voor doorsturen en mijnen (standaard: %u)</translation> + </message> + <message> <source>Fees (in %s/kB) smaller than this are considered zero fee for transaction creation (default: %s)</source> <translation>Transactiekosten (in %s/kB) kleiner dan dit worden beschouwd dat geen transactiekosten in rekening worden gebracht voor transactiecreatie (standaard: %s)</translation> </message> <message> + <source>Force relay of transactions from whitelisted peers even if they violate local relay policy (default: %d)</source> + <translation>Forceer het doorsturen van transacties van goedgekeurde peers, zelfs wanneer deze niet voldoen aan de lokale doorstuurregels (standaard: %d)</translation> + </message> + <message> <source>How thorough the block verification of -checkblocks is (0-4, default: %u)</source> <translation>Hoe grondig de blokverificatie van -checkblocks is (0-4, standaard: %u)</translation> </message> @@ -2419,10 +3474,6 @@ <translation>Gebruik een aparte SOCKS5 proxy om verborgen diensten van Tor te bereiken (standaard: %s)</translation> </message> <message> - <source>Username and hashed password for JSON-RPC connections. The field <userpw> comes in the format: <USERNAME>:<SALT>$<HASH>. A canonical python script is included in share/rpcuser. This option can be specified multiple times</source> - <translation>Gebruikersnaam en gehasht wachtwoord voor JSON-RPC-verbindingen. De velden <userpw> is in het formaat: <GEBRUIKERSNAAM>:<SALT>$<HASH>. Een kanoniek Pythonscript is inbegrepen in de share/rpcuser. Deze optie kan meerdere keren worden meegegeven</translation> - </message> - <message> <source>Warning: Unknown block versions being mined! It's possible unknown rules are in effect</source> <translation>Waarschuwing: Onbekende blok versies worden gemined! Er zijn mogelijk onbekende regels in werking getreden</translation> </message> @@ -2491,8 +3542,8 @@ <translation>Stel sleutelpoelgrootte in op <n> (standaard: %u)</translation> </message> <message> - <source>Set minimum block size in bytes (default: %u)</source> - <translation>Stel minimum blokgrootte in in bytes (standaard: %u)</translation> + <source>Set maximum BIP141 block weight (default: %d)</source> + <translation>Zet het BIP141 maximum gewicht van een blok (standaard: %d)</translation> </message> <message> <source>Set the number of threads to service RPC calls (default: %d)</source> @@ -2515,6 +3566,10 @@ <translation>Besteed onbevestigd wisselgeld bij het doen van transacties (standaard: %u)</translation> </message> <message> + <source>Starting network threads...</source> + <translation>Netwerkthread starten...</translation> + </message> + <message> <source>Threshold for disconnecting misbehaving peers (default: %u)</source> <translation>Drempel om verbinding te verbreken naar zich misdragende peers (standaard: %u)</translation> </message> diff --git a/src/qt/locale/bitcoin_pam.ts b/src/qt/locale/bitcoin_pam.ts index 5351543338..f09978f6b0 100644 --- a/src/qt/locale/bitcoin_pam.ts +++ b/src/qt/locale/bitcoin_pam.ts @@ -33,7 +33,10 @@ <source>&Delete</source> <translation>&Ilako</translation> </message> -</context> + </context> +<context> + <name>AddressTableModel</name> + </context> <context> <name>AskPassphraseDialog</name> <message> @@ -52,7 +55,7 @@ <source>Repeat new passphrase</source> <translation>Pasibayuan ya ing bayung passphrase</translation> </message> -</context> + </context> <context> <name>BanTableModel</name> </context> @@ -222,7 +225,7 @@ <source>Wallet is <b>encrypted</b> and currently <b>locked</b></source> <translation>Maka-<b>encrypt</b> ya ing wallet at kasalukuyan yang maka-<b>locked</b></translation> </message> -</context> + </context> <context> <name>CoinControlDialog</name> <message> @@ -256,7 +259,7 @@ <source>&Address</source> <translation>&Address</translation> </message> -</context> + </context> <context> <name>FreespaceChecker</name> </context> @@ -291,6 +294,17 @@ </message> </context> <context> + <name>ModalOverlay</name> + <message> + <source>Form</source> + <translation>Form</translation> + </message> + <message> + <source>Last block time</source> + <translation>Tatauling oras na ning block</translation> + </message> + </context> +<context> <name>OpenURIDialog</name> </context> <context> @@ -412,6 +426,9 @@ </message> </context> <context> + <name>PaymentServer</name> + </context> +<context> <name>PeerTableModel</name> </context> <context> @@ -426,6 +443,12 @@ </message> </context> <context> + <name>QObject::QObject</name> + </context> +<context> + <name>QRImageWidget</name> + </context> +<context> <name>RPCConsole</name> <message> <source>N/A</source> @@ -511,6 +534,9 @@ </message> </context> <context> + <name>RecentRequestsTableModel</name> + </context> +<context> <name>SendCoinsDialog</name> <message> <source>Send Coins</source> @@ -552,7 +578,7 @@ <source>S&end</source> <translation>Ipadala</translation> </message> -</context> + </context> <context> <name>SendCoinsEntry</name> <message> @@ -589,6 +615,9 @@ </message> </context> <context> + <name>SendConfirmationDialog</name> + </context> +<context> <name>ShutdownWindow</name> </context> <context> @@ -657,7 +686,7 @@ <source>Reset all verify message fields</source> <translation>Ibalik king dati reng ngan fields na ning pamag beripikang mensayi</translation> </message> -</context> + </context> <context> <name>SplashScreen</name> <message> @@ -669,16 +698,34 @@ <name>TrafficGraphWidget</name> </context> <context> + <name>TransactionDesc</name> + </context> +<context> <name>TransactionDescDialog</name> <message> <source>This pane shows a detailed description of the transaction</source> <translation>Ining pane a ini magpakit yang detalyadung description ning transaksion</translation> </message> -</context> + </context> +<context> + <name>TransactionTableModel</name> + </context> +<context> + <name>TransactionView</name> + </context> <context> <name>UnitDisplayStatusBarControl</name> </context> <context> + <name>WalletFrame</name> + </context> +<context> + <name>WalletModel</name> + </context> +<context> + <name>WalletView</name> + </context> +<context> <name>bitcoin-core</name> <message> <source>Options:</source> @@ -705,10 +752,6 @@ <translation>Gumana king gulut bilang daemon at tumanggap commands</translation> </message> <message> - <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> - <translation>Tumanggap koneksion menibat king kilwal (default: 1 if no -proxy or -connect)</translation> - </message> - <message> <source>Bitcoin Core</source> <translation>Kapilubluban ning Bitcoin</translation> </message> @@ -717,10 +760,6 @@ <translation>Pipamilian king pamag-gawang block:</translation> </message> <message> - <source>Connect only to the specified node(s)</source> - <translation>Kumunekta mu king mepiling node(s)</translation> - </message> - <message> <source>Corrupted block database detected</source> <translation>Mekapansin lang me-corrupt a block database</translation> </message> diff --git a/src/qt/locale/bitcoin_pl.ts b/src/qt/locale/bitcoin_pl.ts index 09f748b83c..4634814070 100644 --- a/src/qt/locale/bitcoin_pl.ts +++ b/src/qt/locale/bitcoin_pl.ts @@ -41,6 +41,77 @@ <source>&Delete</source> <translation>&Usuń</translation> </message> + <message> + <source>Choose the address to send coins to</source> + <translation>Wybierz adres, na który chcesz wysłać monety</translation> + </message> + <message> + <source>Choose the address to receive coins with</source> + <translation>Wybierz adres, na który chcesz otrzymać monety</translation> + </message> + <message> + <source>C&hoose</source> + <translation>W&ybierz</translation> + </message> + <message> + <source>Sending addresses</source> + <translation>Adresy wysyłania</translation> + </message> + <message> + <source>Receiving addresses</source> + <translation>Adresy odbioru</translation> + </message> + <message> + <source>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source> + <translation>Tutaj znajdują się adresy Bitcoin na które wysyłasz płatności. Zawsze sprawdzaj ilość i adres odbiorcy przed wysyłką monet.</translation> + </message> + <message> + <source>These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction.</source> + <translation>To są twoje adresy Bitcoin do odbierania płatności. Zaleca się używanie nowych adresów odbiorczych dla każdej transakcji.</translation> + </message> + <message> + <source>&Copy Address</source> + <translation>&Kopiuj adres</translation> + </message> + <message> + <source>Copy &Label</source> + <translation>Kopiuj &Etykietę</translation> + </message> + <message> + <source>&Edit</source> + <translation>&Edytuj</translation> + </message> + <message> + <source>Export Address List</source> + <translation>Eksportuj listę adresów</translation> + </message> + <message> + <source>Comma separated file (*.csv)</source> + <translation>Plik *.CSV (dane rozdzielane przecinkami)</translation> + </message> + <message> + <source>Exporting Failed</source> + <translation>Eksportowanie nie powiodło się</translation> + </message> + <message> + <source>There was an error trying to save the address list to %1. Please try again.</source> + <translation>Wystąpił błąd podczas próby zapisu listy adresów do %1. Proszę spróbować ponownie.</translation> + </message> +</context> +<context> + <name>AddressTableModel</name> + <message> + <source>Label</source> + <translation>Etykieta</translation> + </message> + <message> + <source>Address</source> + <translation>Adres</translation> + </message> + <message> + <source>(no label)</source> + <translation>(brak etykiety)</translation> + </message> </context> <context> <name>AskPassphraseDialog</name> @@ -60,6 +131,94 @@ <source>Repeat new passphrase</source> <translation>Powtórz nowe hasło</translation> </message> + <message> + <source>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>.</source> + <translation>Wprowadź nowe hasło do portfela.<br/>Proszę używać hasła złożonego z <b>10 lub więcej losowych znaków</b> albo <b>8 lub więcej słów.</b></translation> + </message> + <message> + <source>Encrypt wallet</source> + <translation>Zaszyfruj portfel</translation> + </message> + <message> + <source>This operation needs your wallet passphrase to unlock the wallet.</source> + <translation>Ta operacja wymaga hasła do portfela aby odblokować portfel.</translation> + </message> + <message> + <source>Unlock wallet</source> + <translation>Odblokuj portfel</translation> + </message> + <message> + <source>This operation needs your wallet passphrase to decrypt the wallet.</source> + <translation>Ta operacja wymaga hasła portfela, aby go odszyfrować.</translation> + </message> + <message> + <source>Decrypt wallet</source> + <translation>Odszyfruj portfel</translation> + </message> + <message> + <source>Change passphrase</source> + <translation>Zmień hasło</translation> + </message> + <message> + <source>Enter the old passphrase and new passphrase to the wallet.</source> + <translation>Podaj stare i nowe hasło do portfela.</translation> + </message> + <message> + <source>Confirm wallet encryption</source> + <translation>Potwierdź szyfrowanie portfela</translation> + </message> + <message> + <source>Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR BITCOINS</b>!</source> + <translation>Uwaga: jeśli zaszyfrujesz swój portfel i zgubisz hasło <b>STRACISZ WSZYSTKIE SWOJE BITCOINY</b>!</translation> + </message> + <message> + <source>Are you sure you wish to encrypt your wallet?</source> + <translation>Jesteś pewien, że chcesz zaszyfrować swój portfel?</translation> + </message> + <message> + <source>Wallet encrypted</source> + <translation>Portfel zaszyfrowany</translation> + </message> + <message> + <source>%1 will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your bitcoins from being stolen by malware infecting your computer.</source> + <translation>%1 zamknie się aby dokończyć proces szyfrowania. Pamiętaj, że szyfrowanie portfela nie zabezpiecza w pełni Twoich bitcoinów przed kradzieżą przez wirusy lub trojany mogące zainfekować Twój komputer.</translation> + </message> + <message> + <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source> + <translation>WAŻNE: Wszystkie wykonane wcześniej kopie pliku portfela powinny być zamienione na nowe, szyfrowane pliki. Z powodów bezpieczeństwa, poprzednie kopie nieszyfrowanych plików portfela staną się bezużyteczne jak tylko zaczniesz korzystać z nowego, szyfrowanego portfela.</translation> + </message> + <message> + <source>Wallet encryption failed</source> + <translation>Szyfrowanie portfela nie powiodło się</translation> + </message> + <message> + <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source> + <translation>Szyfrowanie portfela nie powiodło się z powodu wewnętrznego błędu. Twój portfel nie został zaszyfrowany.</translation> + </message> + <message> + <source>The supplied passphrases do not match.</source> + <translation>Podane hasła nie są takie same.</translation> + </message> + <message> + <source>Wallet unlock failed</source> + <translation>Odblokowanie portfela nie powiodło się</translation> + </message> + <message> + <source>The passphrase entered for the wallet decryption was incorrect.</source> + <translation>Wprowadzone hasło do odszyfrowania portfela jest niepoprawne.</translation> + </message> + <message> + <source>Wallet decryption failed</source> + <translation>Odszyfrowanie portfela nie powiodło się</translation> + </message> + <message> + <source>Wallet passphrase was successfully changed.</source> + <translation>Hasło do portfela zostało pomyślnie zmienione.</translation> + </message> + <message> + <source>Warning: The Caps Lock key is on!</source> + <translation>Ostrzeżenie: Caps Lock jest włączony!</translation> + </message> </context> <context> <name>BanTableModel</name> @@ -270,34 +429,10 @@ <source>Processing blocks on disk...</source> <translation>Przetwarzanie blocks on disk...</translation> </message> - <message> - <source>No block source available...</source> - <translation>Brak dostępnych źródeł bloków...</translation> - </message> <message numerus="yes"> <source>Processed %n block(s) of transaction history.</source> <translation><numerusform>Przetworzono %n bloków historii transakcji.</numerusform><numerusform>Przetworzono %n bloków historii transakcji.</numerusform><numerusform>Przetworzono %n bloków historii transakcji.</numerusform></translation> </message> - <message numerus="yes"> - <source>%n hour(s)</source> - <translation><numerusform>%n godzin</numerusform><numerusform>%n godzin</numerusform><numerusform>%n godzin</numerusform></translation> - </message> - <message numerus="yes"> - <source>%n day(s)</source> - <translation><numerusform>dzień</numerusform><numerusform>%n dni</numerusform><numerusform>%n dni</numerusform></translation> - </message> - <message numerus="yes"> - <source>%n week(s)</source> - <translation><numerusform>%n tygodni</numerusform><numerusform>%n tygodni</numerusform><numerusform>%n tygodni</numerusform></translation> - </message> - <message> - <source>%1 and %2</source> - <translation>%1 i %2</translation> - </message> - <message numerus="yes"> - <source>%n year(s)</source> - <translation><numerusform>%n lat</numerusform><numerusform>%n lat</numerusform><numerusform>%n lat</numerusform></translation> - </message> <message> <source>%1 behind</source> <translation>%1 za</translation> @@ -384,7 +519,7 @@ <source>Wallet is <b>encrypted</b> and currently <b>locked</b></source> <translation>Portfel jest <b>zaszyfrowany</b> i obecnie <b>zablokowany</b></translation> </message> -</context> + </context> <context> <name>CoinControlDialog</name> <message> @@ -404,10 +539,6 @@ <translation>Kwota:</translation> </message> <message> - <source>Priority:</source> - <translation>Priorytet:</translation> - </message> - <message> <source>Fee:</source> <translation>Opłata:</translation> </message> @@ -460,8 +591,84 @@ <translation>Potwierdzony</translation> </message> <message> - <source>Priority</source> - <translation>Priorytet</translation> + <source>Copy address</source> + <translation>Kopiuj adres</translation> + </message> + <message> + <source>Copy label</source> + <translation>Kopiuj etykietę</translation> + </message> + <message> + <source>Copy amount</source> + <translation>Kopiuj kwotę</translation> + </message> + <message> + <source>Copy transaction ID</source> + <translation>Skopiuj ID transakcji</translation> + </message> + <message> + <source>Lock unspent</source> + <translation>Zablokuj niewydane</translation> + </message> + <message> + <source>Unlock unspent</source> + <translation>Odblokuj niewydane</translation> + </message> + <message> + <source>Copy quantity</source> + <translation>Skopiuj ilość</translation> + </message> + <message> + <source>Copy fee</source> + <translation>Skopiuj prowizję</translation> + </message> + <message> + <source>Copy after fee</source> + <translation>Skopiuj ilość po opłacie</translation> + </message> + <message> + <source>Copy bytes</source> + <translation>Skopiuj ilość bajtów</translation> + </message> + <message> + <source>Copy dust</source> + <translation>Kopiuj pył</translation> + </message> + <message> + <source>Copy change</source> + <translation>Skopiuj resztę</translation> + </message> + <message> + <source>(%1 locked)</source> + <translation>(%1 zablokowane)</translation> + </message> + <message> + <source>yes</source> + <translation>tak</translation> + </message> + <message> + <source>no</source> + <translation>nie</translation> + </message> + <message> + <source>This label turns red if any recipient receives an amount smaller than the current dust threshold.</source> + <translation>Ta etykieta staje się czerwona jeżeli którykolwiek odbiorca otrzymuje kwotę mniejszą niż obecny próg pyłu.</translation> + </message> + <message> + <source>Can vary +/- %1 satoshi(s) per input.</source> + <translation>Waha się +/- %1 satoshi na wejście.</translation> + </message> + <message> + <source>(no label)</source> + <translation>(brak etykiety)</translation> + </message> + <message> + <source>change from %1 (%2)</source> + <translation>reszta z %1 (%2)</translation> + </message> + <message> + <source>(change)</source> + <translation>(reszta)</translation> </message> </context> <context> @@ -486,6 +693,30 @@ <source>&Address</source> <translation>&Adres</translation> </message> + <message> + <source>New receiving address</source> + <translation>Nowy adres odbiorczy</translation> + </message> + <message> + <source>New sending address</source> + <translation>Nowy adres wysyłania</translation> + </message> + <message> + <source>Edit receiving address</source> + <translation>Zmień adres odbioru</translation> + </message> + <message> + <source>Edit sending address</source> + <translation>Zmień adres wysyłania</translation> + </message> + <message> + <source>Could not unlock wallet.</source> + <translation>Nie można było odblokować portfela.</translation> + </message> + <message> + <source>New key generation failed.</source> + <translation>Generowanie nowego klucza nie powiodło się.</translation> + </message> </context> <context> <name>FreespaceChecker</name> @@ -609,6 +840,49 @@ </message> </context> <context> + <name>ModalOverlay</name> + <message> + <source>Form</source> + <translation>Formularz</translation> + </message> + <message> + <source>Number of blocks left</source> + <translation>Pozostało bloków</translation> + </message> + <message> + <source>Unknown...</source> + <translation>Nienznane...</translation> + </message> + <message> + <source>Last block time</source> + <translation>Czas ostatniego bloku</translation> + </message> + <message> + <source>Progress</source> + <translation>Postęp</translation> + </message> + <message> + <source>Progress increase per hour</source> + <translation>Przyrost postępu na godzinę</translation> + </message> + <message> + <source>calculating...</source> + <translation>obliczanie...</translation> + </message> + <message> + <source>Estimated time left until synced</source> + <translation>Przewidywany czas zakończenia synchronizacji</translation> + </message> + <message> + <source>Hide</source> + <translation>Ukryj</translation> + </message> + <message> + <source>Unknown. Syncing Headers (%1)...</source> + <translation>Nieznane. Synchronizowanie nagłówków (%1)...</translation> + </message> +</context> +<context> <name>OpenURIDialog</name> <message> <source>Open URI</source> @@ -626,6 +900,10 @@ <source>Select payment request file</source> <translation>Otwórz żądanie zapłaty z pliku</translation> </message> + <message> + <source>Select payment request file to open</source> + <translation>Wybierz plik żądania zapłaty do otwarcia</translation> + </message> </context> <context> <name>OptionsDialog</name> @@ -938,6 +1216,57 @@ </message> </context> <context> + <name>PaymentServer</name> + <message> + <source>Payment request error</source> + <translation>Błąd żądania płatności</translation> + </message> + <message> + <source>Cannot start bitcoin: click-to-pay handler</source> + <translation>Nie można uruchomić protokołu bitcoin: kliknij-by-zapłacić</translation> + </message> + <message> + <source>URI handling</source> + <translation>Obsługa URI</translation> + </message> + <message> + <source>Payment request expired.</source> + <translation>Żądanie płatności upłynęło.</translation> + </message> + <message> + <source>Payment request is not initialized.</source> + <translation>Żądanie płatności nie jest zainicjowane.</translation> + </message> + <message> + <source>Unverified payment requests to custom payment scripts are unsupported.</source> + <translation>Niezweryfikowane żądania płatności do własnych skryptów płatności są niewspierane.</translation> + </message> + <message> + <source>Invalid payment request.</source> + <translation>Nieprawidłowe żądanie płatności</translation> + </message> + <message> + <source>Refund from %1</source> + <translation>Zwrot z %1</translation> + </message> + <message> + <source>Payment request cannot be parsed!</source> + <translation>Żądanie płatności nie może zostać przetworzone.</translation> + </message> + <message> + <source>Bad response from server %1</source> + <translation>Błędna odpowiedź z serwera %1</translation> + </message> + <message> + <source>Network request error</source> + <translation>Błąd żądania sieci</translation> + </message> + <message> + <source>Payment acknowledged</source> + <translation>Płatność potwierdzona</translation> + </message> +</context> +<context> <name>PeerTableModel</name> <message> <source>User Agent</source> @@ -948,8 +1277,12 @@ <translation>Węzeł/Usługi</translation> </message> <message> - <source>Ping Time</source> - <translation>Czas odpowiedzi</translation> + <source>NodeId</source> + <translation>Identyfikator węzła</translation> + </message> + <message> + <source>Ping</source> + <translation>Ping</translation> </message> </context> <context> @@ -990,6 +1323,44 @@ <source>%1 ms</source> <translation>%1 ms</translation> </message> + <message numerus="yes"> + <source>%n second(s)</source> + <translation><numerusform>%n sekunda</numerusform><numerusform>%n sekund</numerusform><numerusform>%n sekund</numerusform></translation> + </message> + <message numerus="yes"> + <source>%n minute(s)</source> + <translation><numerusform>%n minuta</numerusform><numerusform>%n minut</numerusform><numerusform>%n minut</numerusform></translation> + </message> + <message> + <source>%1 and %2</source> + <translation>%1 i %2</translation> + </message> + </context> +<context> + <name>QObject::QObject</name> + <message> + <source>Error: %1</source> + <translation>Błąd: %1</translation> + </message> +</context> +<context> + <name>QRImageWidget</name> + <message> + <source>&Save Image...</source> + <translation>&Zapisz obraz...</translation> + </message> + <message> + <source>&Copy Image</source> + <translation>&Kopiuj obraz</translation> + </message> + <message> + <source>Save QR Code</source> + <translation>Zapisz Kod QR</translation> + </message> + <message> + <source>PNG Image (*.png)</source> + <translation>Obraz PNG (*.png)</translation> + </message> </context> <context> <name>RPCConsole</name> @@ -1142,10 +1513,18 @@ <translation>Czas odpowiedzi</translation> </message> <message> + <source>The duration of a currently outstanding ping.</source> + <translation>Czas trwania nadmiarowego pingu</translation> + </message> + <message> <source>Ping Wait</source> <translation>Czas odpowiedzi</translation> </message> <message> + <source>Min Ping</source> + <translation>Minimalny czas odpowiedzi</translation> + </message> + <message> <source>Time Offset</source> <translation>Przesunięcie czasu</translation> </message> @@ -1190,14 +1569,6 @@ <translation>Wyczyść konsolę</translation> </message> <message> - <source>&Disconnect Node</source> - <translation>Odłącz Nod</translation> - </message> - <message> - <source>Ban Node for</source> - <translation>Blokuj węzeł na okres</translation> - </message> - <message> <source>1 &hour</source> <translation>1 &godzina</translation> </message> @@ -1214,8 +1585,16 @@ <translation>1 &rok</translation> </message> <message> - <source>&Unban Node</source> - <translation>Odblokuj węzeł</translation> + <source>&Disconnect</source> + <translation>&Rozłącz</translation> + </message> + <message> + <source>Ban for</source> + <translation>Zbanuj na</translation> + </message> + <message> + <source>&Unban</source> + <translation>&Odblokuj</translation> </message> <message> <source>Welcome to the %1 RPC console.</source> @@ -1348,6 +1727,22 @@ <source>Remove</source> <translation>Usuń</translation> </message> + <message> + <source>Copy URI</source> + <translation>Kopiuj URI:</translation> + </message> + <message> + <source>Copy label</source> + <translation>Kopiuj etykietę</translation> + </message> + <message> + <source>Copy message</source> + <translation>Kopiuj wiadomość</translation> + </message> + <message> + <source>Copy amount</source> + <translation>Kopiuj kwotę</translation> + </message> </context> <context> <name>ReceiveRequestDialog</name> @@ -1367,6 +1762,61 @@ <source>&Save Image...</source> <translation>&Zapisz obraz...</translation> </message> + <message> + <source>Request payment to %1</source> + <translation>Zażądaj płatności do %1</translation> + </message> + <message> + <source>Payment information</source> + <translation>Informacje o płatności</translation> + </message> + <message> + <source>URI</source> + <translation>URI</translation> + </message> + <message> + <source>Address</source> + <translation>Adres</translation> + </message> + <message> + <source>Amount</source> + <translation>Kwota</translation> + </message> + <message> + <source>Label</source> + <translation>Etykieta</translation> + </message> + <message> + <source>Message</source> + <translation>Wiadomość</translation> + </message> + </context> +<context> + <name>RecentRequestsTableModel</name> + <message> + <source>Date</source> + <translation>Data</translation> + </message> + <message> + <source>Label</source> + <translation>Etykieta</translation> + </message> + <message> + <source>Message</source> + <translation>Wiadomość</translation> + </message> + <message> + <source>(no label)</source> + <translation>(brak etykiety)</translation> + </message> + <message> + <source>(no message)</source> + <translation>(brak wiadomości)</translation> + </message> + <message> + <source>Requested</source> + <translation>Zażądano</translation> + </message> </context> <context> <name>SendCoinsDialog</name> @@ -1403,10 +1853,6 @@ <translation>Kwota:</translation> </message> <message> - <source>Priority:</source> - <translation>Priorytet:</translation> - </message> - <message> <source>Fee:</source> <translation>Opłata:</translation> </message> @@ -1475,10 +1921,6 @@ <translation>(Sprytne opłaty nie są jeszcze zainicjowane. Trwa to zwykle kilka bloków...)</translation> </message> <message> - <source>Confirmation time:</source> - <translation>Czas potwierdzenia:</translation> - </message> - <message> <source>normal</source> <translation>normalnie</translation> </message> @@ -1503,6 +1945,10 @@ <translation>Pył:</translation> </message> <message> + <source>Confirmation time target:</source> + <translation>Docelowy czas potwierdzenia:</translation> + </message> + <message> <source>Clear &All</source> <translation>Wyczyść &wszystko</translation> </message> @@ -1518,6 +1964,70 @@ <source>S&end</source> <translation>Wy&syłka</translation> </message> + <message> + <source>Copy quantity</source> + <translation>Skopiuj ilość</translation> + </message> + <message> + <source>Copy amount</source> + <translation>Kopiuj kwotę</translation> + </message> + <message> + <source>Copy fee</source> + <translation>Skopiuj prowizję</translation> + </message> + <message> + <source>Copy after fee</source> + <translation>Skopiuj ilość po opłacie</translation> + </message> + <message> + <source>Copy bytes</source> + <translation>Skopiuj ilość bajtów</translation> + </message> + <message> + <source>Copy dust</source> + <translation>Kopiuj pył</translation> + </message> + <message> + <source>Copy change</source> + <translation>Skopiuj resztę</translation> + </message> + <message> + <source>%1 to %2</source> + <translation>%1 do %2</translation> + </message> + <message> + <source>or</source> + <translation>lub</translation> + </message> + <message> + <source>The amount to pay must be larger than 0.</source> + <translation>Kwota do zapłacenia musi być większa od 0.</translation> + </message> + <message> + <source>Transaction creation failed!</source> + <translation>Utworzenie transakcji nie powiodło się!</translation> + </message> + <message> + <source>Payment request expired.</source> + <translation>Żądanie płatności upłynęło.</translation> + </message> + <message> + <source>Pay only the required fee of %1</source> + <translation>Zapłać tylko wymaganą opłatę w wysokości %1</translation> + </message> + <message> + <source>Warning: Invalid Bitcoin address</source> + <translation>Ostrzeżenie: nieprawidłowy adres Bitcoin</translation> + </message> + <message> + <source>Warning: Unknown change address</source> + <translation>Ostrzeżenie: Nieznany adres reszty</translation> + </message> + <message> + <source>(no label)</source> + <translation>(brak etykiety)</translation> + </message> </context> <context> <name>SendCoinsEntry</name> @@ -1597,6 +2107,13 @@ <source>Memo:</source> <translation>Notatka:</translation> </message> + </context> +<context> + <name>SendConfirmationDialog</name> + <message> + <source>Yes</source> + <translation>Tak</translation> + </message> </context> <context> <name>ShutdownWindow</name> @@ -1696,7 +2213,23 @@ Zwróć uwagę, że poprawnie zweryfikowana wiadomość potwierdza to, że nadaw <source>Reset all verify message fields</source> <translation>Resetuje wszystkie pola weryfikacji wiadomości</translation> </message> -</context> + <message> + <source>Wallet unlock was cancelled.</source> + <translation>Odblokowanie portfela zostało anulowane.</translation> + </message> + <message> + <source>Private key for the entered address is not available.</source> + <translation>Klucz prywatny dla podanego adresu nie jest dostępny.</translation> + </message> + <message> + <source>Message signing failed.</source> + <translation>Podpisanie wiadomości nie powiodło się.</translation> + </message> + <message> + <source>Message signed.</source> + <translation>Wiadomość podpisana.</translation> + </message> + </context> <context> <name>SplashScreen</name> <message> @@ -1712,12 +2245,173 @@ Zwróć uwagę, że poprawnie zweryfikowana wiadomość potwierdza to, że nadaw </message> </context> <context> + <name>TransactionDesc</name> + <message> + <source>Date</source> + <translation>Data</translation> + </message> + <message> + <source>Source</source> + <translation>Źródło</translation> + </message> + <message> + <source>Generated</source> + <translation>Wygenerowano</translation> + </message> + <message> + <source>From</source> + <translation>Od</translation> + </message> + <message> + <source>unknown</source> + <translation>nieznane</translation> + </message> + <message> + <source>To</source> + <translation>Do</translation> + </message> + <message> + <source>own address</source> + <translation>własny adres</translation> + </message> + <message> + <source>watch-only</source> + <translation>tylko-obserwowany</translation> + </message> + <message> + <source>label</source> + <translation>etykieta</translation> + </message> + <message> + <source>Message</source> + <translation>Wiadomość</translation> + </message> + <message> + <source>Amount</source> + <translation>Kwota</translation> + </message> + </context> +<context> <name>TransactionDescDialog</name> <message> <source>This pane shows a detailed description of the transaction</source> <translation>Ten panel pokazuje szczegółowy opis transakcji</translation> </message> -</context> + </context> +<context> + <name>TransactionTableModel</name> + <message> + <source>Date</source> + <translation>Data</translation> + </message> + <message> + <source>Label</source> + <translation>Etykieta</translation> + </message> + <message> + <source>Offline</source> + <translation>Offline</translation> + </message> + <message> + <source>Unconfirmed</source> + <translation>Niepotwierdzone</translation> + </message> + <message> + <source>Abandoned</source> + <translation>Porzucone</translation> + </message> + <message> + <source>Conflicted</source> + <translation>Skonfliktowane</translation> + </message> + <message> + <source>Generated but not accepted</source> + <translation>Wygenerowane ale nie zaakceptowane</translation> + </message> + <message> + <source>Sent to</source> + <translation>Wysłane do</translation> + </message> + <message> + <source>watch-only</source> + <translation>tylko-obserwowany</translation> + </message> + <message> + <source>(no label)</source> + <translation>(brak etykiety)</translation> + </message> + </context> +<context> + <name>TransactionView</name> + <message> + <source>All</source> + <translation>Wszystko</translation> + </message> + <message> + <source>Today</source> + <translation>Dzisiaj</translation> + </message> + <message> + <source>This week</source> + <translation>W tym tygodniu</translation> + </message> + <message> + <source>This month</source> + <translation>W tym miesiącu</translation> + </message> + <message> + <source>Last month</source> + <translation>W zeszłym miesiącu</translation> + </message> + <message> + <source>This year</source> + <translation>W tym roku</translation> + </message> + <message> + <source>Range...</source> + <translation>Zakres...</translation> + </message> + <message> + <source>Sent to</source> + <translation>Wysłane do</translation> + </message> + <message> + <source>Copy address</source> + <translation>Kopiuj adres</translation> + </message> + <message> + <source>Copy label</source> + <translation>Kopiuj etykietę</translation> + </message> + <message> + <source>Copy amount</source> + <translation>Kopiuj kwotę</translation> + </message> + <message> + <source>Copy transaction ID</source> + <translation>Skopiuj ID transakcji</translation> + </message> + <message> + <source>Comma separated file (*.csv)</source> + <translation>Plik *.CSV (dane rozdzielane przecinkami)</translation> + </message> + <message> + <source>Date</source> + <translation>Data</translation> + </message> + <message> + <source>Label</source> + <translation>Etykieta</translation> + </message> + <message> + <source>Address</source> + <translation>Adres</translation> + </message> + <message> + <source>Exporting Failed</source> + <translation>Eksportowanie nie powiodło się</translation> + </message> + </context> <context> <name>UnitDisplayStatusBarControl</name> <message> @@ -1726,6 +2420,15 @@ Zwróć uwagę, że poprawnie zweryfikowana wiadomość potwierdza to, że nadaw </message> </context> <context> + <name>WalletFrame</name> + </context> +<context> + <name>WalletModel</name> + </context> +<context> + <name>WalletView</name> + </context> +<context> <name>bitcoin-core</name> <message> <source>Options:</source> @@ -1756,6 +2459,14 @@ Zwróć uwagę, że poprawnie zweryfikowana wiadomość potwierdza to, że nadaw <translation>Przycinanie skonfigurowano poniżej minimalnych %d MiB. Proszę użyć wyższej liczby.</translation> </message> <message> + <source>Prune: last wallet synchronisation goes beyond pruned data. You need to -reindex (download the whole blockchain again in case of pruned node)</source> + <translation>Prune: ostatnia synchronizacja portfela jest za danymi. Muszisz -reindexować (pobrać cały ciąg bloków ponownie w przypadku przyciętego węzła)</translation> + </message> + <message> + <source>Rescans are not possible in pruned mode. You will need to use -reindex which will download the whole blockchain again.</source> + <translation>Ponowne skanowanie nie jest możliwe w trybie przycinania. Będzie trzeba użyć -reindex, co pobierze ponownie cały łańcuch bloków.</translation> + </message> + <message> <source>Error: A fatal internal error occurred, see debug.log for details</source> <translation>Błąd: Wystąpił fatalny błąd wewnętrzny, sprawdź szczegóły w debug.log</translation> </message> @@ -1776,10 +2487,6 @@ Zwróć uwagę, że poprawnie zweryfikowana wiadomość potwierdza to, że nadaw <translation>Uruchomienie serwera HTTP nie powiodło się. Zobacz dziennik debugowania, aby uzyskać więcej szczegółów.</translation> </message> <message> - <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> - <translation>Akceptuj połączenia z zewnątrz (domyślnie: 1 jeśli nie ustawiono -proxy lub -connect)</translation> - </message> - <message> <source>Bitcoin Core</source> <translation>Rdzeń Bitcoina</translation> </message> @@ -1788,8 +2495,12 @@ Zwróć uwagę, że poprawnie zweryfikowana wiadomość potwierdza to, że nadaw <translation>Deweloperzy %s</translation> </message> <message> - <source>-fallbackfee is set very high! This is the transaction fee you may pay when fee estimates are not available.</source> - <translation>-fallbackfee ma ustawioną bardzo dużą wartość! Jest to prowizja za transakcje, którą możesz zapłacić gdy oszacowanie opłaty jest niemożliwe.</translation> + <source>A fee rate (in %s/kB) that will be used when fee estimation has insufficient data (default: %s)</source> + <translation>Stawka prowizji (w %s/kB), która będzie użyta, gdy oszacowane dane o prowizjach nie będą wystarczające (domyślnie: %s)</translation> + </message> + <message> + <source>Accept relayed transactions received from whitelisted peers even when not relaying transactions (default: %d)</source> + <translation>Accept relayed transactions received from whitelisted peers even when not relaying transactions (default: %d)</translation> </message> <message> <source>Bind to given address and always listen on it. Use [host]:port notation for IPv6</source> @@ -1804,10 +2515,6 @@ Zwróć uwagę, że poprawnie zweryfikowana wiadomość potwierdza to, że nadaw <translation>Usuwa wszystkie transakcje w portfelu i tylko odtwarza te części z łańcucha bloków poprzez -rescan przy starcie</translation> </message> <message> - <source>Distributed under the MIT software license, see the accompanying file COPYING or <http://www.opensource.org/licenses/mit-license.php>.</source> - <translation>Rozprowadzane na licencji MIT, zobacz dołączony plik COPYING lub <http://www.opensource.org/licenses/mit-license.php>.</translation> - </message> - <message> <source>Error reading %s! All keys read correctly, but transaction data or address book entries might be missing or incorrect.</source> <translation>Błąd odczytu %s! Wszystkie klucze zostały odczytane poprawnie, ale może brakować danych transakcji lub wpisów w książce adresowej, lub mogą one być nieprawidłowe.</translation> </message> @@ -1816,10 +2523,6 @@ Zwróć uwagę, że poprawnie zweryfikowana wiadomość potwierdza to, że nadaw <translation>Wykonaj polecenie, kiedy transakcja portfela ulegnie zmianie (%s w poleceniu zostanie zastąpione przez TxID)</translation> </message> <message> - <source>Force relay of transactions from whitelisted peers even they violate local relay policy (default: %d)</source> - <translation>Wymuś przekazywanie transakcji od osób z białej listy, nawet jeśli narusza to lokalną politykę przekazywania (default: %d)</translation> - </message> - <message> <source>Please check that your computer's date and time are correct! If your clock is wrong, %s will not work properly.</source> <translation>Proszę sprawdzić czy data i czas na Twoim komputerze są poprawne! Jeżeli ustawienia zegara będą złe, %s nie będzie działał prawidłowo.</translation> </message> @@ -1828,26 +2531,10 @@ Zwróć uwagę, że poprawnie zweryfikowana wiadomość potwierdza to, że nadaw <translation>Ustaw liczbę wątków skryptu weryfikacyjnego (%u do %d, 0 = auto, <0 = zostaw tyle rdzeni wolnych, domyślnie: %d)</translation> </message> <message> - <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source> - <translation>To jest testowa wersja - używaj na własne ryzyko - nie używaj do wykopywania oraz przy aplikacjach kupieckich</translation> - </message> - <message> <source>Use UPnP to map the listening port (default: 1 when listening and no -proxy)</source> <translation>Użyj UPnP do mapowania portu nasłuchu (domyślnie: 1 gdy nasłuchuje i brak -proxy)</translation> </message> <message> - <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source> - <translation>Ostrzeżenie: Sieć nie wydaje się w pełni zgodna! Niektórzy górnicy wydają się doświadczać problemów.</translation> - </message> - <message> - <source>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</source> - <translation>Uwaga: Wygląda na to, że nie ma pełnej zgodności z naszymi peerami! Możliwe, że potrzebujesz aktualizacji bądź inne węzły jej potrzebują</translation> - </message> - <message> - <source>Whitelist peers connecting from the given netmask or IP address. Can be specified multiple times.</source> - <translation>Dodawaj do białej listy węzły łączące się z podanej maski sieciowej lub adresu IP. Może być określona kilka razy.</translation> - </message> - <message> <source>You need to rebuild the database using -reindex-chainstate to change -txindex</source> <translation>Musisz przebudować bazę używając -reindex-chainstate aby zmienić -txindex</translation> </message> @@ -1864,6 +2551,10 @@ Zwróć uwagę, że poprawnie zweryfikowana wiadomość potwierdza to, że nadaw <translation><category> mogą być:</translation> </message> <message> + <source>Append comment to the user agent string</source> + <translation>Dodaj komentarz do pola user agent</translation> + </message> + <message> <source>Attempt to recover private keys from a corrupt wallet on startup</source> <translation>Próbuj odzyskać klucze prywatne z uszkodzonego portfela podczas uruchamiania.</translation> </message> @@ -1872,8 +2563,8 @@ Zwróć uwagę, że poprawnie zweryfikowana wiadomość potwierdza to, że nadaw <translation>Opcje tworzenia bloku:</translation> </message> <message> - <source>Connect only to the specified node(s)</source> - <translation>Łącz się tylko do wskazanego węzła/węzłów</translation> + <source>Cannot resolve -%s address: '%s'</source> + <translation>Nie można rozpoznać -%s adresu: '%s'</translation> </message> <message> <source>Connection options:</source> @@ -1968,6 +2659,14 @@ Zwróć uwagę, że poprawnie zweryfikowana wiadomość potwierdza to, że nadaw <translation>Utrzymuj obszar pamięci dla transakcji poniżej <n> MB (default: %u)</translation> </message> <message> + <source>Loading banlist...</source> + <translation>Ładowanie listy zablokowanych...</translation> + </message> + <message> + <source>Location of the auth cookie (default: data dir)</source> + <translation>Lokalizacja autoryzacyjnego pliku cookie (domyślnie: ścieżka danych)</translation> + </message> + <message> <source>Not enough file descriptors available.</source> <translation>Brak wystarczającej liczby deskryptorów plików. </translation> </message> @@ -2012,6 +2711,10 @@ Zwróć uwagę, że poprawnie zweryfikowana wiadomość potwierdza to, że nadaw <translation>Określ plik portfela (w obrębie folderu danych)</translation> </message> <message> + <source>The source code is available from %s.</source> + <translation>Kod źródłowy dostępny jest z %s.</translation> + </message> + <message> <source>Unable to bind to %s on this computer. %s is probably already running.</source> <translation>Nie można przywiązać do %s na tym komputerze. %s prawdopodobnie jest już uruchomiony.</translation> </message> @@ -2088,6 +2791,10 @@ Zwróć uwagę, że poprawnie zweryfikowana wiadomość potwierdza to, że nadaw <translation>Uruchom polecenie przy otrzymaniu odpowiedniego powiadomienia lub gdy zobaczymy naprawdę długie rozgałęzienie (%s w poleceniu jest podstawiane za komunikat)</translation> </message> <message> + <source>Fees (in %s/kB) smaller than this are considered zero fee for relaying, mining and transaction creation (default: %s)</source> + <translation>Opłaty (w %s/Kb) mniejsze niż ta, będą traktowane jako zerowe przy tworzeniu, przesyłaniu i zatwierdzaniu transakcji (domyślnie: %s)</translation> + </message> + <message> <source>If paytxfee is not set, include enough fee so transactions begin confirmation on average within n blocks (default: %u)</source> <translation>Jeżeli nie ustawiono paytxfee, dołącz wystarczająca opłatę, aby transakcja mogła zostać zatwierdzona w ciągu średniej ilości n bloków (domyślnie: %u)</translation> </message> @@ -2100,10 +2807,6 @@ Zwróć uwagę, że poprawnie zweryfikowana wiadomość potwierdza to, że nadaw <translation>Maksymalny rozmiar danych w transakcji przekazującej dane które przekazujemy i wydobywamy (domyślnie: %u)</translation> </message> <message> - <source>Query for peer addresses via DNS lookup, if low on addresses (default: 1 unless -connect)</source> - <translation>Wyszukaj adresy węzłów wykorzystując zapytanie DNS, jeżeli masz mało adresów (domyślnie: 1 jeśli nie użyto -connect)</translation> - </message> - <message> <source>Set maximum size of high-priority/low-fee transactions in bytes (default: %d)</source> <translation>Ustaw maksymalny rozmiar transakcji o wysokim priorytecie/niskiej prowizji w bajtach (domyślnie: %d)</translation> </message> @@ -2112,8 +2815,8 @@ Zwróć uwagę, że poprawnie zweryfikowana wiadomość potwierdza to, że nadaw <translation>Zbyt niska kwota transakcji do wysłania po odjęciu opłaty</translation> </message> <message> - <source>This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit <https://www.openssl.org/> and cryptographic software written by Eric Young and UPnP software written by Thomas Bernard.</source> - <translation>Program ten zawiera oprogramowanie stworzone przez OpenSSL Project do użycia w OpensSSL Toolkit <https://www.openssl.org/>, oprogramowanie kryptograficzne napisane przez Eric Young oraz oprogramowanie UPnP napisane przez Thomas Bernard.</translation> + <source>Use hierarchical deterministic key generation (HD) after BIP32. Only has effect during wallet creation/first start</source> + <translation>Użyj hierarchicznej deterministycznej metody generowania kluczy (HD) zgodnie z BIP32. Ma znaczenie tylko podczas tworzenia portfela/pierwszego startu.</translation> </message> <message> <source>Whitelisted peers cannot be DoS banned and their transactions are always relayed, even if they are already in the mempool, useful e.g. for a gateway</source> @@ -2212,12 +2915,12 @@ Zwróć uwagę, że poprawnie zweryfikowana wiadomość potwierdza to, że nadaw <translation>Hasło zabezpieczające portu kontrolnego Tora (domyślnie: puste)</translation> </message> <message> - <source>Transaction amount too small</source> - <translation>Zbyt niska kwota transakcji </translation> + <source>Tor control port to use if onion listening enabled (default: %s)</source> + <translation>Port kontrolny sieci Tor jeśli onion listening jest włączone (domyślnie: %s)</translation> </message> <message> - <source>Transaction amounts must be positive</source> - <translation>Kwota transakcji musi być dodatnia</translation> + <source>Transaction amount too small</source> + <translation>Zbyt niska kwota transakcji </translation> </message> <message> <source>Transaction too large for fee policy</source> @@ -2276,10 +2979,6 @@ Zwróć uwagę, że poprawnie zweryfikowana wiadomość potwierdza to, że nadaw <translation>-maxtxfee ma ustawioną badzo dużą wartość! Tak wysokie opłaty mogą być zapłacone w jednej transakcji.</translation> </message> <message> - <source>-paytxfee is set very high! This is the transaction fee you will pay if you send a transaction.</source> - <translation>-paytxfee ma ustawioną bardzo dużą wartość! Jest to prowizja za transakcje, którą płacisz, gdy wysyłasz monety.</translation> - </message> - <message> <source>Do not keep transactions in the mempool longer than <n> hours (default: %u)</source> <translation>Nie trzymaj w pamięci transakcji starszych niż <n> godz. (domyślnie: %u)</translation> </message> @@ -2332,6 +3031,10 @@ Zwróć uwagę, że poprawnie zweryfikowana wiadomość potwierdza to, że nadaw <translation>Ostrzeżenie: Odtworzono dane z uszkodzonego pliku portfela! Oryginalny %s został zapisany jako %s w %s; jeśli twoje saldo lub transakcje są niepoprawne powinieneś odtworzyć kopię zapasową.</translation> </message> <message> + <source>%s is set very high!</source> + <translation>%s jest ustawione bardzo wysoko!</translation> + </message> + <message> <source>(default: %s)</source> <translation>(domyślnie: %s)</translation> </message> @@ -2392,10 +3095,6 @@ Zwróć uwagę, że poprawnie zweryfikowana wiadomość potwierdza to, że nadaw <translation>Ustaw rozmiar puli kluczy na <n> (domyślnie: %u)</translation> </message> <message> - <source>Set minimum block size in bytes (default: %u)</source> - <translation>Ustaw minimalny rozmiar bloku w bajtach (domyślnie: %u)</translation> - </message> - <message> <source>Set the number of threads to service RPC calls (default: %d)</source> <translation>Ustaw liczbę wątków do obsługi RPC (domyślnie: %d)</translation> </message> @@ -2420,6 +3119,14 @@ Zwróć uwagę, że poprawnie zweryfikowana wiadomość potwierdza to, że nadaw <translation>Próg, po którym nastąpi rozłączenie węzłów nietrzymających się zasad (domyślnie: %u)</translation> </message> <message> + <source>Transaction amounts must not be negative</source> + <translation>Kwota transakcji musi być dodatnia</translation> + </message> + <message> + <source>Transaction must have at least one recipient</source> + <translation>Transakcja wymaga co najmniej jednego odbiorcy</translation> + </message> + <message> <source>Unknown network specified in -onlynet: '%s'</source> <translation>Nieznana sieć w -onlynet: '%s'</translation> </message> diff --git a/src/qt/locale/bitcoin_pt_BR.ts b/src/qt/locale/bitcoin_pt_BR.ts index ee48c67341..3202587cbd 100644 --- a/src/qt/locale/bitcoin_pt_BR.ts +++ b/src/qt/locale/bitcoin_pt_BR.ts @@ -39,7 +39,78 @@ </message> <message> <source>&Delete</source> - <translation>&Excluir</translation> + <translation>E&xcluir</translation> + </message> + <message> + <source>Choose the address to send coins to</source> + <translation>Escoha o endereço para enviar moedas</translation> + </message> + <message> + <source>Choose the address to receive coins with</source> + <translation>Escolha o enereço para receber moedas</translation> + </message> + <message> + <source>C&hoose</source> + <translation>Escol&ha</translation> + </message> + <message> + <source>Sending addresses</source> + <translation>Endereços de envio</translation> + </message> + <message> + <source>Receiving addresses</source> + <translation>Endereços de recebimento</translation> + </message> + <message> + <source>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source> + <translation>Estes são os seus endereços para enviar pagamentos. Sempre cheque a quantia e o endereço do destinatário antes de enviar moedas.</translation> + </message> + <message> + <source>These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction.</source> + <translation>Estes são os seus endereços para receber pagamentos. É recomendado usar um novo para cada transação.</translation> + </message> + <message> + <source>&Copy Address</source> + <translation>&Copiar endereço</translation> + </message> + <message> + <source>Copy &Label</source> + <translation>Copiar rótu&lo</translation> + </message> + <message> + <source>&Edit</source> + <translation>&Editar</translation> + </message> + <message> + <source>Export Address List</source> + <translation>Exportar lista de endereços</translation> + </message> + <message> + <source>Comma separated file (*.csv)</source> + <translation>Comma separated file (*.csv)</translation> + </message> + <message> + <source>Exporting Failed</source> + <translation>Falha na exportação</translation> + </message> + <message> + <source>There was an error trying to save the address list to %1. Please try again.</source> + <translation>Erro ao salvar a lista de endereço para %1. Tente novamente.</translation> + </message> +</context> +<context> + <name>AddressTableModel</name> + <message> + <source>Label</source> + <translation>Rótulo</translation> + </message> + <message> + <source>Address</source> + <translation>Endereço</translation> + </message> + <message> + <source>(no label)</source> + <translation>(sem rótulo)</translation> </message> </context> <context> @@ -60,6 +131,90 @@ <source>Repeat new passphrase</source> <translation>Repita a nova frase de segurança</translation> </message> + <message> + <source>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>.</source> + <translation>Insira a nova senha para a carteira.<br/>Favor usar uma senha com <b>dez ou mais caracteres aleatórios</b>, ou <b>oito ou mais palavras</b>.</translation> + </message> + <message> + <source>Encrypt wallet</source> + <translation>Criptografar carteira</translation> + </message> + <message> + <source>This operation needs your wallet passphrase to unlock the wallet.</source> + <translation>Esta operação precisa da sua senha para desbloquear a carteira.</translation> + </message> + <message> + <source>Unlock wallet</source> + <translation>Desbloquear carteira</translation> + </message> + <message> + <source>This operation needs your wallet passphrase to decrypt the wallet.</source> + <translation>Esta operação precisa da sua senha para descriptografar a carteira</translation> + </message> + <message> + <source>Decrypt wallet</source> + <translation>Descriptografar carteira</translation> + </message> + <message> + <source>Change passphrase</source> + <translation>Alterar senha</translation> + </message> + <message> + <source>Enter the old passphrase and new passphrase to the wallet.</source> + <translation>Insira a senha antiga e a nova para a carteira.</translation> + </message> + <message> + <source>Confirm wallet encryption</source> + <translation>Confirmar criptografia da carteira</translation> + </message> + <message> + <source>Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR BITCOINS</b>!</source> + <translation>Aviso: Se você criptografar sua carteira e perder sua senha, você vai <b>PERDER TODOS OS SEUS BITCOINS</b>!</translation> + </message> + <message> + <source>Are you sure you wish to encrypt your wallet?</source> + <translation>Tem certeza que deseja criptografar a carteira?</translation> + </message> + <message> + <source>Wallet encrypted</source> + <translation>Carteira criptografada</translation> + </message> + <message> + <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source> + <translation>IMPORTANTE: Qualquer backup prévio que você tenha feito da sua carteira deve ser substituído pelo novo e encriptado arquivo gerado. Por razões de segurança, qualquer backup do arquivo não criptografado se tornará inútil assim que você começar a usar uma nova carteira criptografada.</translation> + </message> + <message> + <source>Wallet encryption failed</source> + <translation>Falha ao criptografar carteira</translation> + </message> + <message> + <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source> + <translation>Falha na criptografia devido a um erro inerno. Sua carteira não foi criptografada.</translation> + </message> + <message> + <source>The supplied passphrases do not match.</source> + <translation>As senhas não conferem.</translation> + </message> + <message> + <source>Wallet unlock failed</source> + <translation>Falha ao desbloquear carteira</translation> + </message> + <message> + <source>The passphrase entered for the wallet decryption was incorrect.</source> + <translation>A senha inserida para descriptografar a carteira está incorreta.</translation> + </message> + <message> + <source>Wallet decryption failed</source> + <translation>Falha ao descriptografar a carteira</translation> + </message> + <message> + <source>Wallet passphrase was successfully changed.</source> + <translation>A senha da carteira foi alterada com êxito.</translation> + </message> + <message> + <source>Warning: The Caps Lock key is on!</source> + <translation>Aviso: Tecla Caps Lock ativa!</translation> + </message> </context> <context> <name>BanTableModel</name> @@ -76,7 +231,7 @@ <name>BitcoinGUI</name> <message> <source>Sign &message...</source> - <translation>&Assinar mensagem...</translation> + <translation>Assinar &mensagem...</translation> </message> <message> <source>Synchronizing with network...</source> @@ -159,6 +314,22 @@ <translation>Abrir &URI...</translation> </message> <message> + <source>Click to disable network activity.</source> + <translation>Clique para desativar a atividade de rede.</translation> + </message> + <message> + <source>Network activity disabled.</source> + <translation>Atividade de rede desativada.</translation> + </message> + <message> + <source>Click to enable network activity again.</source> + <translation>Clique para ativar a atividade de rede.</translation> + </message> + <message> + <source>Syncing Headers (%1%)...</source> + <translation>Sincronizando cabeçahos (%1%)...</translation> + </message> + <message> <source>Reindexing blocks on disk...</source> <translation>Reindexando blocos no disco...</translation> </message> @@ -176,7 +347,7 @@ </message> <message> <source>&Debug window</source> - <translation>Janela de &Depuração</translation> + <translation>Janela de &depuração</translation> </message> <message> <source>Open debugging and diagnostic console</source> @@ -204,7 +375,7 @@ </message> <message> <source>&Show / Hide</source> - <translation>&Exibir/Ocultar</translation> + <translation>&Exibir / Ocultar</translation> </message> <message> <source>Show or hide the main Window</source> @@ -270,34 +441,10 @@ <source>Processing blocks on disk...</source> <translation>Processando blocos no disco...</translation> </message> - <message> - <source>No block source available...</source> - <translation>Nenhum servidor disponível...</translation> - </message> <message numerus="yes"> <source>Processed %n block(s) of transaction history.</source> <translation><numerusform>%n bloco processado do histórico de transações.</numerusform><numerusform>%n blocos processados do histórico de transações.</numerusform></translation> </message> - <message numerus="yes"> - <source>%n hour(s)</source> - <translation><numerusform>%n hora</numerusform><numerusform>%n horas</numerusform></translation> - </message> - <message numerus="yes"> - <source>%n day(s)</source> - <translation><numerusform>%n dia</numerusform><numerusform>%n dias</numerusform></translation> - </message> - <message numerus="yes"> - <source>%n week(s)</source> - <translation><numerusform>%n semana</numerusform><numerusform>%n semanas</numerusform></translation> - </message> - <message> - <source>%1 and %2</source> - <translation>%1 e %2</translation> - </message> - <message numerus="yes"> - <source>%n year(s)</source> - <translation><numerusform>%n ano</numerusform><numerusform>%n anos</numerusform></translation> - </message> <message> <source>%1 behind</source> <translation>%1 atrás</translation> @@ -332,7 +479,11 @@ </message> <message> <source>%1 client</source> - <translation>cliente %1</translation> + <translation>%1 cliente</translation> + </message> + <message> + <source>Connecting to peers...</source> + <translation>Conectando...</translation> </message> <message> <source>Catching up...</source> @@ -377,6 +528,14 @@ <translation>Transação recebida</translation> </message> <message> + <source>HD key generation is <b>enabled</b></source> + <translation>Geração de chave HD está <b>ativada</b></translation> + </message> + <message> + <source>HD key generation is <b>disabled</b></source> + <translation>Geração de chave HD está <b>desativada</b></translation> + </message> + <message> <source>Wallet is <b>encrypted</b> and currently <b>unlocked</b></source> <translation>Carteira está <b>criptografada</b> e atualmente <b>desbloqueada</b></translation> </message> @@ -384,6 +543,10 @@ <source>Wallet is <b>encrypted</b> and currently <b>locked</b></source> <translation>Carteira está <b>criptografada</b> e atualmente <b>bloqueada</b></translation> </message> + <message> + <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> + <translation>Um erro fatal ocorreu. Bitcoin não pode continuar em segurança e irá fechar.</translation> + </message> </context> <context> <name>CoinControlDialog</name> @@ -404,10 +567,6 @@ <translation>Quantia:</translation> </message> <message> - <source>Priority:</source> - <translation>Prioridade:</translation> - </message> - <message> <source>Fee:</source> <translation>Taxa:</translation> </message> @@ -441,11 +600,11 @@ </message> <message> <source>Received with label</source> - <translation>Recebido com rótulo</translation> + <translation>Rótulo</translation> </message> <message> <source>Received with address</source> - <translation>Recebido com endereço </translation> + <translation>Endereço </translation> </message> <message> <source>Date</source> @@ -460,8 +619,84 @@ <translation>Confirmado</translation> </message> <message> - <source>Priority</source> - <translation>Prioridade</translation> + <source>Copy address</source> + <translation>Copiar endereço</translation> + </message> + <message> + <source>Copy label</source> + <translation>Copiar rótulo</translation> + </message> + <message> + <source>Copy amount</source> + <translation>Copiar quantia</translation> + </message> + <message> + <source>Copy transaction ID</source> + <translation>Copiar ID da transação</translation> + </message> + <message> + <source>Lock unspent</source> + <translation>Boquear saída</translation> + </message> + <message> + <source>Unlock unspent</source> + <translation>Desboquear saída</translation> + </message> + <message> + <source>Copy quantity</source> + <translation>Copiar quantia</translation> + </message> + <message> + <source>Copy fee</source> + <translation>Copiar taxa</translation> + </message> + <message> + <source>Copy after fee</source> + <translation>Copiar pós taxa</translation> + </message> + <message> + <source>Copy bytes</source> + <translation>Copiar bytes</translation> + </message> + <message> + <source>Copy dust</source> + <translation>Copiar poeira</translation> + </message> + <message> + <source>Copy change</source> + <translation>Copiar troco</translation> + </message> + <message> + <source>(%1 locked)</source> + <translation>(%1 bloqueada)</translation> + </message> + <message> + <source>yes</source> + <translation>sim</translation> + </message> + <message> + <source>no</source> + <translation>não</translation> + </message> + <message> + <source>This label turns red if any recipient receives an amount smaller than the current dust threshold.</source> + <translation>Este texto fica vermelho se qualquer destinatário receber uma quantidade menor que que o dust.</translation> + </message> + <message> + <source>Can vary +/- %1 satoshi(s) per input.</source> + <translation>Pode variar +/- %1 satoshi(s) por entrada</translation> + </message> + <message> + <source>(no label)</source> + <translation>(sem rótulo)</translation> + </message> + <message> + <source>change from %1 (%2)</source> + <translation>troco de %1 (%2)</translation> + </message> + <message> + <source>(change)</source> + <translation>(troco)</translation> </message> </context> <context> @@ -486,6 +721,38 @@ <source>&Address</source> <translation>&Endereço</translation> </message> + <message> + <source>New receiving address</source> + <translation>Novo endereço de recebimento</translation> + </message> + <message> + <source>New sending address</source> + <translation>Novo endereço de envio</translation> + </message> + <message> + <source>Edit receiving address</source> + <translation>Editar endereço de recebimento</translation> + </message> + <message> + <source>Edit sending address</source> + <translation>Editar endereço de envio</translation> + </message> + <message> + <source>The entered address "%1" is not a valid Bitcoin address.</source> + <translation>O endereço digitado "%1" não é um endereço válido.</translation> + </message> + <message> + <source>The entered address "%1" is already in the address book.</source> + <translation>O endereço digitado "%1" já se encontra no catálogo de endereços.</translation> + </message> + <message> + <source>Could not unlock wallet.</source> + <translation>Não foi possível desbloquear a carteira</translation> + </message> + <message> + <source>New key generation failed.</source> + <translation>Falha ao gerar chave</translation> + </message> </context> <context> <name>FreespaceChecker</name> @@ -609,6 +876,57 @@ </message> </context> <context> + <name>ModalOverlay</name> + <message> + <source>Form</source> + <translation>Formulário</translation> + </message> + <message> + <source>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 bitcoin network, as detailed below.</source> + <translation>Transações recentes podem não estar visíveis ainda, portanto o seu saldo pode estar incorreto. Esta informação será corrigida assim que sua carteira for sincronizada com a rede, como detalhado abaixo.</translation> + </message> + <message> + <source>Attempting to spend bitcoins that are affected by not-yet-displayed transactions will not be accepted by the network.</source> + <translation>Gastar moedas de transações desconhecidas podem não ser aceitas pela rede.</translation> + </message> + <message> + <source>Number of blocks left</source> + <translation>Número de blocos restantes</translation> + </message> + <message> + <source>Unknown...</source> + <translation>Desconhecido...</translation> + </message> + <message> + <source>Last block time</source> + <translation>Horário do último bloco</translation> + </message> + <message> + <source>Progress</source> + <translation>Progresso</translation> + </message> + <message> + <source>Progress increase per hour</source> + <translation>Aumento do progresso por hora</translation> + </message> + <message> + <source>calculating...</source> + <translation>calculando...</translation> + </message> + <message> + <source>Estimated time left until synced</source> + <translation>Tempo estimado para sincronizar</translation> + </message> + <message> + <source>Hide</source> + <translation>Ocultar</translation> + </message> + <message> + <source>Unknown. Syncing Headers (%1)...</source> + <translation>Desconhecido. Sincroniando cabeçahos (%1)...</translation> + </message> +</context> +<context> <name>OpenURIDialog</name> <message> <source>Open URI</source> @@ -626,6 +944,10 @@ <source>Select payment request file</source> <translation>Selecione o arquivo de cobrança</translation> </message> + <message> + <source>Select payment request file to open</source> + <translation>Selecione o arquivo de cobrança para ser aberto</translation> + </message> </context> <context> <name>OptionsDialog</name> @@ -643,7 +965,7 @@ </message> <message> <source>&Start %1 on system login</source> - <translation>$Iniciar %1 ao fazer login no sistema</translation> + <translation>&Iniciar %1 ao fazer login no sistema</translation> </message> <message> <source>Size of &database cache</source> @@ -938,6 +1260,97 @@ </message> </context> <context> + <name>PaymentServer</name> + <message> + <source>Payment request error</source> + <translation>Erro no pedido de pagamento</translation> + </message> + <message> + <source>Cannot start bitcoin: click-to-pay handler</source> + <translation>Não foi possível iniciar bitcoin: manipulador click-to-pay</translation> + </message> + <message> + <source>URI handling</source> + <translation>Manipulação de URI</translation> + </message> + <message> + <source>Payment request fetch URL is invalid: %1</source> + <translation>URL de cobrança é inválida: %1</translation> + </message> + <message> + <source>Invalid payment address %1</source> + <translation>Endereço de pagamento %1 inválido</translation> + </message> + <message> + <source>URI cannot be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters.</source> + <translation>URI não pode ser analisado! Isto pode ser causado por um endereço inválido ou parâmetros URI informados incorretamente.</translation> + </message> + <message> + <source>Payment request file handling</source> + <translation>Manipulação de arquivo de cobrança</translation> + </message> + <message> + <source>Payment request file cannot be read! This can be caused by an invalid payment request file.</source> + <translation>Arquivo de pedido de pagamento não pode ser lido! Isto pode ser causado por uma requisição de pagamento inválida.</translation> + </message> + <message> + <source>Payment request rejected</source> + <translation>Pedido de pagamento rejeitado</translation> + </message> + <message> + <source>Payment request network doesn't match client network.</source> + <translation>Rede do pedido de pagamento não corresponde rede do cliente.</translation> + </message> + <message> + <source>Payment request expired.</source> + <translation>Pedido de pagamento expirado</translation> + </message> + <message> + <source>Payment request is not initialized.</source> + <translation>Pedido de pagamento não inicializado</translation> + </message> + <message> + <source>Unverified payment requests to custom payment scripts are unsupported.</source> + <translation>Pedidos de pagamento não verificados para scripts de pagamento personalizados não são suportados.</translation> + </message> + <message> + <source>Invalid payment request.</source> + <translation>Pedido de pagamento inválido</translation> + </message> + <message> + <source>Requested payment amount of %1 is too small (considered dust).</source> + <translation>Valor do pagamento solicitado de %1 é muito pequeno (Considerado poeira).</translation> + </message> + <message> + <source>Refund from %1</source> + <translation>Reembolso de %1</translation> + </message> + <message> + <source>Payment request %1 is too large (%2 bytes, allowed %3 bytes).</source> + <translation>Pedido de pagamento %1 é muito grande (%2 bytes, permitido %3 bytes).</translation> + </message> + <message> + <source>Error communicating with %1: %2</source> + <translation>Erro na comunicação com %1: %2</translation> + </message> + <message> + <source>Payment request cannot be parsed!</source> + <translation>Pedido de pagamento não pode ser analisado!</translation> + </message> + <message> + <source>Bad response from server %1</source> + <translation>Erro na resposta do servidor: %1</translation> + </message> + <message> + <source>Network request error</source> + <translation>Erro de solicitação de rede</translation> + </message> + <message> + <source>Payment acknowledged</source> + <translation>Pagamento reconhecido</translation> + </message> +</context> +<context> <name>PeerTableModel</name> <message> <source>User Agent</source> @@ -948,7 +1361,11 @@ <translation>Nó/Serviço</translation> </message> <message> - <source>Ping Time</source> + <source>NodeId</source> + <translation>ID do nó</translation> + </message> + <message> + <source>Ping</source> <translation>Ping</translation> </message> </context> @@ -990,6 +1407,72 @@ <source>%1 ms</source> <translation>%1 ms</translation> </message> + <message numerus="yes"> + <source>%n second(s)</source> + <translation><numerusform>%n segundo</numerusform><numerusform>%n segundos</numerusform></translation> + </message> + <message numerus="yes"> + <source>%n minute(s)</source> + <translation><numerusform>%n minuto</numerusform><numerusform>%n minutos</numerusform></translation> + </message> + <message numerus="yes"> + <source>%n hour(s)</source> + <translation><numerusform>%n hora</numerusform><numerusform>%n horas</numerusform></translation> + </message> + <message numerus="yes"> + <source>%n day(s)</source> + <translation><numerusform>%n dia</numerusform><numerusform>%n dias</numerusform></translation> + </message> + <message numerus="yes"> + <source>%n week(s)</source> + <translation><numerusform>%n semana</numerusform><numerusform>%n semanas</numerusform></translation> + </message> + <message> + <source>%1 and %2</source> + <translation>%1 e %2</translation> + </message> + <message numerus="yes"> + <source>%n year(s)</source> + <translation><numerusform>%n ano</numerusform><numerusform>%n anos</numerusform></translation> + </message> + <message> + <source>%1 didn't yet exit safely...</source> + <translation>%1 ainda não terminou com segurança...</translation> + </message> +</context> +<context> + <name>QObject::QObject</name> + <message> + <source>Error: Specified data directory "%1" does not exist.</source> + <translation>Erro: diretório de dados especificado "%1" não existe.</translation> + </message> + <message> + <source>Error: Cannot parse configuration file: %1. Only use key=value syntax.</source> + <translation>Erro: Não foi possível interpretar arquivo de configuração: %1. Utilize apenas a sintaxe chave=valor.</translation> + </message> + <message> + <source>Error: %1</source> + <translation>Erro: %1</translation> + </message> +</context> +<context> + <name>QRImageWidget</name> + <message> + <source>&Save Image...</source> + <translation>&Savar imagem</translation> + </message> + <message> + <source>&Copy Image</source> + <translation>&Copiar imagem</translation> + </message> + <message> + <source>Save QR Code</source> + <translation>Salvar código QR</translation> + </message> + <message> + <source>PNG Image (*.png)</source> + <translation>Imagem PNG (*.png)</translation> + </message> </context> <context> <name>RPCConsole</name> @@ -1150,6 +1633,10 @@ <translation>Espera de ping</translation> </message> <message> + <source>Min Ping</source> + <translation>Ping min</translation> + </message> + <message> <source>Time Offset</source> <translation>Offset de tempo</translation> </message> @@ -1187,21 +1674,13 @@ </message> <message> <source>Debug log file</source> - <translation>Arquivo de log de Depuração</translation> + <translation>Arquivo de log de depuração</translation> </message> <message> <source>Clear console</source> <translation>Limpar console</translation> </message> <message> - <source>&Disconnect Node</source> - <translation>&Desconectar Nó</translation> - </message> - <message> - <source>Ban Node for</source> - <translation>Banir nó por</translation> - </message> - <message> <source>1 &hour</source> <translation>1 &hora</translation> </message> @@ -1218,8 +1697,16 @@ <translation>1 &ano</translation> </message> <message> - <source>&Unban Node</source> - <translation>&Desbanir nó</translation> + <source>&Disconnect</source> + <translation>&Desconectar</translation> + </message> + <message> + <source>Ban for</source> + <translation>Banir por</translation> + </message> + <message> + <source>&Unban</source> + <translation>&Desbanir</translation> </message> <message> <source>Welcome to the %1 RPC console.</source> @@ -1234,6 +1721,14 @@ <translation>Digite <b>help</b> para uma visão geral dos comandos disponíveis.</translation> </message> <message> + <source>WARNING: Scammers have been active, telling users to type commands here, stealing their wallet contents. Do not use this console without fully understanding the ramification of a command.</source> + <translation>AVISO: Scammers atacam essa área, dizendo aos usuários que comandos digitar aqui, roubando informações da carteira. Não use este console sem entender completamente as ramificações do comando.</translation> + </message> + <message> + <source>Network activity disabled</source> + <translation>Atividade da rede disativada</translation> + </message> + <message> <source>%1 B</source> <translation>%1 B</translation> </message> @@ -1352,6 +1847,22 @@ <source>Remove</source> <translation>Remover</translation> </message> + <message> + <source>Copy URI</source> + <translation>Copiar URI</translation> + </message> + <message> + <source>Copy label</source> + <translation>Copiar rótulo</translation> + </message> + <message> + <source>Copy message</source> + <translation>Copiar mensagem</translation> + </message> + <message> + <source>Copy amount</source> + <translation>Copiar quantia</translation> + </message> </context> <context> <name>ReceiveRequestDialog</name> @@ -1371,6 +1882,73 @@ <source>&Save Image...</source> <translation>&Salvar Imagem...</translation> </message> + <message> + <source>Request payment to %1</source> + <translation>Pedido de pagamento para %1</translation> + </message> + <message> + <source>Payment information</source> + <translation>Informação do pagamento</translation> + </message> + <message> + <source>URI</source> + <translation>URI</translation> + </message> + <message> + <source>Address</source> + <translation>Endereço</translation> + </message> + <message> + <source>Amount</source> + <translation>Quantia</translation> + </message> + <message> + <source>Label</source> + <translation>Rótulo</translation> + </message> + <message> + <source>Message</source> + <translation>Mensagem</translation> + </message> + <message> + <source>Resulting URI too long, try to reduce the text for label / message.</source> + <translation>URI resultante muito longa. Tente reduzir o texto do rótulo ou da mensagem.</translation> + </message> + <message> + <source>Error encoding URI into QR Code.</source> + <translation>Erro ao codigicar o URI em código QR</translation> + </message> +</context> +<context> + <name>RecentRequestsTableModel</name> + <message> + <source>Date</source> + <translation>Data</translation> + </message> + <message> + <source>Label</source> + <translation>Rótulo</translation> + </message> + <message> + <source>Message</source> + <translation>Mensagem</translation> + </message> + <message> + <source>(no label)</source> + <translation>(sem rótulo)</translation> + </message> + <message> + <source>(no message)</source> + <translation>(sem mensagem)</translation> + </message> + <message> + <source>(no amount requested)</source> + <translation>(nenhuma quantia solicitada)</translation> + </message> + <message> + <source>Requested</source> + <translation>Solicitado</translation> + </message> </context> <context> <name>SendCoinsDialog</name> @@ -1407,10 +1985,6 @@ <translation>Quantia:</translation> </message> <message> - <source>Priority:</source> - <translation>Prioridade:</translation> - </message> - <message> <source>Fee:</source> <translation>Taxa:</translation> </message> @@ -1479,10 +2053,6 @@ <translation>(Smart fee não iniciado. Isso requer alguns blocos...)</translation> </message> <message> - <source>Confirmation time:</source> - <translation>Tempo de confirmação:</translation> - </message> - <message> <source>normal</source> <translation>normal</translation> </message> @@ -1507,6 +2077,10 @@ <translation>Poeira:</translation> </message> <message> + <source>Confirmation time target:</source> + <translation>Confirmando tempo alvo:</translation> + </message> + <message> <source>Clear &All</source> <translation>Limpar Tudo</translation> </message> @@ -1522,6 +2096,126 @@ <source>S&end</source> <translation>Enviar</translation> </message> + <message> + <source>Copy quantity</source> + <translation>Copiar quantia</translation> + </message> + <message> + <source>Copy amount</source> + <translation>Copiar quantia</translation> + </message> + <message> + <source>Copy fee</source> + <translation>Copiar taxa</translation> + </message> + <message> + <source>Copy after fee</source> + <translation>Copiar pós taxa</translation> + </message> + <message> + <source>Copy bytes</source> + <translation>Copiar bytes</translation> + </message> + <message> + <source>Copy dust</source> + <translation>Copiar poeira</translation> + </message> + <message> + <source>Copy change</source> + <translation>Copiar troco</translation> + </message> + <message> + <source>%1 to %2</source> + <translation>%1 a %2</translation> + </message> + <message> + <source>Are you sure you want to send?</source> + <translation>Tem certeza que deseja enviar?</translation> + </message> + <message> + <source>added as transaction fee</source> + <translation>adicionado como taxa da transação </translation> + </message> + <message> + <source>Total Amount %1</source> + <translation>Quantia tota %1</translation> + </message> + <message> + <source>or</source> + <translation>ou</translation> + </message> + <message> + <source>Confirm send coins</source> + <translation>Confirme o envio de moedas</translation> + </message> + <message> + <source>The recipient address is not valid. Please recheck.</source> + <translation>Endereço de envio inváido. Favor checar.</translation> + </message> + <message> + <source>The amount to pay must be larger than 0.</source> + <translation>A quantia à pagar deve ser maior que 0</translation> + </message> + <message> + <source>The amount exceeds your balance.</source> + <translation>A quantia excede o seu saldo</translation> + </message> + <message> + <source>The total exceeds your balance when the %1 transaction fee is included.</source> + <translation>O total excede o seu saldo quando a taxa da transação %1 é incluída</translation> + </message> + <message> + <source>Duplicate address found: addresses should only be used once each.</source> + <translation>Endereço duplicado encontrado: Endereços devem ser usados somente uma vez cada.</translation> + </message> + <message> + <source>Transaction creation failed!</source> + <translation>Falha na criação da transação</translation> + </message> + <message> + <source>The transaction was rejected with the following reason: %1</source> + <translation>A transação foi negada pela seguinte razão: %1</translation> + </message> + <message> + <source>A fee higher than %1 is considered an absurdly high fee.</source> + <translation>Uma taxa maior que %1 é considerada uma taxa absurdamente alta.</translation> + </message> + <message> + <source>Payment request expired.</source> + <translation>Pedido de pagamento expirado</translation> + </message> + <message numerus="yes"> + <source>%n block(s)</source> + <translation><numerusform>%n bloco</numerusform><numerusform>%n blocos</numerusform></translation> + </message> + <message> + <source>Pay only the required fee of %1</source> + <translation>Pagar somente a taxa requerida de %1</translation> + </message> + <message numerus="yes"> + <source>Estimated to begin confirmation within %n block(s).</source> + <translation><numerusform>Confirmação em %n bloco.</numerusform><numerusform>Confirmação em %n blocos.</numerusform></translation> + </message> + <message> + <source>Warning: Invalid Bitcoin address</source> + <translation>Aviso: Endereço inválido</translation> + </message> + <message> + <source>Warning: Unknown change address</source> + <translation>Aviso: Endereço de troco inválido</translation> + </message> + <message> + <source>Confirm custom change address</source> + <translation>Confirmar endereço de troco personalizado</translation> + </message> + <message> + <source>The address you selected for change is not part of this wallet. Any or all funds in your wallet may be sent to this address. Are you sure?</source> + <translation>O endereço selecionado para o troco não pertence a esta carteira. Alguns ou todos os fundos da sua carteira modem ser mandados para esse endereço. Tem certeza?</translation> + </message> + <message> + <source>(no label)</source> + <translation>(sem rótulo)</translation> + </message> </context> <context> <name>SendCoinsEntry</name> @@ -1567,7 +2261,7 @@ </message> <message> <source>The fee will be deducted from the amount being sent. The recipient will receive less bitcoins than you enter in the amount field. If multiple recipients are selected, the fee is split equally.</source> - <translation>A taxa será deduzida da quantia sendo enviada. O destinatário receberá menos bitcoins do que você colocou no campo de quantidade. Se varios destinatários estão selecionados, a taxa é dividida igualmente.</translation> + <translation>A taxa será deduzida da quantia que está sendo enviada. O destinatário receberá menos bitcoins do que você colocou no campo de quantidade. Se vários destinatários estão selecionados, a taxa é dividida igualmente.</translation> </message> <message> <source>S&ubtract fee from amount</source> @@ -1601,10 +2295,25 @@ <source>Memo:</source> <translation>Memorizar:</translation> </message> + <message> + <source>Enter a label for this address to add it to your address book</source> + <translation>Digite um rótulo para este endereço para adicioná-lo ao catálogo de endereços</translation> + </message> +</context> +<context> + <name>SendConfirmationDialog</name> + <message> + <source>Yes</source> + <translation>Sim</translation> + </message> </context> <context> <name>ShutdownWindow</name> <message> + <source>%1 is shutting down...</source> + <translation>%1 está desligando...</translation> + </message> + <message> <source>Do not shut down the computer until this window disappears.</source> <translation>Não desligue o computador até que esta janela desapareça.</translation> </message> @@ -1695,6 +2404,58 @@ <source>Reset all verify message fields</source> <translation>Limpar todos os campos de assinatura da mensagem</translation> </message> + <message> + <source>Click "Sign Message" to generate signature</source> + <translation>Clique em "Assinar mensagem" para gerar a assinatura</translation> + </message> + <message> + <source>The entered address is invalid.</source> + <translation>O endereço digitado é inválido</translation> + </message> + <message> + <source>Please check the address and try again.</source> + <translation>Favor checar o endereço e tente novamente</translation> + </message> + <message> + <source>The entered address does not refer to a key.</source> + <translation>O endereço fornecido não se refere a uma chave.</translation> + </message> + <message> + <source>Wallet unlock was cancelled.</source> + <translation>O desbloqueio da carteira foi cancelado</translation> + </message> + <message> + <source>Private key for the entered address is not available.</source> + <translation>A chave privada do endereço inserido não está disponível</translation> + </message> + <message> + <source>Message signing failed.</source> + <translation>Falha ao assinar mensagem</translation> + </message> + <message> + <source>Message signed.</source> + <translation>Mensagem assinada</translation> + </message> + <message> + <source>The signature could not be decoded.</source> + <translation>A assinatura não pode ser descodificada</translation> + </message> + <message> + <source>Please check the signature and try again.</source> + <translation>Favor checar a assinatura e tente novamente</translation> + </message> + <message> + <source>The signature did not match the message digest.</source> + <translation>A assinatura não corresponde a mensagem</translation> + </message> + <message> + <source>Message verification failed.</source> + <translation>Falha na verificação da mensagem</translation> + </message> + <message> + <source>Message verified.</source> + <translation>Mensagem verificada</translation> + </message> </context> <context> <name>SplashScreen</name> @@ -1711,11 +2472,460 @@ </message> </context> <context> + <name>TransactionDesc</name> + <message numerus="yes"> + <source>Open for %n more block(s)</source> + <translation><numerusform>Abrir para mais %n bloco</numerusform><numerusform>Abrir para mais %n blocos</numerusform></translation> + </message> + <message> + <source>Open until %1</source> + <translation>Aberto até %1</translation> + </message> + <message> + <source>conflicted with a transaction with %1 confirmations</source> + <translation>conflitado com uma transação com %1 confirmações</translation> + </message> + <message> + <source>%1/offline</source> + <translation>%1/offline</translation> + </message> + <message> + <source>0/unconfirmed, %1</source> + <translation>0/não confirmado, %1</translation> + </message> + <message> + <source>in memory pool</source> + <translation>na memória</translation> + </message> + <message> + <source>not in memory pool</source> + <translation>não na memóra</translation> + </message> + <message> + <source>abandoned</source> + <translation>abandonado</translation> + </message> + <message> + <source>%1/unconfirmed</source> + <translation>%1/não confirmado</translation> + </message> + <message> + <source>%1 confirmations</source> + <translation>%1 confirmações</translation> + </message> + <message> + <source>Status</source> + <translation>Status</translation> + </message> + <message> + <source>, has not been successfully broadcast yet</source> + <translation>, ainda não foi propagada na rede com êxito.</translation> + </message> + <message numerus="yes"> + <source>, broadcast through %n node(s)</source> + <translation><numerusform>, transmitido aravés de %n nó</numerusform><numerusform>, transmitido aravés de %n nós</numerusform></translation> + </message> + <message> + <source>Date</source> + <translation>Data</translation> + </message> + <message> + <source>Source</source> + <translation>Fonte</translation> + </message> + <message> + <source>Generated</source> + <translation>Gerado</translation> + </message> + <message> + <source>From</source> + <translation>De</translation> + </message> + <message> + <source>unknown</source> + <translation>desconhecido</translation> + </message> + <message> + <source>To</source> + <translation>Para</translation> + </message> + <message> + <source>own address</source> + <translation>próprio endereço</translation> + </message> + <message> + <source>watch-only</source> + <translation>monitorado</translation> + </message> + <message> + <source>label</source> + <translation>rótulo</translation> + </message> + <message> + <source>Credit</source> + <translation>Crédito</translation> + </message> + <message numerus="yes"> + <source>matures in %n more block(s)</source> + <translation><numerusform>maduro em mais %n bloco</numerusform><numerusform>maduro em mais %n blocos</numerusform></translation> + </message> + <message> + <source>not accepted</source> + <translation>não aceito</translation> + </message> + <message> + <source>Debit</source> + <translation>Débito</translation> + </message> + <message> + <source>Total debit</source> + <translation>Débito total</translation> + </message> + <message> + <source>Total credit</source> + <translation>Crédito total</translation> + </message> + <message> + <source>Transaction fee</source> + <translation>Taxa da transação</translation> + </message> + <message> + <source>Net amount</source> + <translation>Valor líquido</translation> + </message> + <message> + <source>Message</source> + <translation>Mensagem</translation> + </message> + <message> + <source>Comment</source> + <translation>Comentário</translation> + </message> + <message> + <source>Transaction ID</source> + <translation>ID da transação</translation> + </message> + <message> + <source>Transaction total size</source> + <translation>Tamanho tota da transação</translation> + </message> + <message> + <source>Output index</source> + <translation>Index da saída</translation> + </message> + <message> + <source>Merchant</source> + <translation>Mercador</translation> + </message> + <message> + <source>Generated coins must mature %1 blocks before they can be spent. When you generated this block, it was broadcast to the network to be added to the block chain. If it fails to get into the chain, its state will change to "not accepted" and it won't be spendable. This may occasionally happen if another node generates a block within a few seconds of yours.</source> + <translation>Moedas recém minerados precisam aguardar %1 blocos antes de serem gastos. Quando o bloco foi gerado, ele foi disseminado pela rede para ser adicionado à blockchain. Se ele falhar em ser inserido na cadeia, seu estado será modificado para "não aceito" e ele não poderá ser gasto. Isso pode acontecer eventualmente quando blocos são gerados quase que simultaneamente.</translation> + </message> + <message> + <source>Debug information</source> + <translation>Depurar informação</translation> + </message> + <message> + <source>Transaction</source> + <translation>Transação</translation> + </message> + <message> + <source>Inputs</source> + <translation>Entradas</translation> + </message> + <message> + <source>Amount</source> + <translation>Quantia</translation> + </message> + <message> + <source>true</source> + <translation>verdadeiro</translation> + </message> + <message> + <source>false</source> + <translation>falso</translation> + </message> +</context> +<context> <name>TransactionDescDialog</name> <message> <source>This pane shows a detailed description of the transaction</source> <translation>Este painel mostra uma descrição detalhada da transação</translation> </message> + <message> + <source>Details for %1</source> + <translation>Detalhes para %1</translation> + </message> +</context> +<context> + <name>TransactionTableModel</name> + <message> + <source>Date</source> + <translation>Data</translation> + </message> + <message> + <source>Type</source> + <translation>Tipo</translation> + </message> + <message> + <source>Label</source> + <translation>Rótulo</translation> + </message> + <message numerus="yes"> + <source>Open for %n more block(s)</source> + <translation><numerusform>Aberto por mais %n bloco</numerusform><numerusform>Aberto por mais %n blocos</numerusform></translation> + </message> + <message> + <source>Open until %1</source> + <translation>Aberto até %1</translation> + </message> + <message> + <source>Offline</source> + <translation>Offline</translation> + </message> + <message> + <source>Unconfirmed</source> + <translation>Não confirmado</translation> + </message> + <message> + <source>Abandoned</source> + <translation>Abandonado</translation> + </message> + <message> + <source>Confirming (%1 of %2 recommended confirmations)</source> + <translation>Confirmando (%1 de %2 confirmações recomendadas)</translation> + </message> + <message> + <source>Confirmed (%1 confirmations)</source> + <translation>Confirmado (%1 confirmações)</translation> + </message> + <message> + <source>Conflicted</source> + <translation>Conflitado</translation> + </message> + <message> + <source>Immature (%1 confirmations, will be available after %2)</source> + <translation>Recém-criado (%1 confirmações, disponível somente após %2)</translation> + </message> + <message> + <source>This block was not received by any other nodes and will probably not be accepted!</source> + <translation>Este bloco não foi recebido por nenhum outro participante da rede e provavelmente não será aceito!</translation> + </message> + <message> + <source>Generated but not accepted</source> + <translation>Gerado mas não aceito</translation> + </message> + <message> + <source>Received with</source> + <translation>Recebido</translation> + </message> + <message> + <source>Received from</source> + <translation>Recebido</translation> + </message> + <message> + <source>Sent to</source> + <translation>Enviado para</translation> + </message> + <message> + <source>Payment to yourself</source> + <translation>Pagamento para você mesmo</translation> + </message> + <message> + <source>Mined</source> + <translation>Minerado</translation> + </message> + <message> + <source>watch-only</source> + <translation>monitorado</translation> + </message> + <message> + <source>(n/a)</source> + <translation>(n/a)</translation> + </message> + <message> + <source>(no label)</source> + <translation>(sem rótulo)</translation> + </message> + <message> + <source>Transaction status. Hover over this field to show number of confirmations.</source> + <translation>Status da transação. Passe o mouse sobre este campo para mostrar o número de confirmações.</translation> + </message> + <message> + <source>Date and time that the transaction was received.</source> + <translation>Data e hora em que a transação foi recebida.</translation> + </message> + <message> + <source>Type of transaction.</source> + <translation>Tipo de transação</translation> + </message> + <message> + <source>Whether or not a watch-only address is involved in this transaction.</source> + <translation>Mostrar ou não endereços monitorados na lista de transações.</translation> + </message> + <message> + <source>User-defined intent/purpose of the transaction.</source> + <translation>Intenção/Propósito definido pelo usuário para a transação</translation> + </message> + <message> + <source>Amount removed from or added to balance.</source> + <translation>Quantidade debitada ou creditada ao saldo.</translation> + </message> +</context> +<context> + <name>TransactionView</name> + <message> + <source>All</source> + <translation>Todos</translation> + </message> + <message> + <source>Today</source> + <translation>Hoje</translation> + </message> + <message> + <source>This week</source> + <translation>Essa semana</translation> + </message> + <message> + <source>This month</source> + <translation>Esse mês</translation> + </message> + <message> + <source>Last month</source> + <translation>Último mês</translation> + </message> + <message> + <source>This year</source> + <translation>Este ano</translation> + </message> + <message> + <source>Range...</source> + <translation>Intervalo...</translation> + </message> + <message> + <source>Received with</source> + <translation>Recebido</translation> + </message> + <message> + <source>Sent to</source> + <translation>Enviado para</translation> + </message> + <message> + <source>To yourself</source> + <translation>Para você mesmo</translation> + </message> + <message> + <source>Mined</source> + <translation>Minerado</translation> + </message> + <message> + <source>Other</source> + <translation>Outro</translation> + </message> + <message> + <source>Enter address or label to search</source> + <translation>Procure um endereço ou rótulo</translation> + </message> + <message> + <source>Min amount</source> + <translation>Quantia mínima</translation> + </message> + <message> + <source>Abandon transaction</source> + <translation>Transação abandonada</translation> + </message> + <message> + <source>Copy address</source> + <translation>Copiar endereço</translation> + </message> + <message> + <source>Copy label</source> + <translation>Copiar rótulo</translation> + </message> + <message> + <source>Copy amount</source> + <translation>Copiar quantia</translation> + </message> + <message> + <source>Copy transaction ID</source> + <translation>Copiar ID da transação</translation> + </message> + <message> + <source>Copy raw transaction</source> + <translation>Copiar o raw da transação</translation> + </message> + <message> + <source>Copy full transaction details</source> + <translation>Copiar dados completos da transação</translation> + </message> + <message> + <source>Edit label</source> + <translation>Editar rótulo</translation> + </message> + <message> + <source>Show transaction details</source> + <translation>Mostrar detalhes da transação</translation> + </message> + <message> + <source>Export Transaction History</source> + <translation>Exportar histórico de transações</translation> + </message> + <message> + <source>Comma separated file (*.csv)</source> + <translation>Comma separated file (*.csv)</translation> + </message> + <message> + <source>Confirmed</source> + <translation>Confirmado</translation> + </message> + <message> + <source>Watch-only</source> + <translation>Monitorado</translation> + </message> + <message> + <source>Date</source> + <translation>Data</translation> + </message> + <message> + <source>Type</source> + <translation>Tipo</translation> + </message> + <message> + <source>Label</source> + <translation>Rótulo</translation> + </message> + <message> + <source>Address</source> + <translation>Endereço</translation> + </message> + <message> + <source>ID</source> + <translation>ID</translation> + </message> + <message> + <source>Exporting Failed</source> + <translation>Falha na exportação</translation> + </message> + <message> + <source>There was an error trying to save the transaction history to %1.</source> + <translation>Ocorreu um erro ao tentar salvar o histórico de transações em %1.</translation> + </message> + <message> + <source>Exporting Successful</source> + <translation>Exportação feita com êxito</translation> + </message> + <message> + <source>The transaction history was successfully saved to %1.</source> + <translation>O histórico de transação foi gravado com êxito em %1.</translation> + </message> + <message> + <source>Range:</source> + <translation>Intervalo: </translation> + </message> + <message> + <source>to</source> + <translation>para</translation> + </message> </context> <context> <name>UnitDisplayStatusBarControl</name> @@ -1725,6 +2935,55 @@ </message> </context> <context> + <name>WalletFrame</name> + <message> + <source>No wallet has been loaded.</source> + <translation>Nenhuma carteira carregada</translation> + </message> +</context> +<context> + <name>WalletModel</name> + <message> + <source>Send Coins</source> + <translation>Enviar moedas</translation> + </message> +</context> +<context> + <name>WalletView</name> + <message> + <source>&Export</source> + <translation>&Exportar</translation> + </message> + <message> + <source>Export the data in the current tab to a file</source> + <translation>Exportar os dados da guia atual para um arquivo</translation> + </message> + <message> + <source>Backup Wallet</source> + <translation>Backup da carteira</translation> + </message> + <message> + <source>Wallet Data (*.dat)</source> + <translation>Dados da carteira (*.dat)</translation> + </message> + <message> + <source>Backup Failed</source> + <translation>Falha no backup</translation> + </message> + <message> + <source>There was an error trying to save the wallet data to %1.</source> + <translation>Ocorreu um erro ao tentar salvar os dados da carteira em %1.</translation> + </message> + <message> + <source>Backup Successful</source> + <translation>Êxito no backup</translation> + </message> + <message> + <source>The wallet data was successfully saved to %1.</source> + <translation>Os dados da carteira foram salvos com êxito em %1.</translation> + </message> +</context> +<context> <name>bitcoin-core</name> <message> <source>Options:</source> @@ -1747,24 +3006,32 @@ <translation>Aceitar linha de comando e comandos JSON-RPC</translation> </message> <message> + <source>Accept connections from outside (default: 1 if no -proxy or -connect/-noconnect)</source> + <translation>Aceitar conecções de entrada (padrão: 1 sem -proxy ou -connect/-noconnect)</translation> + </message> + <message> + <source>Connect only to the specified node(s); -noconnect or -connect=0 alone to disable automatic connections</source> + <translation>Conectar somente a nós específicos; -noconnect ou -connect=0 sozinhos para desativar conecções automáticas</translation> + </message> + <message> + <source>Distributed under the MIT software license, see the accompanying file %s or %s</source> + <translation>Distribuído sob a MIT software license, veja o arquivo %s ou %s</translation> + </message> + <message> <source>If <category> is not supplied or if <category> = 1, output all debugging information.</source> <translation>Se <category> não for suprida ou se <category> = 1, mostrar toda informação de depuração.</translation> </message> <message> <source>Prune configured below the minimum of %d MiB. Please use a higher number.</source> - <translation>Corte configurado abaixo do nível mínimo de %d de MiB. Por favor use um número mais alto.</translation> + <translation>Prune configurado abaixo do mínimo de %d MiB. Por favor use um número mais alto.</translation> </message> <message> <source>Prune: last wallet synchronisation goes beyond pruned data. You need to -reindex (download the whole blockchain again in case of pruned node)</source> - <translation>Corte: a ultima sincronização da carteira foi além do dado comprimido. Você precisa reindexar ( -reindex , faça o download de toda a blockchain novamente)</translation> - </message> - <message> - <source>Reduce storage requirements by pruning (deleting) old blocks. This mode is incompatible with -txindex and -rescan. Warning: Reverting this setting requires re-downloading the entire blockchain. (default: 0 = disable pruning blocks, >%u = target size in MiB to use for block files)</source> - <translation>Reduza os requerimentos de armazenamento de dados (cortando) deletando blocos mais antigos. Esse modo é incompatível com -txindex e -rescan. Cuidado: Reverter essa configuração requer um novo download de toda a blockchain. (Padrão: 0 = desabilita o corte de blocos, >%u = tamanho alvo em MiB para o uso de blocos cortados)</translation> + <translation>Prune: A ultima sincronização da carteira foi além do dado comprimido. Você precisa reindexar (fazer o download de toda a blockchain novamente)</translation> </message> <message> <source>Rescans are not possible in pruned mode. You will need to use -reindex which will download the whole blockchain again.</source> - <translation>Rescans não são possíveis no modo de corte. Você precisa usar -reindex, que irá fazer o download de toda a blockchain novamente.</translation> + <translation>Rescans não são possíveis no modo prune. Você precisa usar -reindex, que irá fazer o download de toda a blockchain novamente.</translation> </message> <message> <source>Error: A fatal internal error occurred, see debug.log for details</source> @@ -1787,16 +3054,12 @@ <translation>Não foi possível iniciar o servidor HTTP. Veja o log para detaihes.</translation> </message> <message> - <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> - <translation>Aceitar conexões externas (padrão: 1 se opções -proxy ou -connect não estiverem presentes)</translation> - </message> - <message> <source>Bitcoin Core</source> - <translation>Bitcoin</translation> + <translation>Bitcoin Core</translation> </message> <message> - <source>-fallbackfee is set very high! This is the transaction fee you may pay when fee estimates are not available.</source> - <translation>-fallbackfee está muito alta! Essa é a taxa de transação que você vai pagar quando a taxa estimada não estiver disponível.</translation> + <source>The %s developers</source> + <translation>Desenvolvedores do %s</translation> </message> <message> <source>A fee rate (in %s/kB) that will be used when fee estimation has insufficient data (default: %s)</source> @@ -1819,10 +3082,6 @@ <translation>Apaga todas as transações da carteira e somente recupera essas partes da blockchain usando o comando -rescan na inicialização</translation> </message> <message> - <source>Distributed under the MIT software license, see the accompanying file COPYING or <http://www.opensource.org/licenses/mit-license.php>.</source> - <translation>Distribuido sob a licença MIT software license. Veja os termos em <http://www.opensource.org/licenses/mit-license.php>.</translation> - </message> - <message> <source>Error loading %s: You can't enable HD on a already existing non-HD wallet</source> <translation>Erro ao carregar %s. Não é permitido habilitar HD em carteiras não-HD pre existentes.</translation> </message> @@ -1835,12 +3094,16 @@ <translation>Executa um comando quando uma transação da carteira mudar (%s no comando será substituído por TxID)</translation> </message> <message> - <source>Force relay of transactions from whitelisted peers even they violate local relay policy (default: %d)</source> - <translation>Força a retransmissão de transações de pares da lista branca, mesmo quando violam a política local de retransmissão (default: %d)</translation> + <source>Extra transactions to keep in memory for compact block reconstructions (default: %u)</source> + <translation>Transações extras para manter na memória para reconstruções de blocos compactos (padrão: %u)</translation> + </message> + <message> + <source>If this block is in the chain assume that it and its ancestors are valid and potentially skip their script verification (0 to verify all, default: %s, testnet: %s)</source> + <translation>Se este bloco está no blockchain, assume-se que ele e seus ancestrais são válidos e podem ignorar a verificação de scripts (0 para verificar todos, padrão: %s, testnet: %s)</translation> </message> <message> <source>Maximum allowed median peer time offset adjustment. Local perspective of time may be influenced by peers forward or backward by this amount. (default: %u seconds)</source> - <translation>A mediana máxima permitida de peer time compensa o ajuste. Perspectiva local de horário pode ser influenciada por pares à frente ou atrás neste montante. (padrão: %u segundos)</translation> + <translation>A media máxima permitida de peer time compensa o ajuste. Perspectiva local de horário pode ser influenciada por pares à frente ou atrás neste montante. (padrão: %u segundos)</translation> </message> <message> <source>Maximum total fees (in %s) to use in a single wallet transaction or raw transaction; setting this too low may abort large transactions (default: %s)</source> @@ -1855,6 +3118,14 @@ <translation>Por favor contribua se você entender que %s é útil. Visite %s para mais informações sobre o software.</translation> </message> <message> + <source>Reduce storage requirements by enabling pruning (deleting) of old blocks. This allows the pruneblockchain RPC to be called to delete specific blocks, and enables automatic pruning of old blocks if a target size in MiB is provided. This mode is incompatible with -txindex and -rescan. Warning: Reverting this setting requires re-downloading the entire blockchain. (default: 0 = disable pruning blocks, 1 = allow manual pruning via RPC, >%u = automatically prune block files to stay under the specified target size in MiB)</source> + <translation>Reduz o requerimente de espaço habiitando o pruning (apagando) blocos antigos. Isso permite o chamar o comando pruneblockchain via RPC para apagar blocos específicos, e habiita o pruning automático de blocos antigos se o tamanho em MiB for atingido. Esse modo é incompatíve com -txindex e -rescan. Aviso: Reverter essa configuração requer re-baixar o blockchain inteiro. (padrão: 0 = disabilitado, 1 = permite o pruning manua via RPC, >%u = pruna os blocos para ficar abaixo do expecificado, em MiB)</translation> + </message> + <message> + <source>Set lowest fee rate (in %s/kB) for transactions to be included in block creation. (default: %s)</source> + <translation>Taxa (em %s/KiB) a ser adicionada às transações que você mandar (padrão: %s)</translation> + </message> + <message> <source>Set the number of script verification threads (%u to %d, 0 = auto, <0 = leave that many cores free, default: %d)</source> <translation>Define o número de threads de verificação de script (%u a %d, 0 = automático, <0 = número de cores deixados livres, padrão: %d)</translation> </message> @@ -1864,23 +3135,39 @@ </message> <message> <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source> - <translation>Este pode ser um build de teste pré-lançamento - use por sua conta e risco - não use para mineração ou aplicações de comércio.</translation> + <translation>Este é um build de teste pré-lançamento - use por sua conta e risco - não use para mineração ou comércio.</translation> + </message> + <message> + <source>Unable to rewind the database to a pre-fork state. You will need to redownload the blockchain</source> + <translation>Não foi possível reanalisar o banco de dados para o estado pre-fork. Você precisa rebaixar o blockchain</translation> </message> <message> <source>Use UPnP to map the listening port (default: 1 when listening and no -proxy)</source> <translation>Use UPnP para mapear a porta escutada (padrão: 1 quando escutando e sem -proxy)</translation> </message> <message> + <source>Username and hashed password for JSON-RPC connections. The field <userpw> comes in the format: <USERNAME>:<SALT>$<HASH>. A canonical python script is included in share/rpcuser. The client then connects normally using the rpcuser=<USERNAME>/rpcpassword=<PASSWORD> pair of arguments. This option can be specified multiple times</source> + <translation>Nome de usuário e hash da senha para conexões JSON-RPC. O campo <userpw> vem com o formato: <USERNAME>:<SALT>$<HASH>. Um script python canônico é incluído em share/rpcuser. O cliente pode conectar normalmente usando o rpcuser=<USERNAME>/rpcpassword=<PASSWORD>. Esta opção pode ser especificado multiplas vezes</translation> + </message> + <message> + <source>Wallet will not create transactions that violate mempool chain limits (default: %u)</source> + <translation>A carteira não irá criar transações que vioem o imite de memória (padrão: %u)</translation> + </message> + <message> <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source> <translation>Atenção: A rede não parecem concordar plenamente! Alguns mineiros parecem estar enfrentando problemas.</translation> </message> <message> <source>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</source> - <translation>Atenção: Nós não parecemos concordar plenamente com nossos colegas! Você pode precisar atualizar ou outros nós podem precisar atualizar.</translation> + <translation>Atenção: Nós não parecemos concordar plenamente com nossos nós! Você pode precisar atualizar ou outros nós podem precisar atualizar.</translation> </message> <message> - <source>Whitelist peers connecting from the given netmask or IP address. Can be specified multiple times.</source> - <translation>Lista Branca pares de ligação da máscara de rede dado ou o endereço IP . Pode ser especificado várias vezes.</translation> + <source>You need to rebuild the database using -reindex-chainstate to change -txindex</source> + <translation>Você precisa reconstruir o banco de dados utilizando -reindex-chainstate para mudar -txindex</translation> + </message> + <message> + <source>%s corrupt, salvage failed</source> + <translation>%s corrompido, recuperação falhou</translation> </message> <message> <source>-maxmempool must be at least %d MB</source> @@ -1903,14 +3190,26 @@ <translation>Opções de criação de blocos:</translation> </message> <message> - <source>Connect only to the specified node(s)</source> - <translation>Conectar apenas a cliente(s) específico(s)</translation> + <source>Cannot resolve -%s address: '%s'</source> + <translation>Impossível resolver -%s endereço: '%s'</translation> + </message> + <message> + <source>Chain selection options:</source> + <translation>Opções da rede:</translation> + </message> + <message> + <source>Change index out of range</source> + <translation>Índice de mudança fora da faixa.</translation> </message> <message> <source>Connection options:</source> <translation>Opções de conexão:</translation> </message> <message> + <source>Copyright (C) %i-%i</source> + <translation>Copyright (C) %i-%i</translation> + </message> + <message> <source>Corrupted block database detected</source> <translation>Detectado Banco de dados de blocos corrompido</translation> </message> @@ -1955,6 +3254,22 @@ <translation>Erro ao inicializar ambiente de banco de dados de carteira %s!</translation> </message> <message> + <source>Error loading %s</source> + <translation>Erro ao carregar %s</translation> + </message> + <message> + <source>Error loading %s: Wallet corrupted</source> + <translation>Erro ao carregar %s Carteira corrompida</translation> + </message> + <message> + <source>Error loading %s: Wallet requires newer version of %s</source> + <translation>Erro ao carregar %s A carteira requer a versão mais nova do %s</translation> + </message> + <message> + <source>Error loading %s: You can't disable HD on a already existing HD wallet</source> + <translation>Erro ao carregar %s: Você não pode desabilitar HD numa já existente carteira HD.</translation> + </message> + <message> <source>Error loading block database</source> <translation>Erro ao carregar banco de dados de blocos</translation> </message> @@ -1979,10 +3294,18 @@ <translation>Bloco gênese incorreto ou não encontrado. Datadir errado para a rede?</translation> </message> <message> + <source>Initialization sanity check failed. %s is shutting down.</source> + <translation>O teste de integridade de inicialização falhou. O %s está sendo desligado.</translation> + </message> + <message> <source>Invalid -onion address: '%s'</source> <translation>Endereço -onion inválido: '%s'</translation> </message> <message> + <source>Invalid amount for -%s=<amount>: '%s'</source> + <translation>Valor inválido para -%s=<amount>: '%s'</translation> + </message> + <message> <source>Invalid amount for -fallbackfee=<amount>: '%s'</source> <translation>Valor inválido para -fallbackfee=<amount>: '%s'</translation> </message> @@ -1991,12 +3314,12 @@ <translation>Mantenha a mempool de transações abaixo de <n> megabytes (padrão: %u)</translation> </message> <message> - <source>Location of the auth cookie (default: data dir)</source> - <translation>Localização do cookie de autenticação (padrão: diretório de dados)</translation> + <source>Loading banlist...</source> + <translation>Carregando lista de banidos...</translation> </message> <message> - <source>Minimum bytes per sigop in transactions we relay and mine (default: %u)</source> - <translation>Número mínimo de bytes por sigop em transações que transmitimos e mineramos (default: %u)</translation> + <source>Location of the auth cookie (default: data dir)</source> + <translation>Localização do cookie de autenticação (padrão: diretório de dados)</translation> </message> <message> <source>Not enough file descriptors available.</source> @@ -2007,16 +3330,32 @@ <translation>Somente conectar a clientes na rede <net> (ipv4, ipv6 ou onion)</translation> </message> <message> + <source>Print this help message and exit</source> + <translation>Mostra essa mensagem de ajuda e sai</translation> + </message> + <message> <source>Print version and exit</source> - <translation>Mostra a versão e sai</translation> + <translation>Mostra a versão e fecha</translation> </message> <message> <source>Prune cannot be configured with a negative value.</source> - <translation>O modo Prune não pode ser configurado com um valor negativo.</translation> + <translation>O modo prune não pode ser configurado com um valor negativo.</translation> </message> <message> <source>Prune mode is incompatible with -txindex.</source> - <translation>O modo Prune é incompatível com -txindex.</translation> + <translation>O modo prune é incompatível com -txindex.</translation> + </message> + <message> + <source>Rebuild chain state and block index from the blk*.dat files on disk</source> + <translation>Reconstruir índice de cadeia de bloco a partir dos arquivos blk*.dat no disco</translation> + </message> + <message> + <source>Rebuild chain state from the currently indexed blocks</source> + <translation>Reconstruir estado a partir dos blocos indexados</translation> + </message> + <message> + <source>Rewinding blocks...</source> + <translation>Reanalizando blocos...</translation> </message> <message> <source>Set database cache size in megabytes (%d to %d, default: %d)</source> @@ -2031,6 +3370,10 @@ <translation>Especifique o arquivo da carteira (dentro do diretório de dados)</translation> </message> <message> + <source>The source code is available from %s.</source> + <translation>O código fonte está disponível pelo %s</translation> + </message> + <message> <source>Unsupported argument -benchmark ignored, use -debug=bench.</source> <translation>Argumento não suportado -benchmark ignorado, use -debug=bench.</translation> </message> @@ -2047,6 +3390,10 @@ <translation>Use UPnP para mapear a porta de entrada (padrão: %u)</translation> </message> <message> + <source>Use the test chain</source> + <translation>Usar a rede de testes</translation> + </message> + <message> <source>User Agent comment (%s) contains unsafe characters.</source> <translation>Comentário do Agente de Usuário (%s) contém caracteres inseguros.</translation> </message> @@ -2063,6 +3410,14 @@ <translation>Carteira %s reside fora do diretório de dados %s</translation> </message> <message> + <source>Wallet debugging/testing options:</source> + <translation>Opções de depuração/teste da Carteira</translation> + </message> + <message> + <source>Wallet needed to be rewritten: restart %s to complete</source> + <translation>A Carteira precisou ser reescrita: reinicie o %s para completar</translation> + </message> + <message> <source>Wallet options:</source> <translation>Opções da carteira:</translation> </message> @@ -2092,7 +3447,7 @@ </message> <message> <source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source> - <translation>Executa um comando quando um alerta relevante é recebido ou vemos uma longa segregação (%s em cmd é substituído pela mensagem)</translation> + <translation>Executa um comando quando um alerta relevante é recebido ou vemos uma longa segregação (%s é substituída pela mensagem)</translation> </message> <message> <source>Fees (in %s/kB) smaller than this are considered zero fee for relaying, mining and transaction creation (default: %s)</source> @@ -2104,17 +3459,13 @@ </message> <message> <source>Invalid amount for -maxtxfee=<amount>: '%s' (must be at least the minrelay fee of %s to prevent stuck transactions)</source> - <translation>Valor inválido para -maxtxfee = <valor>: '%s'( precisa ser pelo menos a comissão mínima de %s para prevenir travamento de transações)</translation> + <translation>Valor inválido para -maxtxfee=<valor>: '%s' (precisa ser pelo menos a taxa mínima de %s para prevenir que a transação nunca seja confirmada)</translation> </message> <message> <source>Maximum size of data in data carrier transactions we relay and mine (default: %u)</source> <translation>Tamanho máximo de dados em transações de dados de operadora (padrão %u)</translation> </message> <message> - <source>Query for peer addresses via DNS lookup, if low on addresses (default: 1 unless -connect)</source> - <translation>Buscar por endereços de peers via busca DNS, se estiver baixo em endereços (padrão: 1 a não ser que -connect)</translation> - </message> - <message> <source>Randomize credentials for every proxy connection. This enables Tor stream isolation (default: %u)</source> <translation>Gerar credenciais aleatórias para cada conexão por proxy. Isto habilita o isolamento de stream do Tor (padrão: %u)</translation> </message> @@ -2127,8 +3478,8 @@ <translation>A quantia da transação é muito pequena para mandar </translation> </message> <message> - <source>This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit <https://www.openssl.org/> and cryptographic software written by Eric Young and UPnP software written by Thomas Bernard.</source> - <translation>Esse produto inclui software desenvolvido pelo Open SSL Project para uso na OpenSSL Toolkit <https://www.openssl.org> e software criptográfico escrito por Eric Young e software UPnP escrito por Thomas Bernard. </translation> + <source>Use hierarchical deterministic key generation (HD) after BIP32. Only has effect during wallet creation/first start</source> + <translation>Usar carteira HD. Somente tem efeito na criação de uma nova carteira</translation> </message> <message> <source>Whitelisted peers cannot be DoS banned and their transactions are always relayed, even if they are already in the mempool, useful e.g. for a gateway</source> @@ -2239,10 +3590,6 @@ <translation>Quantidade da transação muito pequena.</translation> </message> <message> - <source>Transaction amounts must be positive</source> - <translation>As quantidades das transações devem ser positivas.</translation> - </message> - <message> <source>Transaction too large for fee policy</source> <translation>Transação muito grande para enviar sem taxa</translation> </message> @@ -2307,18 +3654,22 @@ <translation>-maxtxfee é muito alto! Essa quantia poderia ser paga em uma única transação.</translation> </message> <message> - <source>-paytxfee is set very high! This is the transaction fee you will pay if you send a transaction.</source> - <translation>-paytxfee é muito alto! Este é o valor da taxa de transação que você irá pagar se enviar a transação.</translation> - </message> - <message> <source>Do not keep transactions in the mempool longer than <n> hours (default: %u)</source> <translation>Não manter transações na mempool por mais que <n> horas (padrão: %u)</translation> </message> <message> + <source>Equivalent bytes per sigop in transactions for relay and mining (default: %u)</source> + <translation>Número mínimo de bytes por assinatura em transações que transmitimos e mineramos (default: %u)</translation> + </message> + <message> <source>Fees (in %s/kB) smaller than this are considered zero fee for transaction creation (default: %s)</source> <translation>Comissões (em %s/kB) menores serão consideradas como zero para criação de transação (padrão %s)</translation> </message> <message> + <source>Force relay of transactions from whitelisted peers even if they violate local relay policy (default: %d)</source> + <translation>Força a retransmissão de transações de pares da lista branca, mesmo quando violam a política local de retransmissão (default: %d)</translation> + </message> + <message> <source>How thorough the block verification of -checkblocks is (0-4, default: %u)</source> <translation>Quão completa a verificação de blocos do -checkblocks é (0-4, padrão: %u)</translation> </message> @@ -2335,10 +3686,26 @@ <translation>Informação de saída de debug (padrão: %u, definir <category> é opcional)</translation> </message> <message> + <source>Query for peer addresses via DNS lookup, if low on addresses (default: 1 unless -connect/-noconnect)</source> + <translation>Buscar por endereços de peers via DNS, se estiver baixo em endereços (padrão: 1 a não ser que -connect/-noconnect)</translation> + </message> + <message> + <source>Sets the serialization of raw transaction or block hex returned in non-verbose mode, non-segwit(0) or segwit(1) (default: %d)</source> + <translation>Define a criação do raw da transação ou bloco em modo não verbal, não segwit (0) ou segwit (1) (padrão: %d)</translation> + </message> + <message> <source>Support filtering of blocks and transaction with bloom filters (default: %u)</source> <translation>Suportar filtragem de blocos e transações com filtros bloom (padrão: %u)</translation> </message> <message> + <source>This is the transaction fee you may pay when fee estimates are not available.</source> + <translation>Esta é a taxa que você deve pagar quando a taxa estimada não está disponível.</translation> + </message> + <message> + <source>This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit %s and cryptographic software written by Eric Young and UPnP software written by Thomas Bernard.</source> + <translation>Esse produto inclui um software desenvolvido pelo OpenSSL Project para uso na OpenSSL Toolkit %s e software criptográfico escrito por Eric Young e software UPnP escrito por Thomas Bernard. </translation> + </message> + <message> <source>Total length of network version string (%i) exceeds maximum length (%i). Reduce the number or size of uacomments.</source> <translation>O tamanho total da string de versão da rede (%i) excede o tamanho máximo (%i). Reduza o numero ou tamanho de uacomments.</translation> </message> @@ -2359,14 +3726,22 @@ <translation>Use um proxy SOCKS5 separado para alcançar participantes da rede via serviços ocultos Tor (padrão: %s)</translation> </message> <message> - <source>Username and hashed password for JSON-RPC connections. The field <userpw> comes in the format: <USERNAME>:<SALT>$<HASH>. A canonical python script is included in share/rpcuser. This option can be specified multiple times</source> - <translation>Nome de usuário e senha hash para conexões JSON-RPC. O campo <userpw> vem com o formato: <USERNAME>:<SALT>$<HASH>. Um script python canônico é incluído em share/rpcuser. Essa opção pode ser especificada múltiplas vezes.</translation> - </message> - <message> <source>Warning: Unknown block versions being mined! It's possible unknown rules are in effect</source> <translation>Aviso: Versões de bloco desconhecidas sendo mineradas! É possível que regras estranhas estejam ativas</translation> </message> <message> + <source>Warning: Wallet file corrupt, data salvaged! Original %s saved as %s in %s; if your balance or transactions are incorrect you should restore from a backup.</source> + <translation>Atenção: Arquivo da carteira corrompido, dados recuperados! Original %s salvo como %s em %s; se seu saldo ou transações estiverem incorretos, você deve restaurar o backup.</translation> + </message> + <message> + <source>Whitelist peers connecting from the given IP address (e.g. 1.2.3.4) or CIDR notated network (e.g. 1.2.3.0/24). Can be specified multiple times.</source> + <translation>Lista Branca de conecções do endereço IP informado (ex: 1.2.3.4) ou com máscara de rede (ex: 1.2.3.0/24). Pode ser especificado várias vezes.</translation> + </message> + <message> + <source>%s is set very high!</source> + <translation>%s está muito alto!</translation> + </message> + <message> <source>(default: %s)</source> <translation>(padrão: %s)</translation> </message> @@ -2387,6 +3762,10 @@ <translation>Endereço -proxy inválido: '%s'</translation> </message> <message> + <source>Keypool ran out, please call keypoolrefill first</source> + <translation>Erro na Keypool, favor executar keypoolrefill primeiro</translation> + </message> + <message> <source>Listen for JSON-RPC connections on <port> (default: %u or testnet: %u)</source> <translation>Escutar por conexões JSON-RPC na porta <port> (padrão: %u ou testnet: %u)</translation> </message> @@ -2423,12 +3802,16 @@ <translation>Retransmitir P2SH não multisig (padrão: %u)</translation> </message> <message> + <source>Send transactions with full-RBF opt-in enabled (default: %u)</source> + <translation>Ativar opção full-RBF nas transações enviadas (padrão: %u)</translation> + </message> + <message> <source>Set key pool size to <n> (default: %u)</source> <translation>Defina o tamanho da chave para piscina<n> (padrão: %u)</translation> </message> <message> - <source>Set minimum block size in bytes (default: %u)</source> - <translation>Definir tamanho mínimo do bloco, em bytes (padrão: %u)</translation> + <source>Set maximum BIP141 block weight (default: %d)</source> + <translation>Define a altura máxima BIP141 do bloco (padrão: %d)</translation> </message> <message> <source>Set the number of threads to service RPC calls (default: %d)</source> @@ -2444,17 +3827,45 @@ </message> <message> <source>Specify pid file (default: %s)</source> - <translation>Especificar aqrquivo pid (padrão: %s)</translation> + <translation>Especificar arquivo pid (padrão: %s)</translation> </message> <message> <source>Spend unconfirmed change when sending transactions (default: %u)</source> <translation>Gastar troco não confirmado quando enviar transações (padrão: %u)</translation> </message> <message> + <source>Starting network threads...</source> + <translation>Iniciando análise da rede...</translation> + </message> + <message> + <source>The wallet will avoid paying less than the minimum relay fee.</source> + <translation>A carteira irá evitar pagar menos que a taxa mínima.</translation> + </message> + <message> + <source>This is the minimum transaction fee you pay on every transaction.</source> + <translation>Esta é a taxa mínima que você deve pagar em cada transação.</translation> + </message> + <message> + <source>This is the transaction fee you will pay if you send a transaction.</source> + <translation>Esta é a taxa que você irá pagar se enviar a transação.</translation> + </message> + <message> <source>Threshold for disconnecting misbehaving peers (default: %u)</source> <translation>Limite para desconectar peers mal comportados (padrão: %u)</translation> </message> <message> + <source>Transaction amounts must not be negative</source> + <translation>As quantidades das transações devem ser positivas.</translation> + </message> + <message> + <source>Transaction has too long of a mempool chain</source> + <translation>A transação demorou muito na memória</translation> + </message> + <message> + <source>Transaction must have at least one recipient</source> + <translation>A transação deve ter ao menos um destinatário</translation> + </message> + <message> <source>Unknown network specified in -onlynet: '%s'</source> <translation>Rede desconhecida especificada em -onlynet: '%s'</translation> </message> @@ -2488,7 +3899,7 @@ </message> <message> <source>Done loading</source> - <translation>Carregamento terminado</translation> + <translation>Carregamento terminado!</translation> </message> <message> <source>Error</source> diff --git a/src/qt/locale/bitcoin_pt_PT.ts b/src/qt/locale/bitcoin_pt_PT.ts index eed262e010..c97272d4b7 100644 --- a/src/qt/locale/bitcoin_pt_PT.ts +++ b/src/qt/locale/bitcoin_pt_PT.ts @@ -41,24 +41,159 @@ <source>&Delete</source> <translation>&Eliminar</translation> </message> + <message> + <source>Choose the address to send coins to</source> + <translation>Escolha o endereço para enviar as moedas</translation> + </message> + <message> + <source>Choose the address to receive coins with</source> + <translation>Escolha o endereço para receber as moedas</translation> + </message> + <message> + <source>C&hoose</source> + <translation>Escol&her</translation> + </message> + <message> + <source>Sending addresses</source> + <translation>A enviar endereços</translation> + </message> + <message> + <source>Receiving addresses</source> + <translation>A receber endereços</translation> + </message> + <message> + <source>&Copy Address</source> + <translation>&Copiar Endereço</translation> + </message> + <message> + <source>Copy &Label</source> + <translation>Copiar &Etiqueta</translation> + </message> + <message> + <source>&Edit</source> + <translation>&Editar</translation> + </message> + <message> + <source>Export Address List</source> + <translation>Exportar Lista de Endereços</translation> + </message> + <message> + <source>Comma separated file (*.csv)</source> + <translation>Ficheiro separado por vírgulas (*.csv)</translation> + </message> + <message> + <source>Exporting Failed</source> + <translation>Exportação Falhou</translation> + </message> + <message> + <source>There was an error trying to save the address list to %1. Please try again.</source> + <translation>Ocorreu um erro ao tentar guardar a lista de endereços para %1. Por favor, tente novamente.</translation> + </message> +</context> +<context> + <name>AddressTableModel</name> + <message> + <source>Label</source> + <translation>Etiqueta</translation> + </message> + <message> + <source>Address</source> + <translation>Endereço</translation> + </message> + <message> + <source>(no label)</source> + <translation>(sem etiqueta)</translation> + </message> </context> <context> <name>AskPassphraseDialog</name> <message> <source>Passphrase Dialog</source> - <translation>Janela da frase de palavra-passe</translation> + <translation>Janela da Frase de Segurança</translation> </message> <message> <source>Enter passphrase</source> - <translation>Insira a frase de palavra-passe</translation> + <translation>Insira a frase de segurança</translation> </message> <message> <source>New passphrase</source> - <translation>Nova frase de palavra-passe</translation> + <translation>Nova frase de frase de segurança</translation> </message> <message> <source>Repeat new passphrase</source> - <translation>Repita a nova frase de palavra-passe</translation> + <translation>Repita a nova frase de frase de segurança</translation> + </message> + <message> + <source>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>.</source> + <translation>Insira a nova frase de segurança para a carteira. <br/> Por favor, utilize uma frase de segurança de <b>10 ou mais carateres aleatórios,</b> ou <b>oito ou mais palavras</b>.</translation> + </message> + <message> + <source>Encrypt wallet</source> + <translation>Encriptar carteira</translation> + </message> + <message> + <source>This operation needs your wallet passphrase to unlock the wallet.</source> + <translation>Esta operação precisa da sua frase de segurança da carteira para desbloquear a mesma.</translation> + </message> + <message> + <source>Unlock wallet</source> + <translation>Desbloquear carteira</translation> + </message> + <message> + <source>This operation needs your wallet passphrase to decrypt the wallet.</source> + <translation>Esta operação precisa da sua frase de segurança da carteira para desencriptar a mesma.</translation> + </message> + <message> + <source>Decrypt wallet</source> + <translation>Desencriptar carteira</translation> + </message> + <message> + <source>Change passphrase</source> + <translation>Alterar frase de segurança</translation> + </message> + <message> + <source>Enter the old passphrase and new passphrase to the wallet.</source> + <translation>Insira a frase de segurança antiga e a nova frase de segurança para a carteira.</translation> + </message> + <message> + <source>Confirm wallet encryption</source> + <translation>Confirmar encriptação da carteira</translation> + </message> + <message> + <source>Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR BITCOINS</b>!</source> + <translation>Aviso: se encriptar a sua carteira e perder a sua frase de segurnça, <b>PERDERÁ TODOS OS SEUS BITCOINS</b>!</translation> + </message> + <message> + <source>Are you sure you wish to encrypt your wallet?</source> + <translation>Tem a certeza que deseja encriptar a sua carteira?</translation> + </message> + <message> + <source>Wallet encrypted</source> + <translation>Carteira encriptada</translation> + </message> + <message> + <source>Wallet encryption failed</source> + <translation>Encriptação da carteira falhou</translation> + </message> + <message> + <source>The supplied passphrases do not match.</source> + <translation>As frases de segurança fornecidas não coincidem.</translation> + </message> + <message> + <source>Wallet unlock failed</source> + <translation>Desbloqueio da carteira falhou</translation> + </message> + <message> + <source>Wallet decryption failed</source> + <translation>Desencriptação da carteira falhou</translation> + </message> + <message> + <source>Wallet passphrase was successfully changed.</source> + <translation>A frase de segurança da carteira foi alterada com sucesso.</translation> + </message> + <message> + <source>Warning: The Caps Lock key is on!</source> + <translation>Aviso: a tecla Caps Lock está ligada!</translation> </message> </context> <context> @@ -84,7 +219,7 @@ </message> <message> <source>&Overview</source> - <translation>&Sinopse</translation> + <translation>&Resumo</translation> </message> <message> <source>Node</source> @@ -92,7 +227,7 @@ </message> <message> <source>Show general overview of wallet</source> - <translation>Mostrar sinopse geral da carteira</translation> + <translation>Mostrar resumo geral da carteira</translation> </message> <message> <source>&Transactions</source> @@ -112,19 +247,19 @@ </message> <message> <source>&About %1</source> - <translation>&Acerca de %1</translation> + <translation>&Sobre o %1</translation> </message> <message> <source>Show information about %1</source> - <translation>Mostrar informação sobre %1</translation> + <translation>Mostrar informação sobre o %1</translation> </message> <message> <source>About &Qt</source> - <translation>Sobre &Qt</translation> + <translation>Sobre o &Qt</translation> </message> <message> <source>Show information about Qt</source> - <translation>Mostrar informação sobre Qt</translation> + <translation>Mostrar informação sobre o Qt</translation> </message> <message> <source>&Options...</source> @@ -140,11 +275,11 @@ </message> <message> <source>&Backup Wallet...</source> - <translation>&Guardar Carteira...</translation> + <translation>Efetuar &Cópia de Segurança da Carteira...</translation> </message> <message> <source>&Change Passphrase...</source> - <translation>Alterar &Frase de Palavra-passe...</translation> + <translation>Alterar &Frase de Segurança...</translation> </message> <message> <source>&Sending addresses...</source> @@ -159,12 +294,24 @@ <translation>Abrir &URI...</translation> </message> <message> + <source>Click to disable network activity.</source> + <translation>Clique para desativar a atividade de rede.</translation> + </message> + <message> + <source>Network activity disabled.</source> + <translation>Atividade de rede desativada.</translation> + </message> + <message> + <source>Click to enable network activity again.</source> + <translation>Clique para ativar novamente a atividade de rede.</translation> + </message> + <message> <source>Reindexing blocks on disk...</source> <translation>A reindexar os blocos no disco...</translation> </message> <message> <source>Send coins to a Bitcoin address</source> - <translation>Enviar moedas para um endereço bitcoin</translation> + <translation>Enviar moedas para um endereço Bitcoin</translation> </message> <message> <source>Backup wallet to another location</source> @@ -172,11 +319,11 @@ </message> <message> <source>Change the passphrase used for wallet encryption</source> - <translation>Alterar a frase de palavra-passe utilizada na encriptação da carteira</translation> + <translation>Alterar a frase de segurança utilizada na encriptação da carteira</translation> </message> <message> <source>&Debug window</source> - <translation>Janela de &depuração</translation> + <translation>Janela de &Depuração</translation> </message> <message> <source>Open debugging and diagnostic console</source> @@ -216,7 +363,7 @@ </message> <message> <source>Sign messages with your Bitcoin addresses to prove you own them</source> - <translation>Assine mensagens com os seus endereços Bitcoin para provar que os controla</translation> + <translation>Assine as mensagens com os seus endereços Bitcoin para provar que é o proprietário dos mesmos</translation> </message> <message> <source>Verify messages to ensure they were signed with specified Bitcoin addresses</source> @@ -270,34 +417,10 @@ <source>Processing blocks on disk...</source> <translation>A processar blocos no disco...</translation> </message> - <message> - <source>No block source available...</source> - <translation>Nenhuma fonte de blocos disponível...</translation> - </message> <message numerus="yes"> <source>Processed %n block(s) of transaction history.</source> <translation><numerusform>Processado %n bloco do histórico de transações.</numerusform><numerusform>Processados %n blocos do histórico de transações.</numerusform></translation> </message> - <message numerus="yes"> - <source>%n hour(s)</source> - <translation><numerusform>%n hora</numerusform><numerusform>%n horas</numerusform></translation> - </message> - <message numerus="yes"> - <source>%n day(s)</source> - <translation><numerusform>%n dia</numerusform><numerusform>%n dias</numerusform></translation> - </message> - <message numerus="yes"> - <source>%n week(s)</source> - <translation><numerusform>%n semana</numerusform><numerusform>%n semanas</numerusform></translation> - </message> - <message> - <source>%1 and %2</source> - <translation>%1 e %2</translation> - </message> - <message numerus="yes"> - <source>%n year(s)</source> - <translation><numerusform>%n ano</numerusform><numerusform>%n anos</numerusform></translation> - </message> <message> <source>%1 behind</source> <translation>%1 em atraso</translation> @@ -327,6 +450,10 @@ <translation>Atualizado</translation> </message> <message> + <source>%1 client</source> + <translation>Cliente %1</translation> + </message> + <message> <source>Catching up...</source> <translation>Recuperando o atraso...</translation> </message> @@ -369,6 +496,14 @@ <translation>Transação recebida</translation> </message> <message> + <source>HD key generation is <b>enabled</b></source> + <translation>Criação de chave HD está <b>ativada</b></translation> + </message> + <message> + <source>HD key generation is <b>disabled</b></source> + <translation>Criação de chave HD está <b>desativada</b></translation> + </message> + <message> <source>Wallet is <b>encrypted</b> and currently <b>unlocked</b></source> <translation>A carteira está <b>encriptada</b> e atualmente <b>desbloqueada</b></translation> </message> @@ -376,7 +511,7 @@ <source>Wallet is <b>encrypted</b> and currently <b>locked</b></source> <translation>A carteira está <b>encriptada</b> e atualmente <b>bloqueada</b></translation> </message> -</context> + </context> <context> <name>CoinControlDialog</name> <message> @@ -396,10 +531,6 @@ <translation>Valor:</translation> </message> <message> - <source>Priority:</source> - <translation>Prioridade:</translation> - </message> - <message> <source>Fee:</source> <translation>Taxa:</translation> </message> @@ -452,8 +583,72 @@ <translation>Confirmada</translation> </message> <message> - <source>Priority</source> - <translation>Prioridade</translation> + <source>Copy address</source> + <translation>Copiar endereço</translation> + </message> + <message> + <source>Copy label</source> + <translation>Copiar etiqueta</translation> + </message> + <message> + <source>Copy amount</source> + <translation>Copiar valor</translation> + </message> + <message> + <source>Copy transaction ID</source> + <translation>Copiar Id. da transação</translation> + </message> + <message> + <source>Lock unspent</source> + <translation>Bloquear não gasto</translation> + </message> + <message> + <source>Unlock unspent</source> + <translation>Desbloquear não gasto</translation> + </message> + <message> + <source>Copy quantity</source> + <translation>Copiar quantidade</translation> + </message> + <message> + <source>Copy fee</source> + <translation>Copiar taxa</translation> + </message> + <message> + <source>Copy after fee</source> + <translation>Copiar depois da taxa</translation> + </message> + <message> + <source>Copy bytes</source> + <translation>Copiar bytes</translation> + </message> + <message> + <source>Copy change</source> + <translation>Copiar troco</translation> + </message> + <message> + <source>(%1 locked)</source> + <translation>(%1 bloqueado)</translation> + </message> + <message> + <source>yes</source> + <translation>sim</translation> + </message> + <message> + <source>no</source> + <translation>não</translation> + </message> + <message> + <source>(no label)</source> + <translation>(sem etiqueta)</translation> + </message> + <message> + <source>change from %1 (%2)</source> + <translation>troco de %1 (%2)</translation> + </message> + <message> + <source>(change)</source> + <translation>(troco)</translation> </message> </context> <context> @@ -478,12 +673,20 @@ <source>&Address</source> <translation>E&ndereço</translation> </message> + <message> + <source>Could not unlock wallet.</source> + <translation>Não foi possível desbloquear a carteira.</translation> + </message> + <message> + <source>New key generation failed.</source> + <translation>A criação da nova chave falhou.</translation> + </message> </context> <context> <name>FreespaceChecker</name> <message> <source>A new data directory will be created.</source> - <translation>Irá ser criada uma nova diretoria de dados.</translation> + <translation>Será criada uma nova diretoria de dados.</translation> </message> <message> <source>name</source> @@ -495,7 +698,7 @@ </message> <message> <source>Path already exists, and is not a directory.</source> - <translation>Caminho já existe, e não é uma pasta.</translation> + <translation>O caminho já existe, e este não é uma pasta.</translation> </message> <message> <source>Cannot create data directory here.</source> @@ -514,7 +717,7 @@ </message> <message> <source>About %1</source> - <translation>Sobre %1</translation> + <translation>Sobre o %1</translation> </message> <message> <source>Command-line options</source> @@ -534,11 +737,11 @@ </message> <message> <source>Choose data directory on startup (default: %u)</source> - <translation>Escolha a diretoria dos dados no arranque (predefinição: %u)</translation> + <translation>Escolher a pasta de dados no arranque (predefinição: %u)</translation> </message> <message> <source>Set language, for example "de_DE" (default: system locale)</source> - <translation>Definir linguagem, por exemplo "pt_PT" (por defeito: linguagem do sistema)</translation> + <translation>Definir idioma, por exemplo "pt_PT" (predefinição: idioma do sistema)</translation> </message> <message> <source>Start minimized</source> @@ -546,13 +749,17 @@ </message> <message> <source>Set SSL root certificates for payment request (default: -system-)</source> - <translation>Configurar certificados SSL root para pedido de pagamento (default: -system-)</translation> + <translation>Definir certificados de raiz SSL para pedidos de pagamento (predefinição: -system-)</translation> </message> <message> <source>Show splash screen on startup (default: %u)</source> <translation>Mostrar o ecrã de abertura no arranque (predefinição: %u)</translation> </message> - </context> + <message> + <source>Reset all settings changed in the GUI</source> + <translation>Redefinir todas as definições alteradas na GUI</translation> + </message> +</context> <context> <name>Intro</name> <message> @@ -561,19 +768,19 @@ </message> <message> <source>Welcome to %1.</source> - <translation>Bem-vindo a %1.</translation> + <translation>Bem-vindo ao %1.</translation> </message> <message> <source>Use the default data directory</source> - <translation>Utilizar a diretoria de dados predefinida</translation> + <translation>Utilizar a pasta de dados predefinida</translation> </message> <message> <source>Use a custom data directory:</source> - <translation>Utilizar uma diretoria de dados personalizada:</translation> + <translation>Utilizar uma pasta de dados personalizada:</translation> </message> <message> <source>Error: Specified data directory "%1" cannot be created.</source> - <translation>Erro: não pode ser criada a diretoria de dados especificada como "%1.</translation> + <translation>Erro: não pode ser criada a pasta de dados especificada como "%1.</translation> </message> <message> <source>Error</source> @@ -589,6 +796,45 @@ </message> </context> <context> + <name>ModalOverlay</name> + <message> + <source>Form</source> + <translation>Formulário</translation> + </message> + <message> + <source>Number of blocks left</source> + <translation>Número de blocos restantes</translation> + </message> + <message> + <source>Unknown...</source> + <translation>Desconhecido...</translation> + </message> + <message> + <source>Last block time</source> + <translation>Data do último bloco</translation> + </message> + <message> + <source>Progress</source> + <translation>Progresso</translation> + </message> + <message> + <source>calculating...</source> + <translation>a calcular...</translation> + </message> + <message> + <source>Estimated time left until synced</source> + <translation>tempo restante estimado até à sincronização</translation> + </message> + <message> + <source>Hide</source> + <translation>Ocultar</translation> + </message> + <message> + <source>Unknown. Syncing Headers (%1)...</source> + <translation>Desconhecido. Sincronização de Cabeçalhos (%1)...</translation> + </message> +</context> +<context> <name>OpenURIDialog</name> <message> <source>Open URI</source> @@ -604,7 +850,11 @@ </message> <message> <source>Select payment request file</source> - <translation>Seleccione o ficheiro de pedido de pagamento</translation> + <translation>Selecione o ficheiro de pedido de pagamento</translation> + </message> + <message> + <source>Select payment request file to open</source> + <translation>Selecione o ficheiro de pedido de pagamento para abrir</translation> </message> </context> <context> @@ -619,7 +869,7 @@ </message> <message> <source>Automatically start %1 after logging in to the system.</source> - <translation>Começar o %1 automaticamente ao iniciar a sessão no sistema.</translation> + <translation>Iniciar automaticamente o %1 depois de iniciar a sessão no sistema.</translation> </message> <message> <source>&Start %1 on system login</source> @@ -647,7 +897,7 @@ </message> <message> <source>IP address of the proxy (e.g. IPv4: 127.0.0.1 / IPv6: ::1)</source> - <translation>Endereço IP do proxy (p.ex. IPv4: 127.0.0.1 / IPv6: ::1)</translation> + <translation>Endereço de IP do proxy (exemplo, IPv4: 127.0.0.1 / IPv6: ::1)</translation> </message> <message> <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Exit in the menu.</source> @@ -688,15 +938,15 @@ </message> <message> <source>Expert</source> - <translation> Especialistas </translation> + <translation> Técnicos</translation> </message> <message> <source>Enable coin &control features</source> - <translation>Ativar as funcionalidades de controlo de moedas</translation> + <translation>Ativar as funcionalidades de &controlo de moedas</translation> </message> <message> <source>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.</source> - <translation>No caso de desativar o gasto de troco não confirmado, o troco de uma transação não poderá ser utilizado até que essa transação tenha pelo menos uma confirmação. Isto também afeta o cálculo do seu saldo.</translation> + <translation>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.</translation> </message> <message> <source>&Spend unconfirmed change</source> @@ -763,6 +1013,10 @@ <translation>&Janela</translation> </message> <message> + <source>&Hide the icon from the system tray.</source> + <translation>&Ocultar o ícone da bandeja do sistema.</translation> + </message> + <message> <source>Hide tray icon</source> <translation>Ocultar ícone da bandeja</translation> </message> @@ -828,7 +1082,7 @@ </message> <message> <source>This change would require a client restart.</source> - <translation>Esta alteração requer um reinício do cliente.</translation> + <translation>Esta alteração obrigará a um reinício do cliente.</translation> </message> <message> <source>The supplied proxy address is invalid.</source> @@ -911,6 +1165,37 @@ </message> </context> <context> + <name>PaymentServer</name> + <message> + <source>Payment request error</source> + <translation>Erro do pedido de pagamento</translation> + </message> + <message> + <source>Payment request rejected</source> + <translation>Pedido de pagamento rejeitado</translation> + </message> + <message> + <source>Payment request expired.</source> + <translation>Pedido de pagamento expirado.</translation> + </message> + <message> + <source>Payment request is not initialized.</source> + <translation>O pedido de pagamento não foi inicializado.</translation> + </message> + <message> + <source>Invalid payment request.</source> + <translation>Pedido de pagamento inválido.</translation> + </message> + <message> + <source>Refund from %1</source> + <translation>Reembolso de %1</translation> + </message> + <message> + <source>Error communicating with %1: %2</source> + <translation>Erro ao comunicar com %1: %2</translation> + </message> + </context> +<context> <name>PeerTableModel</name> <message> <source>User Agent</source> @@ -920,11 +1205,7 @@ <source>Node/Service</source> <translation>Nó/Serviço</translation> </message> - <message> - <source>Ping Time</source> - <translation>Tempo de Latência</translation> - </message> -</context> + </context> <context> <name>QObject</name> <message> @@ -963,7 +1244,17 @@ <source>%1 ms</source> <translation>%1 ms</translation> </message> -</context> + <message> + <source>%1 and %2</source> + <translation>%1 e %2</translation> + </message> + </context> +<context> + <name>QObject::QObject</name> + </context> +<context> + <name>QRImageWidget</name> + </context> <context> <name>RPCConsole</name> <message> @@ -1159,14 +1450,6 @@ <translation>Limpar consola</translation> </message> <message> - <source>&Disconnect Node</source> - <translation>&Desligar Nó</translation> - </message> - <message> - <source>Ban Node for</source> - <translation>Banir Nó por</translation> - </message> - <message> <source>1 &hour</source> <translation>1 &hora</translation> </message> @@ -1183,10 +1466,6 @@ <translation>1 &ano</translation> </message> <message> - <source>&Unban Node</source> - <translation>&Desbloquear Nó</translation> - </message> - <message> <source>Welcome to the %1 RPC console.</source> <translation>Bem-vindo à consola RPC da %1.</translation> </message> @@ -1317,6 +1596,14 @@ <source>Remove</source> <translation>Remover</translation> </message> + <message> + <source>Copy label</source> + <translation>Copiar etiqueta</translation> + </message> + <message> + <source>Copy amount</source> + <translation>Copiar valor</translation> + </message> </context> <context> <name>ReceiveRequestDialog</name> @@ -1336,7 +1623,30 @@ <source>&Save Image...</source> <translation>&Salvar Imagem...</translation> </message> -</context> + <message> + <source>Address</source> + <translation>Endereço</translation> + </message> + <message> + <source>Amount</source> + <translation>Valor</translation> + </message> + <message> + <source>Label</source> + <translation>Etiqueta</translation> + </message> + </context> +<context> + <name>RecentRequestsTableModel</name> + <message> + <source>Label</source> + <translation>Etiqueta</translation> + </message> + <message> + <source>(no label)</source> + <translation>(sem etiqueta)</translation> + </message> + </context> <context> <name>SendCoinsDialog</name> <message> @@ -1372,10 +1682,6 @@ <translation>Quantia:</translation> </message> <message> - <source>Priority:</source> - <translation>Prioridade:</translation> - </message> - <message> <source>Fee:</source> <translation>Taxa:</translation> </message> @@ -1389,7 +1695,7 @@ </message> <message> <source>If this is activated, but the change address is empty or invalid, change will be sent to a newly generated address.</source> - <translation>Se isto estiver ativo, mas o endereço de troco estiver vazio ou for inválido, o troco irá ser enviado para um novo endereço.</translation> + <translation>Se isto estiver ativo, mas o endereço de troco estiver vazio ou for inválido, o troco será enviado para um novo endereço gerado.</translation> </message> <message> <source>Custom change address</source> @@ -1397,7 +1703,7 @@ </message> <message> <source>Transaction Fee:</source> - <translation>Custo da Transação:</translation> + <translation>Taxa da transação:</translation> </message> <message> <source>Choose...</source> @@ -1405,7 +1711,7 @@ </message> <message> <source>collapse fee-settings</source> - <translation>fechar definições-de custos</translation> + <translation>ocultar definições de taxa</translation> </message> <message> <source>per kilobyte</source> @@ -1413,7 +1719,7 @@ </message> <message> <source>If the custom fee is set to 1000 satoshis and the transaction is only 250 bytes, then "per kilobyte" only pays 250 satoshis in fee, while "total at least" pays 1000 satoshis. For transactions bigger than a kilobyte both pay by kilobyte.</source> - <translation>Se a taxa fixa for 1000 satoshis e a transação for somente 250 bytes, pagará somente 250 satoshis "por kilobyte" em custos se trasacionar "pelo menos" 1000 satoshis. Transações superiores a um kilobyte são cobradas por kilobyte.</translation> + <translation>Se a taxa personalizada estiver definida para 1.000 satoshis e a transação é de apenas 250 bytes, então paga apenas 250 satoshis "por kilobyte" na taxa, enquanto em "total pelo menos" paga 1.000 satoshis. Para transações superiores a um kilobyte ambos pagam por kilobyte.</translation> </message> <message> <source>Hide</source> @@ -1441,11 +1747,7 @@ </message> <message> <source>(Smart fee not initialized yet. This usually takes a few blocks...)</source> - <translation>(Taxa inteligente ainda não foi acionada. Normalmente demora alguns blocos...)</translation> - </message> - <message> - <source>Confirmation time:</source> - <translation>Tempo de confirmação:</translation> + <translation>(A taxa inteligente ainda não foi inicializada. Isto normalmente demora alguns blocos...)</translation> </message> <message> <source>normal</source> @@ -1487,6 +1789,62 @@ <source>S&end</source> <translation>E&nviar</translation> </message> + <message> + <source>Copy quantity</source> + <translation>Copiar quantidade</translation> + </message> + <message> + <source>Copy amount</source> + <translation>Copiar valor</translation> + </message> + <message> + <source>Copy fee</source> + <translation>Copiar taxa</translation> + </message> + <message> + <source>Copy after fee</source> + <translation>Copiar depois da taxa</translation> + </message> + <message> + <source>Copy bytes</source> + <translation>Copiar bytes</translation> + </message> + <message> + <source>Copy change</source> + <translation>Copiar troco</translation> + </message> + <message> + <source>added as transaction fee</source> + <translation>adicionado como taxa de transação</translation> + </message> + <message> + <source>The total exceeds your balance when the %1 transaction fee is included.</source> + <translation>O total excede o seu saldo quando a taxa de transação %1 está incluída.</translation> + </message> + <message> + <source>A fee higher than %1 is considered an absurdly high fee.</source> + <translation>Uma taxa superior a %1 é considerada uma taxa altamente absurda.</translation> + </message> + <message> + <source>Payment request expired.</source> + <translation>Pedido de pagamento expirado.</translation> + </message> + <message> + <source>Pay only the required fee of %1</source> + <translation>Pague apenas a taxa obrigatória de %1</translation> + </message> + <message> + <source>Warning: Unknown change address</source> + <translation>Aviso: endereço de troco desconhecido</translation> + </message> + <message> + <source>Confirm custom change address</source> + <translation>Confirmar endereço de troco personalizado</translation> + </message> + <message> + <source>(no label)</source> + <translation>(sem etiqueta)</translation> + </message> </context> <context> <name>SendCoinsEntry</name> @@ -1536,7 +1894,7 @@ </message> <message> <source>S&ubtract fee from amount</source> - <translation>S&ubtrair taxa ao montante</translation> + <translation>S&ubtrair a taxa ao montante</translation> </message> <message> <source>Message:</source> @@ -1566,7 +1924,10 @@ <source>Memo:</source> <translation>Memorando:</translation> </message> -</context> + </context> +<context> + <name>SendConfirmationDialog</name> + </context> <context> <name>ShutdownWindow</name> <message> @@ -1664,7 +2025,7 @@ <source>Reset all verify message fields</source> <translation>Repor todos os campos de verificação de mensagem</translation> </message> -</context> + </context> <context> <name>SplashScreen</name> <message> @@ -1680,12 +2041,69 @@ </message> </context> <context> + <name>TransactionDesc</name> + <message> + <source>Transaction fee</source> + <translation>Taxa de transação</translation> + </message> + <message> + <source>Amount</source> + <translation>Valor</translation> + </message> + </context> +<context> <name>TransactionDescDialog</name> <message> <source>This pane shows a detailed description of the transaction</source> <translation>Esta janela mostra uma descrição detalhada da transação</translation> </message> -</context> + </context> +<context> + <name>TransactionTableModel</name> + <message> + <source>Label</source> + <translation>Etiqueta</translation> + </message> + <message> + <source>(no label)</source> + <translation>(sem etiqueta)</translation> + </message> + </context> +<context> + <name>TransactionView</name> + <message> + <source>Copy address</source> + <translation>Copiar endereço</translation> + </message> + <message> + <source>Copy label</source> + <translation>Copiar etiqueta</translation> + </message> + <message> + <source>Copy amount</source> + <translation>Copiar valor</translation> + </message> + <message> + <source>Copy transaction ID</source> + <translation>Copiar Id. da transação</translation> + </message> + <message> + <source>Comma separated file (*.csv)</source> + <translation>Ficheiro separado por vírgulas (*.csv)</translation> + </message> + <message> + <source>Label</source> + <translation>Etiqueta</translation> + </message> + <message> + <source>Address</source> + <translation>Endereço</translation> + </message> + <message> + <source>Exporting Failed</source> + <translation>Exportação Falhou</translation> + </message> + </context> <context> <name>UnitDisplayStatusBarControl</name> <message> @@ -1694,6 +2112,19 @@ </message> </context> <context> + <name>WalletFrame</name> + </context> +<context> + <name>WalletModel</name> + </context> +<context> + <name>WalletView</name> + <message> + <source>Export the data in the current tab to a file</source> + <translation>Exportar os dados no separador atual para um ficheiro</translation> + </message> + </context> +<context> <name>bitcoin-core</name> <message> <source>Options:</source> @@ -1728,10 +2159,6 @@ <translation>Suprimir: a última sincronização da carteira vai além dos dados suprimidos. O que precisa para -reindex (transferir novamente toda a cadeia de blocos, no caso de nó suprimido)</translation> </message> <message> - <source>Reduce storage requirements by pruning (deleting) old blocks. This mode is incompatible with -txindex and -rescan. Warning: Reverting this setting requires re-downloading the entire blockchain. (default: 0 = disable pruning blocks, >%u = target size in MiB to use for block files)</source> - <translation>Reduza os requisitos de armazenamento podando (eliminando) blocos antigos. Este modo é incompatível com -txindex e -rescan. Aviso: Reverter esta opção requer um novo descarregamento da cadeia de blocos completa. (padrão: 0 = desactivar poda de blocos, >%u = tamanho desejado em MiB para utilizar em ficheiros de blocos)</translation> - </message> - <message> <source>Rescans are not possible in pruned mode. You will need to use -reindex which will download the whole blockchain again.</source> <translation>Reanálises não são possíveis no modo de suprimir. Para isso terá de utilizar -reindex que irá transferir novamente toda a cadeia de blocos.</translation> </message> @@ -1741,7 +2168,7 @@ </message> <message> <source>Fee (in %s/kB) to add to transactions you send (default: %s)</source> - <translation>Taxa (em %s/kB) a adicionar às transacções que envia (padrão: %s)</translation> + <translation>Taxa (em %s/kB) para adicionar às transações que envia (predefinição: %s)</translation> </message> <message> <source>Pruning blockstore...</source> @@ -1756,18 +2183,10 @@ <translation>Não é possível iniciar o servidor HTTP. Verifique o debug.log para detalhes.</translation> </message> <message> - <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> - <translation>Aceitar ligações externas (padrão: 1 sem -proxy ou -connect)</translation> - </message> - <message> <source>Bitcoin Core</source> <translation>Bitcoin Core</translation> </message> <message> - <source>-fallbackfee is set very high! This is the transaction fee you may pay when fee estimates are not available.</source> - <translation>-fallbackfee está definida muito elevada! Esta é a taxa de transação pode poderá pagar quando as estimativas de taxas não estão disponíveis.</translation> - </message> - <message> <source>A fee rate (in %s/kB) that will be used when fee estimation has insufficient data (default: %s)</source> <translation>Uma percentagem da taxa (em %s/kB) que será utilizada quando a estimativa da taxa tiver dados insuficientes (predefinição: %s)</translation> </message> @@ -1784,16 +2203,8 @@ <translation>Apague todas as transações da carteira e somente restore aquelas que façam parte do blockchain através de re-scan ao reiniciar o programa</translation> </message> <message> - <source>Distributed under the MIT software license, see the accompanying file COPYING or <http://www.opensource.org/licenses/mit-license.php>.</source> - <translation>Distribuido através da licença de software MIT, verifique o ficheiro anexado COPYING ou <http://www.opensource.org/licenses/mit-license.php>.</translation> - </message> - <message> <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source> - <translation>Executar comando quando uma das transações na carteira mudar (no comando, %s é substituído pelo ID da Transação)</translation> - </message> - <message> - <source>Force relay of transactions from whitelisted peers even they violate local relay policy (default: %d)</source> - <translation>Forçar retransmissão das transações a partir dos pares da lista branca, mesmo que estes violem a política de retransmissão local (predefinição: %d)</translation> + <translation>Executar o comando quando uma transação da carteira muda (no comando, %s é substituído pela Id. da Transação)</translation> </message> <message> <source>Set the number of script verification threads (%u to %d, 0 = auto, <0 = leave that many cores free, default: %d)</source> @@ -1804,26 +2215,10 @@ <translation>A base de dados de blocos contém um bloco que aparenta ser do futuro. Isto pode ser causado por uma data incorrecta definida no seu computador. Reconstrua apenas a base de dados de blocos caso tenha a certeza de que a data e hora do seu computador estão correctos.</translation> </message> <message> - <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source> - <translation>Esta é uma versão de testes pré-lançamento - use à sua responsabilidade - não usar para minar ou aplicações comerciais</translation> - </message> - <message> <source>Use UPnP to map the listening port (default: 1 when listening and no -proxy)</source> <translation>Utilizar UPnP para mapear a porta de escuta (predefinição: 1 quando escutar e sem -proxy)</translation> </message> <message> - <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source> - <translation>Aviso: A rede não parece estar completamente de acordo! Parece que alguns mineiros estão com dificuldades técnicas.</translation> - </message> - <message> - <source>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</source> - <translation>Atenção: Parecemos não estar de acordo com os nossos pares! Poderá ter que atualizar o seu cliente, ou outros nós poderão ter que atualizar os seus clientes.</translation> - </message> - <message> - <source>Whitelist peers connecting from the given netmask or IP address. Can be specified multiple times.</source> - <translation>Ligações na lista branca conectam desde a seguinte netmask ou endereço IP. Posse ser especificado varias vezes.</translation> - </message> - <message> <source>-maxmempool must be at least %d MB</source> <translation>- máximo do banco de memória deverá ser pelo menos %d MB</translation> </message> @@ -1844,10 +2239,6 @@ <translation>Opções da criação de bloco:</translation> </message> <message> - <source>Connect only to the specified node(s)</source> - <translation>Apenas ligar ao(s) nó(s) especificado(s)</translation> - </message> - <message> <source>Connection options:</source> <translation>Opções de ligação:</translation> </message> @@ -1952,10 +2343,6 @@ <translation>Localização de cookie de autorização (predefinição: diretoria de dados)</translation> </message> <message> - <source>Minimum bytes per sigop in transactions we relay and mine (default: %u)</source> - <translation>Mínimo de bytes por sigop nas transações que nós transmitimos e mine (predefinição: %u)</translation> - </message> - <message> <source>Not enough file descriptors available.</source> <translation>Os descritores de ficheiros disponíveis são insuficientes.</translation> </message> @@ -2057,7 +2444,7 @@ </message> <message> <source>Fees (in %s/kB) smaller than this are considered zero fee for relaying, mining and transaction creation (default: %s)</source> - <translation>Taxas (em %s/kB) abaixo deste valor são consideradas nulas para propagação, mineração e criação de transacções (padrão: %s)</translation> + <translation>Taxas (em %s/kB) inferiores a este valor são consideradas nulas para propagação, mineração e criação de transações (predefinição: %s)</translation> </message> <message> <source>If paytxfee is not set, include enough fee so transactions begin confirmation on average within n blocks (default: %u)</source> @@ -2072,10 +2459,6 @@ <translation>Tamanho máximo dos dados em transacções que incluem dados que propagamos e mineramos (padrão: %u)</translation> </message> <message> - <source>Query for peer addresses via DNS lookup, if low on addresses (default: 1 unless -connect)</source> - <translation>Encontrar pares usando DNS lookup, caso o número de endereços seja reduzido (padrão: 1 excepto -connect)</translation> - </message> - <message> <source>Randomize credentials for every proxy connection. This enables Tor stream isolation (default: %u)</source> <translation>Usar credenciais aleatórias por cada ligação proxy. Permite que o Tor use stream isolation (padrão: %u)</translation> </message> @@ -2088,10 +2471,6 @@ <translation>O montante da transacção é demasiado baixo após a dedução da taxa</translation> </message> <message> - <source>This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit <https://www.openssl.org/> and cryptographic software written by Eric Young and UPnP software written by Thomas Bernard.</source> - <translation>Este produto inclui software desenvolvido pelo OpenSSL Project para utilização no OpenSSL Toolkit <https://www.openssl.org/> e software criptográfico escrito por Eric Young e software UPnP escrito por Thomas Bernard.</translation> - </message> - <message> <source>Whitelisted peers cannot be DoS banned and their transactions are always relayed, even if they are already in the mempool, useful e.g. for a gateway</source> <translation>Os pares enviados para a lista branca não podem ser DoS banidos e as suas transações são sempre retransmitidas, mesmo que já estejam no banco de memória, útil, por exemplo, para um acesso</translation> </message> @@ -2200,10 +2579,6 @@ <translation>Quantia da transação é muito baixa</translation> </message> <message> - <source>Transaction amounts must be positive</source> - <translation>Quantia da transação deverá ser positiva</translation> - </message> - <message> <source>Transaction too large for fee policy</source> <translation>Transacção demasiado grande para a política de taxas</translation> </message> @@ -2249,7 +2624,7 @@ </message> <message> <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> - <translation>Executar comando quando o melhor bloco mudar (no comando, %s é substituído pela hash do bloco)</translation> + <translation>Executar o comando quando o melhor bloco muda (no comando, %s é substituído pela hash do bloco)</translation> </message> <message> <source>Allow DNS lookups for -addnode, -seednode and -connect</source> @@ -2268,10 +2643,6 @@ <translation>-maxtxfee está definido com um valor muito alto! Taxas desta magnitude podem ser pagas numa única transacção.</translation> </message> <message> - <source>-paytxfee is set very high! This is the transaction fee you will pay if you send a transaction.</source> - <translation>-paytxfee está definido com um valor muito alto! Esta é a taxa que irá pagar se enviar uma transacção.</translation> - </message> - <message> <source>Do not keep transactions in the mempool longer than <n> hours (default: %u)</source> <translation>Não guardar transações no banco de memória por mais de <n> horas (predefinição: %u)</translation> </message> @@ -2320,10 +2691,6 @@ <translation>Use um proxy SOCKS5 separado para alcançar pares via serviços ocultos do Tor (padrão: %s)</translation> </message> <message> - <source>Username and hashed password for JSON-RPC connections. The field <userpw> comes in the format: <USERNAME>:<SALT>$<HASH>. A canonical python script is included in share/rpcuser. This option can be specified multiple times</source> - <translation>Username e hash da password para ligações JSON-RPC. O campo <userpw> está no formato: <USERNAME>:<SALT>$<HASH>. Um script python está incluido em share/rpcuser. Esta opção pode ser especificada múltiplas vezes.</translation> - </message> - <message> <source>Warning: Unknown block versions being mined! It's possible unknown rules are in effect</source> <translation>Atenção: Versões desconhecidas de blocos estão a ser mineradas! É possível que regras desconhecias estão a ser efetuadas</translation> </message> @@ -2388,10 +2755,6 @@ <translation>Definir tamanho do banco de memória da chave para <n> (predefinição: %u)</translation> </message> <message> - <source>Set minimum block size in bytes (default: %u)</source> - <translation>Definir tamanho minímo de um bloco em bytes (por defeito: %u)</translation> - </message> - <message> <source>Set the number of threads to service RPC calls (default: %d)</source> <translation>Defina o número de processos para servir as chamadas RPC (por defeito: %d)</translation> </message> @@ -2409,7 +2772,7 @@ </message> <message> <source>Spend unconfirmed change when sending transactions (default: %u)</source> - <translation>Gastar troco não confirmado ao enviar transacções (padrão: %u)</translation> + <translation>Gastar o troco não confirmado quando enviar transações (predefinição: %u)</translation> </message> <message> <source>Threshold for disconnecting misbehaving peers (default: %u)</source> diff --git a/src/qt/locale/bitcoin_ro.ts b/src/qt/locale/bitcoin_ro.ts index 270a4ba062..ef87f1056a 100644 --- a/src/qt/locale/bitcoin_ro.ts +++ b/src/qt/locale/bitcoin_ro.ts @@ -41,7 +41,10 @@ <source>&Delete</source> <translation>Șterge</translation> </message> -</context> + </context> +<context> + <name>AddressTableModel</name> + </context> <context> <name>AskPassphraseDialog</name> <message> @@ -60,59 +63,653 @@ <source>Repeat new passphrase</source> <translation>Repetati noua parolă</translation> </message> -</context> + </context> <context> <name>BanTableModel</name> - </context> + <message> + <source>IP/Netmask</source> + <translation>IP/Netmask</translation> + </message> + <message> + <source>Banned Until</source> + <translation>Blocat până</translation> + </message> +</context> <context> <name>BitcoinGUI</name> + <message> + <source>Sign &message...</source> + <translation>Semnează &mesajul...</translation> + </message> + <message> + <source>Synchronizing with network...</source> + <translation>Se sincronizează cu rețeaua</translation> + </message> + <message> + <source>Node</source> + <translation>Nod</translation> + </message> + <message> + <source>Show general overview of wallet</source> + <translation>Arată o prezentare generală a portofelului.</translation> + </message> + <message> + <source>&Transactions</source> + <translation>&Tranzacții</translation> + </message> + <message> + <source>Browse transaction history</source> + <translation>Navighează în istoricul tranzacțiilor</translation> + </message> + <message> + <source>Quit application</source> + <translation>Părăsește aplicația</translation> + </message> + <message> + <source>About &Qt</source> + <translation>Despre &Qt</translation> + </message> + <message> + <source>Show information about Qt</source> + <translation>Arată informații despre Qt</translation> + </message> + <message> + <source>&Options...</source> + <translation>&Opțiuni...</translation> + </message> + <message> + <source>&Encrypt Wallet...</source> + <translation>&Criptează portofelul...</translation> + </message> + <message> + <source>&Backup Wallet...</source> + <translation>&Backup portofel</translation> + </message> + <message> + <source>&Change Passphrase...</source> + <translation>&Schimbă parola...</translation> + </message> + <message> + <source>&Sending addresses...</source> + <translation>&Trimite adresele...</translation> + </message> + <message> + <source>&Receiving addresses...</source> + <translation>&Primește adresele...</translation> + </message> + <message> + <source>Open &URI...</source> + <translation>Deschide &URI...</translation> + </message> + <message> + <source>Send coins to a Bitcoin address</source> + <translation>Trimite monedele către o adresă Bitcoin</translation> + </message> + <message> + <source>Backup wallet to another location</source> + <translation>Fă o copie de rezervă a portofelului într-o altă locație</translation> + </message> + <message> + <source>Change the passphrase used for wallet encryption</source> + <translation>Schimbă parola folosită pentru criptarea portofelului</translation> + </message> + <message> + <source>&Debug window</source> + <translation>&Fereastra pentru depanare</translation> + </message> + <message> + <source>Open debugging and diagnostic console</source> + <translation>Pornește consola pentru depanare si diagnoză</translation> + </message> + <message> + <source>&Verify message...</source> + <translation>&Verifică mesajul...</translation> + </message> + <message> + <source>Bitcoin</source> + <translation>Bitcoin</translation> + </message> + <message> + <source>Wallet</source> + <translation>Portofel</translation> + </message> + <message> + <source>&Send</source> + <translation>&Trimite</translation> + </message> + <message> + <source>&Receive</source> + <translation>&Primește</translation> + </message> + <message> + <source>&Show / Hide</source> + <translation>&Arată/Ascunde</translation> + </message> + <message> + <source>Show or hide the main Window</source> + <translation>Arată sau ascunde fereastra principală</translation> + </message> + <message> + <source>Encrypt the private keys that belong to your wallet</source> + <translation>Criptează cheile private care aparțin portofelului tău.</translation> + </message> + <message> + <source>Sign messages with your Bitcoin addresses to prove you own them</source> + <translation>Semnează mesajele cu adresa ta de Bitcoin pentru a face dovada că îți aparțin.</translation> + </message> + <message> + <source>Verify messages to ensure they were signed with specified Bitcoin addresses</source> + <translation>Verifică mesajele cu scopul de a asigura faptul că au fost semnate cu adresa de Bitcoin specificată.</translation> + </message> + <message> + <source>&File</source> + <translation>&Fișier</translation> + </message> + <message> + <source>&Settings</source> + <translation>&Setări</translation> + </message> + <message> + <source>&Help</source> + <translation>&Ajutor</translation> + </message> + <message> + <source>Request payments (generates QR codes and bitcoin: URIs)</source> + <translation>Cerere plată (generează coduri QR și bitcoin: URIs)</translation> + </message> + <message> + <source>Open a bitcoin: URI or payment request</source> + <translation>Deschide un bitcoin: URI sau cerere de plată</translation> + </message> + <message> + <source>%1 behind</source> + <translation>%1 în urmă</translation> + </message> + <message> + <source>Last received block was generated %1 ago.</source> + <translation>Ultimul bloc primit a fost generat acum %1</translation> + </message> + <message> + <source>Error</source> + <translation>Eroare</translation> + </message> + <message> + <source>Warning</source> + <translation>Atenționare</translation> + </message> + <message> + <source>Information</source> + <translation>Informație</translation> + </message> + <message> + <source>Up to date</source> + <translation>Actual</translation> + </message> + <message> + <source>Date: %1 +</source> + <translation>Data: %1</translation> + </message> + <message> + <source>Amount: %1 +</source> + <translation>Cantitate: %1</translation> + </message> + <message> + <source>Type: %1 +</source> + <translation>Tip: %1 +</translation> + </message> + <message> + <source>Label: %1 +</source> + <translation>Etichetă: %1 +</translation> + </message> + <message> + <source>Address: %1 +</source> + <translation>Adresa: %1 +</translation> + </message> + <message> + <source>Sent transaction</source> + <translation>Trimite tranzacția</translation> + </message> + <message> + <source>Wallet is <b>encrypted</b> and currently <b>unlocked</b></source> + <translation>Portofelul este <b>criptat</b> și în prezent <b>deblocat</b></translation> + </message> + <message> + <source>Wallet is <b>encrypted</b> and currently <b>locked</b></source> + <translation>Portofelul este <b>criptat</b> și în prezent <b>blocat</b></translation> + </message> </context> <context> <name>CoinControlDialog</name> + <message> + <source>Coin Selection</source> + <translation>Selecția monedelor</translation> + </message> + <message> + <source>Quantity:</source> + <translation>Cantitatea:</translation> + </message> + <message> + <source>Bytes:</source> + <translation>Biți:</translation> + </message> + <message> + <source>Amount:</source> + <translation>Cantitate:</translation> + </message> + <message> + <source>Fee:</source> + <translation>Taxa:</translation> + </message> + <message> + <source>After Fee:</source> + <translation>După taxă:</translation> + </message> + <message> + <source>Change:</source> + <translation>Schimbă:</translation> + </message> + <message> + <source>Tree mode</source> + <translation>Mod arbore</translation> + </message> + <message> + <source>List mode</source> + <translation>Mod listă</translation> + </message> + <message> + <source>Amount</source> + <translation>Cantitate</translation> + </message> + <message> + <source>Received with address</source> + <translation>Primit cu adresa</translation> + </message> + <message> + <source>Date</source> + <translation>Data</translation> + </message> + <message> + <source>Confirmations</source> + <translation>Confirmări</translation> + </message> + <message> + <source>Confirmed</source> + <translation>Confirmat</translation> + </message> </context> <context> <name>EditAddressDialog</name> + <message> + <source>Edit Address</source> + <translation>Modifică adresa</translation> + </message> + <message> + <source>&Address</source> + <translation>&Adresa</translation> + </message> </context> <context> <name>FreespaceChecker</name> + <message> + <source>name</source> + <translation>Nume</translation> + </message> + <message> + <source>Directory already exists. Add %1 if you intend to create a new directory here.</source> + <translation>Directoriul există deja. Adaugă %1 dacă ai intenționat să creezi aici un directoriu nou.</translation> + </message> </context> <context> <name>HelpMessageDialog</name> + <message> + <source>version</source> + <translation>versiune</translation> + </message> + <message> + <source>(%1-bit)</source> + <translation>(%1-bit)</translation> + </message> + <message> + <source>Start minimized</source> + <translation>Pornește minimalizat</translation> + </message> </context> <context> <name>Intro</name> + <message> + <source>Welcome</source> + <translation>Bine ai venit!</translation> + </message> + <message> + <source>Use the default data directory</source> + <translation>Folosește directoriul pentru date din modul implicit.</translation> + </message> + <message> + <source>Error</source> + <translation>Eroare</translation> + </message> + <message numerus="yes"> + <source>%n GB of free space available</source> + <translation><numerusform>%n GB de spațiu liber disponibil</numerusform><numerusform>%n GB de spațiu liber disponibil</numerusform><numerusform>%n GB de spațiu liber disponibil</numerusform></translation> + </message> + </context> +<context> + <name>ModalOverlay</name> </context> <context> <name>OpenURIDialog</name> + <message> + <source>Open URI</source> + <translation>Deschide URI</translation> + </message> + <message> + <source>URI:</source> + <translation>URI:</translation> + </message> </context> <context> <name>OptionsDialog</name> + <message> + <source>Options</source> + <translation>Opțiuni</translation> + </message> + <message> + <source>MB</source> + <translation>MB</translation> + </message> + <message> + <source>Accept connections from outside</source> + <translation>Acceptă conexiuni externe</translation> + </message> + <message> + <source>Allow incoming connections</source> + <translation>Acceptă conexiunea care sosește</translation> + </message> + <message> + <source>IP address of the proxy (e.g. IPv4: 127.0.0.1 / IPv6: ::1)</source> + <translation>Adresa IP a proxy-ului (ex. IPv4: 127.0.0.1 / IPv6: ::1)</translation> + </message> + <message> + <source>&Reset Options</source> + <translation>&Resetează opțiunile</translation> + </message> + <message> + <source>&Network</source> + <translation>&Rețea</translation> + </message> + <message> + <source>Expert</source> + <translation>Expert</translation> + </message> + <message> + <source>Proxy &IP:</source> + <translation>Proxy &IP:</translation> + </message> + <message> + <source>&Port:</source> + <translation>&Port:</translation> + </message> + <message> + <source>Port of the proxy (e.g. 9050)</source> + <translation>Portul pentru proxy (ex.: 9050)</translation> + </message> + <message> + <source>IPv4</source> + <translation>IPv4</translation> + </message> + <message> + <source>IPv6</source> + <translation>IPv6</translation> + </message> + <message> + <source>Tor</source> + <translation>Tor</translation> + </message> + <message> + <source>&Window</source> + <translation>&Fereastra</translation> + </message> + <message> + <source>&OK</source> + <translation>&OK</translation> + </message> + <message> + <source>&Cancel</source> + <translation>&Anulează</translation> + </message> + <message> + <source>default</source> + <translation>inițial</translation> + </message> + <message> + <source>none</source> + <translation>fără</translation> + </message> + <message> + <source>Confirm options reset</source> + <translation>Confirmă resetarea opțiunilor</translation> + </message> + <message> + <source>Client restart required to activate changes.</source> + <translation>Repornirea clientului este necesară pentru ca schimbările să fie activate</translation> + </message> + <message> + <source>Client will be shut down. Do you want to proceed?</source> + <translation>Clientul va fi oprit. Dorești sa continui?</translation> + </message> + <message> + <source>This change would require a client restart.</source> + <translation>Această schimbare necesită repornirea clientului.</translation> + </message> </context> <context> <name>OverviewPage</name> + <message> + <source>Available:</source> + <translation>Disponibil:</translation> + </message> + <message> + <source>Total:</source> + <translation>Total:</translation> + </message> + <message> + <source>Recent transactions</source> + <translation>Tranzacții recente</translation> + </message> + </context> +<context> + <name>PaymentServer</name> </context> <context> <name>PeerTableModel</name> </context> <context> <name>QObject</name> + <message> + <source>Amount</source> + <translation>Cantitate</translation> + </message> + <message> + <source>%1 and %2</source> + <translation>%1 și %2</translation> + </message> </context> <context> - <name>RPCConsole</name> + <name>QObject::QObject</name> </context> <context> + <name>QRImageWidget</name> + </context> +<context> + <name>RPCConsole</name> + <message> + <source>Client version</source> + <translation>Versiunea clientului</translation> + </message> + <message> + <source>&Information</source> + <translation>&Informații</translation> + </message> + <message> + <source>Debug window</source> + <translation>Fereastra pentru depanare</translation> + </message> + <message> + <source>General</source> + <translation>General</translation> + </message> + <message> + <source>Network</source> + <translation>Rețea</translation> + </message> + <message> + <source>Name</source> + <translation>Nume</translation> + </message> + <message> + <source>Number of connections</source> + <translation>Numărul de conexiuni</translation> + </message> + <message> + <source>Received</source> + <translation>Primit</translation> + </message> + <message> + <source>Sent</source> + <translation>Trimis</translation> + </message> + <message> + <source>Direction</source> + <translation>Direcția</translation> + </message> + <message> + <source>Version</source> + <translation>Versiune</translation> + </message> + <message> + <source>Connection Time</source> + <translation>Durata conexiunii</translation> + </message> + <message> + <source>&Open</source> + <translation>&Deschide</translation> + </message> + <message> + <source>&Console</source> + <translation>&Consolă</translation> + </message> + <message> + <source>1 &hour</source> + <translation>1 &ore</translation> + </message> + <message> + <source>1 &day</source> + <translation>1 &zi</translation> + </message> + <message> + <source>1 &week</source> + <translation>1 &săptămână</translation> + </message> + <message> + <source>1 &year</source> + <translation>1 &an</translation> + </message> + <message> + <source>%1 B</source> + <translation>%1 B</translation> + </message> + <message> + <source>%1 KB</source> + <translation>%1 KB</translation> + </message> + <message> + <source>%1 MB</source> + <translation>%1 MB</translation> + </message> + <message> + <source>%1 GB</source> + <translation>%1 GB</translation> + </message> + <message> + <source>Yes</source> + <translation>Da</translation> + </message> + <message> + <source>No</source> + <translation>Nu</translation> + </message> + <message> + <source>Unknown</source> + <translation>Necunoscut</translation> + </message> +</context> +<context> <name>ReceiveCoinsDialog</name> + <message> + <source>&Message:</source> + <translation>&Mesaj:</translation> + </message> + <message> + <source>Show</source> + <translation>Arată</translation> + </message> + <message> + <source>Remove</source> + <translation>Elimină</translation> + </message> </context> <context> <name>ReceiveRequestDialog</name> + <message> + <source>&Save Image...</source> + <translation>&Salvează imaginea...</translation> + </message> + </context> +<context> + <name>RecentRequestsTableModel</name> </context> <context> <name>SendCoinsDialog</name> + <message> + <source>Quantity:</source> + <translation>Cantitatea:</translation> + </message> + <message> + <source>Bytes:</source> + <translation>Biți:</translation> + </message> + <message> + <source>Amount:</source> + <translation>Cantitate:</translation> + </message> + <message> + <source>Fee:</source> + <translation>Taxa:</translation> + </message> + <message> + <source>After Fee:</source> + <translation>După taxă:</translation> + </message> + <message> + <source>Change:</source> + <translation>Schimbă:</translation> + </message> </context> <context> <name>SendCoinsEntry</name> </context> <context> + <name>SendConfirmationDialog</name> + </context> +<context> <name>ShutdownWindow</name> </context> <context> @@ -125,12 +722,46 @@ <name>TrafficGraphWidget</name> </context> <context> + <name>TransactionDesc</name> + </context> +<context> <name>TransactionDescDialog</name> </context> <context> + <name>TransactionTableModel</name> + </context> +<context> + <name>TransactionView</name> + </context> +<context> <name>UnitDisplayStatusBarControl</name> </context> <context> - <name>bitcoin-core</name> + <name>WalletFrame</name> </context> +<context> + <name>WalletModel</name> + </context> +<context> + <name>WalletView</name> + </context> +<context> + <name>bitcoin-core</name> + <message> + <source>Bitcoin Core</source> + <translation>Bitcoin Core</translation> + </message> + <message> + <source>Information</source> + <translation>Informație</translation> + </message> + <message> + <source>Warning</source> + <translation>Atenționare</translation> + </message> + <message> + <source>Error</source> + <translation>Eroare</translation> + </message> +</context> </TS>
\ No newline at end of file diff --git a/src/qt/locale/bitcoin_ro_RO.ts b/src/qt/locale/bitcoin_ro_RO.ts index 489ed07639..3d3a4b0431 100644 --- a/src/qt/locale/bitcoin_ro_RO.ts +++ b/src/qt/locale/bitcoin_ro_RO.ts @@ -41,7 +41,10 @@ <source>&Delete</source> <translation>&Şterge</translation> </message> -</context> + </context> +<context> + <name>AddressTableModel</name> + </context> <context> <name>AskPassphraseDialog</name> <message> @@ -60,7 +63,7 @@ <source>Repeat new passphrase</source> <translation>Repetaţi noua frază de acces</translation> </message> -</context> + </context> <context> <name>BanTableModel</name> <message> @@ -250,34 +253,10 @@ <source>%n active connection(s) to Bitcoin network</source> <translation><numerusform>%n conexiune activă către reţeaua Bitcoin</numerusform><numerusform>%n conexiuni active către reţeaua Bitcoin</numerusform><numerusform>%n de conexiuni active către reţeaua Bitcoin</numerusform></translation> </message> - <message> - <source>No block source available...</source> - <translation>Nici o sursă de bloc disponibilă...</translation> - </message> <message numerus="yes"> <source>Processed %n block(s) of transaction history.</source> <translation><numerusform>S-a procesat %n bloc din istoricul tranzacţiilor.</numerusform><numerusform>S-au procesat %n blocuri din istoricul tranzacţiilor.</numerusform><numerusform>S-au procesat %n de blocuri din istoricul tranzacţiilor.</numerusform></translation> </message> - <message numerus="yes"> - <source>%n hour(s)</source> - <translation><numerusform>%n oră</numerusform><numerusform>%n ore</numerusform><numerusform>%n ore</numerusform></translation> - </message> - <message numerus="yes"> - <source>%n day(s)</source> - <translation><numerusform>%n zi</numerusform><numerusform>%n zile</numerusform><numerusform>%n de zile</numerusform></translation> - </message> - <message numerus="yes"> - <source>%n week(s)</source> - <translation><numerusform>%n săptămână</numerusform><numerusform>%n săptămâni</numerusform><numerusform>%n de săptămâni</numerusform></translation> - </message> - <message> - <source>%1 and %2</source> - <translation>%1 şi %2</translation> - </message> - <message numerus="yes"> - <source>%n year(s)</source> - <translation><numerusform>%n an</numerusform><numerusform>%n ani</numerusform><numerusform>%n de ani</numerusform></translation> - </message> <message> <source>%1 behind</source> <translation>%1 în urmă</translation> @@ -356,7 +335,7 @@ <source>Wallet is <b>encrypted</b> and currently <b>locked</b></source> <translation>Portofelul este <b>criptat</b> iar în momentul de faţă este <b>blocat</b></translation> </message> -</context> + </context> <context> <name>CoinControlDialog</name> <message> @@ -376,10 +355,6 @@ <translation>Sumă:</translation> </message> <message> - <source>Priority:</source> - <translation>Prioritate:</translation> - </message> - <message> <source>Fee:</source> <translation>Taxă:</translation> </message> @@ -431,11 +406,7 @@ <source>Confirmed</source> <translation>Confirmat</translation> </message> - <message> - <source>Priority</source> - <translation>Prioritate</translation> - </message> -</context> + </context> <context> <name>EditAddressDialog</name> <message> @@ -458,7 +429,7 @@ <source>&Address</source> <translation>&Adresă</translation> </message> -</context> + </context> <context> <name>FreespaceChecker</name> <message> @@ -565,6 +536,21 @@ </message> </context> <context> + <name>ModalOverlay</name> + <message> + <source>Form</source> + <translation>Form</translation> + </message> + <message> + <source>Last block time</source> + <translation>Data ultimului bloc</translation> + </message> + <message> + <source>Hide</source> + <translation>Ascunde</translation> + </message> + </context> +<context> <name>OpenURIDialog</name> <message> <source>Open URI</source> @@ -582,7 +568,7 @@ <source>Select payment request file</source> <translation>Selectaţi fişierul cerere de plată</translation> </message> -</context> + </context> <context> <name>OptionsDialog</name> <message> @@ -858,6 +844,9 @@ </message> </context> <context> + <name>PaymentServer</name> + </context> +<context> <name>PeerTableModel</name> <message> <source>User Agent</source> @@ -867,11 +856,7 @@ <source>Node/Service</source> <translation>Nod/Serviciu</translation> </message> - <message> - <source>Ping Time</source> - <translation>Timp ping</translation> - </message> -</context> + </context> <context> <name>QObject</name> <message> @@ -910,7 +895,21 @@ <source>%1 ms</source> <translation>%1 ms</translation> </message> -</context> + <message> + <source>%1 and %2</source> + <translation>%1 şi %2</translation> + </message> + </context> +<context> + <name>QObject::QObject</name> + </context> +<context> + <name>QRImageWidget</name> + <message> + <source>&Save Image...</source> + <translation>&Salvează imaginea...</translation> + </message> + </context> <context> <name>RPCConsole</name> <message> @@ -1074,10 +1073,6 @@ <translation>Curăţă consola</translation> </message> <message> - <source>&Disconnect Node</source> - <translation>&Deconectare nod</translation> - </message> - <message> <source>1 &hour</source> <translation>1 &oră</translation> </message> @@ -1216,7 +1211,7 @@ <source>Remove</source> <translation>Înlătură</translation> </message> -</context> + </context> <context> <name>ReceiveRequestDialog</name> <message> @@ -1235,7 +1230,14 @@ <source>&Save Image...</source> <translation>&Salvează imaginea...</translation> </message> -</context> + <message> + <source>Amount</source> + <translation>Cantitate</translation> + </message> + </context> +<context> + <name>RecentRequestsTableModel</name> + </context> <context> <name>SendCoinsDialog</name> <message> @@ -1271,10 +1273,6 @@ <translation>Sumă:</translation> </message> <message> - <source>Priority:</source> - <translation>Prioritate:</translation> - </message> - <message> <source>Fee:</source> <translation>Taxă:</translation> </message> @@ -1323,10 +1321,6 @@ <translation>Personalizat:</translation> </message> <message> - <source>Confirmation time:</source> - <translation>Timp confirmare:</translation> - </message> - <message> <source>normal</source> <translation>normal</translation> </message> @@ -1366,7 +1360,7 @@ <source>S&end</source> <translation>Trimit&e</translation> </message> -</context> + </context> <context> <name>SendCoinsEntry</name> <message> @@ -1429,7 +1423,10 @@ <source>Memo:</source> <translation>Memo:</translation> </message> -</context> + </context> +<context> + <name>SendConfirmationDialog</name> + </context> <context> <name>ShutdownWindow</name> <message> @@ -1519,7 +1516,7 @@ <source>Reset all verify message fields</source> <translation>Resetează toate cîmpurile mesajelor semnate</translation> </message> -</context> + </context> <context> <name>SplashScreen</name> <message> @@ -1535,12 +1532,25 @@ </message> </context> <context> + <name>TransactionDesc</name> + <message> + <source>Amount</source> + <translation>Cantitate</translation> + </message> + </context> +<context> <name>TransactionDescDialog</name> <message> <source>This pane shows a detailed description of the transaction</source> <translation>Acest panou arată o descriere detaliată a tranzacţiei</translation> </message> -</context> + </context> +<context> + <name>TransactionTableModel</name> + </context> +<context> + <name>TransactionView</name> + </context> <context> <name>UnitDisplayStatusBarControl</name> <message> @@ -1549,6 +1559,15 @@ </message> </context> <context> + <name>WalletFrame</name> + </context> +<context> + <name>WalletModel</name> + </context> +<context> + <name>WalletView</name> + </context> +<context> <name>bitcoin-core</name> <message> <source>Options:</source> @@ -1575,10 +1594,6 @@ <translation>Rulează în fundal ca un demon şi acceptă comenzi</translation> </message> <message> - <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> - <translation>Acceptă conexiuni din afară (implicit: 1 dacă nu se foloseşte -proxy sau -connect)</translation> - </message> - <message> <source>Bitcoin Core</source> <translation>Nucleul Bitcoin</translation> </message> @@ -1587,10 +1602,6 @@ <translation>Ataşaţi adresei date şi ascultaţi totdeauna pe ea. Folosiţi notaţia [host]:port pentru IPv6</translation> </message> <message> - <source>Distributed under the MIT software license, see the accompanying file COPYING or <http://www.opensource.org/licenses/mit-license.php>.</source> - <translation>Distribuit sub licenţa de programe MIT/X11, vezi fişierul însoţitor COPYING sau <http://www.opensource.org/licenses/mit-license.php>.</translation> - </message> - <message> <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source> <translation>Execută comanda cînd o tranzacţie a portofelului se schimbă (%s în cmd este înlocuit de TxID)</translation> </message> @@ -1599,18 +1610,6 @@ <translation>Setează numărul de thread-uri de verificare a script-urilor (%u la %d, 0 = auto, <0 = lasă atîtea nuclee libere, implicit: %d)</translation> </message> <message> - <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source> - <translation>Aceasta este o versiune de test preliminară - vă asumaţi riscul folosind-o - nu folosiţi pentru minerit sau aplicaţiile comercianţilor</translation> - </message> - <message> - <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source> - <translation>Atenţie: Reţeaua nu pare să fie de acord în totalitate! Aparent nişte mineri au probleme.</translation> - </message> - <message> - <source>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</source> - <translation>Atenţie: Aparent, nu sîntem de acord cu toţi partenerii noştri! Va trebui să faceţi o actualizare, sau alte noduri necesită actualizare.</translation> - </message> - <message> <source><category> can be:</source> <translation><category> poate fi:</translation> </message> @@ -1619,10 +1618,6 @@ <translation>Opţiuni creare bloc:</translation> </message> <message> - <source>Connect only to the specified node(s)</source> - <translation>Conectare doar la nod(urile) specificate</translation> - </message> - <message> <source>Connection options:</source> <translation>Opţiuni conexiune:</translation> </message> @@ -1731,10 +1726,6 @@ <translation>Setează mărimea pentru tranzacţiile prioritare/taxe mici în octeţi (implicit: %d)</translation> </message> <message> - <source>This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit <https://www.openssl.org/> and cryptographic software written by Eric Young and UPnP software written by Thomas Bernard.</source> - <translation>Acest produs include programe dezvoltate de către Proiectul OpenSSL pentru a fi folosite în OpenSSL Toolkit <https://www.openssl.org/> şi programe criptografice scrise de către Eric Young şi programe UPnP scrise de către Thomas Bernard.</translation> - </message> - <message> <source>(default: %u)</source> <translation>(implicit: %u)</translation> </message> @@ -1803,10 +1794,6 @@ <translation>Suma tranzacţionată este prea mică</translation> </message> <message> - <source>Transaction amounts must be positive</source> - <translation>Sumele tranzacţionate trebuie să fie pozitive</translation> - </message> - <message> <source>Transaction too large for fee policy</source> <translation>Tranzacţie prea mare pentru politică gratis</translation> </message> @@ -1863,10 +1850,6 @@ <translation>Adresa -proxy nevalidă: '%s'</translation> </message> <message> - <source>Set minimum block size in bytes (default: %u)</source> - <translation>Setare mărime minimă bloc în octeţi (implicit: %u)</translation> - </message> - <message> <source>Specify configuration file (default: %s)</source> <translation>Specificaţi fişierul configuraţie (implicit: %s)</translation> </message> diff --git a/src/qt/locale/bitcoin_ru.ts b/src/qt/locale/bitcoin_ru.ts index 60f5d5dfa2..b5f40fc058 100644 --- a/src/qt/locale/bitcoin_ru.ts +++ b/src/qt/locale/bitcoin_ru.ts @@ -41,6 +41,77 @@ <source>&Delete</source> <translation>&Удалить</translation> </message> + <message> + <source>Choose the address to send coins to</source> + <translation>Выберите адрес для отправки перевода</translation> + </message> + <message> + <source>Choose the address to receive coins with</source> + <translation>Выберите адрес для получения перевода</translation> + </message> + <message> + <source>C&hoose</source> + <translation>&Выбрать</translation> + </message> + <message> + <source>Sending addresses</source> + <translation>Адреса отправки</translation> + </message> + <message> + <source>Receiving addresses</source> + <translation>Адреса получения</translation> + </message> + <message> + <source>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source> + <translation>Это ваши адреса Bitcoin для отправки платежей. Всегда проверяйте сумму и адрес получателя перед отправкой перевода.</translation> + </message> + <message> + <source>These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction.</source> + <translation>Это ваши адреса Bitcoin для приёма платежей. Рекомендуется использовать новый адрес получения для каждой транзакции.</translation> + </message> + <message> + <source>&Copy Address</source> + <translation>Копировать &адрес</translation> + </message> + <message> + <source>Copy &Label</source> + <translation>Копировать &метку</translation> + </message> + <message> + <source>&Edit</source> + <translation>&Правка</translation> + </message> + <message> + <source>Export Address List</source> + <translation>Экспортировать список адресов</translation> + </message> + <message> + <source>Comma separated file (*.csv)</source> + <translation>Текст, разделённый запятыми (*.csv)</translation> + </message> + <message> + <source>Exporting Failed</source> + <translation>Экспорт не удался</translation> + </message> + <message> + <source>There was an error trying to save the address list to %1. Please try again.</source> + <translation>Произошла ошибка при сохранении списка адресов в %1. Пожалуйста, попробуйте еще раз.</translation> + </message> +</context> +<context> + <name>AddressTableModel</name> + <message> + <source>Label</source> + <translation>Метка</translation> + </message> + <message> + <source>Address</source> + <translation>Адрес</translation> + </message> + <message> + <source>(no label)</source> + <translation>(нет метки)</translation> + </message> </context> <context> <name>AskPassphraseDialog</name> @@ -60,6 +131,94 @@ <source>Repeat new passphrase</source> <translation>Повторите новый пароль</translation> </message> + <message> + <source>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>.</source> + <translation>Введите новый пароль бумажника.<br/>Используйте пароль, состоящий из <b>десяти или более случайных символов</b>, или <b>восьми или более слов</b>.</translation> + </message> + <message> + <source>Encrypt wallet</source> + <translation>Зашифровать бумажник</translation> + </message> + <message> + <source>This operation needs your wallet passphrase to unlock the wallet.</source> + <translation>Для выполнения операции требуется пароль вашего бумажника.</translation> + </message> + <message> + <source>Unlock wallet</source> + <translation>Разблокировать бумажник</translation> + </message> + <message> + <source>This operation needs your wallet passphrase to decrypt the wallet.</source> + <translation>Для выполнения операции требуется пароль вашего бумажника.</translation> + </message> + <message> + <source>Decrypt wallet</source> + <translation>Расшифровать бумажник</translation> + </message> + <message> + <source>Change passphrase</source> + <translation>Сменить пароль</translation> + </message> + <message> + <source>Enter the old passphrase and new passphrase to the wallet.</source> + <translation>Введите старый и новый пароль для бумажника.</translation> + </message> + <message> + <source>Confirm wallet encryption</source> + <translation>Подтвердите шифрование бумажника</translation> + </message> + <message> + <source>Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR BITCOINS</b>!</source> + <translation>Предупреждение: если вы зашифруете бумажник и потеряете пароль, вы <b>ПОТЕРЯЕТЕ ВСЕ ВАШИ БИТКОИНЫ</b>!</translation> + </message> + <message> + <source>Are you sure you wish to encrypt your wallet?</source> + <translation>Вы уверены, что хотите зашифровать ваш бумажник?</translation> + </message> + <message> + <source>Wallet encrypted</source> + <translation>Бумажник зашифрован</translation> + </message> + <message> + <source>%1 will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your bitcoins from being stolen by malware infecting your computer.</source> + <translation>Сейчас %1 закроется для завершения процесса шифрования. Помните, что шифрование вашего бумажника не может полностью защитить ваши биткоины от кражи с помощью инфицирования вашего компьютера вредоносным ПО.</translation> + </message> + <message> + <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source> + <translation>ВАЖНО: все предыдущие резервные копии вашего бумажника должны быть заменены новым зашифрованным файлом. В целях безопасности предыдущие резервные копии незашифрованного бумажника станут бесполезны, как только вы начнёте использовать новый зашифрованный бумажник.</translation> + </message> + <message> + <source>Wallet encryption failed</source> + <translation>Не удалось зашифровать бумажник</translation> + </message> + <message> + <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source> + <translation>Шифрование бумажника не удалось из-за внутренней ошибки. Ваш бумажник не был зашифрован.</translation> + </message> + <message> + <source>The supplied passphrases do not match.</source> + <translation>Введённые пароли не совпадают.</translation> + </message> + <message> + <source>Wallet unlock failed</source> + <translation>Разблокировка бумажника не удалась</translation> + </message> + <message> + <source>The passphrase entered for the wallet decryption was incorrect.</source> + <translation>Неверный пароль для расшифровки бумажника.</translation> + </message> + <message> + <source>Wallet decryption failed</source> + <translation>Расшифровка бумажника не удалась</translation> + </message> + <message> + <source>Wallet passphrase was successfully changed.</source> + <translation>Пароль бумажника успешно изменён.</translation> + </message> + <message> + <source>Warning: The Caps Lock key is on!</source> + <translation>Внимание: Caps Lock включен!</translation> + </message> </context> <context> <name>BanTableModel</name> @@ -159,6 +318,18 @@ <translation>Открыть &URI...</translation> </message> <message> + <source>Click to disable network activity.</source> + <translation>Кликните, чтобы запретить сетевую активность.</translation> + </message> + <message> + <source>Network activity disabled.</source> + <translation>Сетевая активность запрещена.</translation> + </message> + <message> + <source>Click to enable network activity again.</source> + <translation>Кликните, чтобы снова разрешить сетевую активность.</translation> + </message> + <message> <source>Reindexing blocks on disk...</source> <translation>Идёт переиндексация блоков на диске...</translation> </message> @@ -270,34 +441,10 @@ <source>Processing blocks on disk...</source> <translation>Обработка блоков на диске...</translation> </message> - <message> - <source>No block source available...</source> - <translation>Источник блоков недоступен...</translation> - </message> <message numerus="yes"> <source>Processed %n block(s) of transaction history.</source> <translation><numerusform>Обработан %n блок истории транзакций.</numerusform><numerusform>Обработано %n блока истории транзакций.</numerusform><numerusform>Обработано %n блоков истории транзакций.</numerusform><numerusform>Обработано %n блоков истории транзакций.</numerusform></translation> </message> - <message numerus="yes"> - <source>%n hour(s)</source> - <translation><numerusform>%n час</numerusform><numerusform>%n часа</numerusform><numerusform>%n часов</numerusform><numerusform>%n часов</numerusform></translation> - </message> - <message numerus="yes"> - <source>%n day(s)</source> - <translation><numerusform>%n день</numerusform><numerusform>%n дня</numerusform><numerusform>%n дней</numerusform><numerusform>%n дней</numerusform></translation> - </message> - <message numerus="yes"> - <source>%n week(s)</source> - <translation><numerusform>%n неделю</numerusform><numerusform>%n недели</numerusform><numerusform>%n недель</numerusform><numerusform>%n недель</numerusform></translation> - </message> - <message> - <source>%1 and %2</source> - <translation>%1 и %2</translation> - </message> - <message numerus="yes"> - <source>%n year(s)</source> - <translation><numerusform>%n год</numerusform><numerusform>%n лет</numerusform><numerusform>%n лет</numerusform><numerusform>%n года</numerusform></translation> - </message> <message> <source>%1 behind</source> <translation>%1 позади</translation> @@ -327,10 +474,18 @@ <translation>Синхронизировано</translation> </message> <message> + <source>Show the %1 help message to get a list with possible Bitcoin command-line options</source> + <translation>Показать помощь по %1, чтобы получить список доступных параметров командной строки</translation> + </message> + <message> <source>%1 client</source> <translation>%1 клиент</translation> </message> <message> + <source>Connecting to peers...</source> + <translation>Подключение к пирам...</translation> + </message> + <message> <source>Catching up...</source> <translation>Синхронизируется...</translation> </message> @@ -373,6 +528,14 @@ <translation>Входящая транзакция</translation> </message> <message> + <source>HD key generation is <b>enabled</b></source> + <translation>Генерация HD-ключей <b>разрешена</b></translation> + </message> + <message> + <source>HD key generation is <b>disabled</b></source> + <translation>Генерация HD-ключей <b>запрещена</b></translation> + </message> + <message> <source>Wallet is <b>encrypted</b> and currently <b>unlocked</b></source> <translation>Бумажник <b>зашифрован</b> и в настоящее время <b>разблокирован</b></translation> </message> @@ -380,6 +543,10 @@ <source>Wallet is <b>encrypted</b> and currently <b>locked</b></source> <translation>Бумажник <b>зашифрован</b> и в настоящее время <b>заблокирован</b></translation> </message> + <message> + <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> + <translation>Произошла неисправимая ошибка. Bitcoin не может безопасно продолжать работу и будет закрыт.</translation> + </message> </context> <context> <name>CoinControlDialog</name> @@ -400,10 +567,6 @@ <translation>Сумма:</translation> </message> <message> - <source>Priority:</source> - <translation>Приоритет:</translation> - </message> - <message> <source>Fee:</source> <translation>Комиссия:</translation> </message> @@ -456,8 +619,84 @@ <translation>Подтверждено</translation> </message> <message> - <source>Priority</source> - <translation>Приоритет</translation> + <source>Copy address</source> + <translation>Копировать адрес</translation> + </message> + <message> + <source>Copy label</source> + <translation>Копировать метку</translation> + </message> + <message> + <source>Copy amount</source> + <translation>Копировать сумму</translation> + </message> + <message> + <source>Copy transaction ID</source> + <translation>Копировать ID транзакции</translation> + </message> + <message> + <source>Lock unspent</source> + <translation>Заблокировать непотраченное</translation> + </message> + <message> + <source>Unlock unspent</source> + <translation>Разблокировать непотраченное</translation> + </message> + <message> + <source>Copy quantity</source> + <translation>Копировать количество</translation> + </message> + <message> + <source>Copy fee</source> + <translation>Копировать комиссию</translation> + </message> + <message> + <source>Copy after fee</source> + <translation>Копировать после комиссии</translation> + </message> + <message> + <source>Copy bytes</source> + <translation>Копировать байты</translation> + </message> + <message> + <source>Copy dust</source> + <translation>Копировать пыль</translation> + </message> + <message> + <source>Copy change</source> + <translation>Копировать сдачу</translation> + </message> + <message> + <source>(%1 locked)</source> + <translation>(%1 заблокировано)</translation> + </message> + <message> + <source>yes</source> + <translation>да</translation> + </message> + <message> + <source>no</source> + <translation>нет</translation> + </message> + <message> + <source>This label turns red if any recipient receives an amount smaller than the current dust threshold.</source> + <translation>Эта метка станет красной, если любой получатель получит сумму меньше, чем текущий порог пыли.</translation> + </message> + <message> + <source>Can vary +/- %1 satoshi(s) per input.</source> + <translation>Может отличаться на +/- %1 сатоши на вход.</translation> + </message> + <message> + <source>(no label)</source> + <translation>(нет метки)</translation> + </message> + <message> + <source>change from %1 (%2)</source> + <translation>сдача с %1 (%2)</translation> + </message> + <message> + <source>(change)</source> + <translation>(сдача)</translation> </message> </context> <context> @@ -482,6 +721,38 @@ <source>&Address</source> <translation>&Адрес</translation> </message> + <message> + <source>New receiving address</source> + <translation>Новый адрес получения</translation> + </message> + <message> + <source>New sending address</source> + <translation>Новый адрес отправки</translation> + </message> + <message> + <source>Edit receiving address</source> + <translation>Изменить адрес получения</translation> + </message> + <message> + <source>Edit sending address</source> + <translation>Изменить адрес отправки</translation> + </message> + <message> + <source>The entered address "%1" is not a valid Bitcoin address.</source> + <translation>Введённый адрес "%1" не является правильным Bitcoin-адресом.</translation> + </message> + <message> + <source>The entered address "%1" is already in the address book.</source> + <translation>Введённый адрес "%1" уже находится в адресной книге.</translation> + </message> + <message> + <source>Could not unlock wallet.</source> + <translation>Не удается разблокировать бумажник.</translation> + </message> + <message> + <source>New key generation failed.</source> + <translation>Генерация нового ключа не удалась.</translation> + </message> </context> <context> <name>FreespaceChecker</name> @@ -605,6 +876,57 @@ </message> </context> <context> + <name>ModalOverlay</name> + <message> + <source>Form</source> + <translation>Форма</translation> + </message> + <message> + <source>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 bitcoin network, as detailed below.</source> + <translation>Недавние транзакции могут быть пока не видны, поэтому ваш баланс может отображаться некорректно. Эта информация станет корректной, как только ваш бумажник будет синхронизирован с сетью, см. подробности ниже.</translation> + </message> + <message> + <source>Attempting to spend bitcoins that are affected by not-yet-displayed transactions will not be accepted by the network.</source> + <translation>Попытка потратить биткоины из ещё не отображённых транзакций будет отвергнута сетью.</translation> + </message> + <message> + <source>Number of blocks left</source> + <translation>Число оставшихся блоков</translation> + </message> + <message> + <source>Unknown...</source> + <translation>Неизвестно...</translation> + </message> + <message> + <source>Last block time</source> + <translation>Время последнего блока</translation> + </message> + <message> + <source>Progress</source> + <translation>Прогресс</translation> + </message> + <message> + <source>Progress increase per hour</source> + <translation>Прогресс за час</translation> + </message> + <message> + <source>calculating...</source> + <translation>расчёт...</translation> + </message> + <message> + <source>Estimated time left until synced</source> + <translation>Примерное время до завершения синхронизации</translation> + </message> + <message> + <source>Hide</source> + <translation>Скрыть</translation> + </message> + <message> + <source>Unknown. Syncing Headers (%1)...</source> + <translation>Неизвестно. Синхронизация заголовков (%1)...</translation> + </message> +</context> +<context> <name>OpenURIDialog</name> <message> <source>Open URI</source> @@ -622,6 +944,10 @@ <source>Select payment request file</source> <translation>Выбрать файл запроса платежа</translation> </message> + <message> + <source>Select payment request file to open</source> + <translation>Выберите файл запроса платежа</translation> + </message> </context> <context> <name>OptionsDialog</name> @@ -655,7 +981,7 @@ </message> <message> <source>Accept connections from outside</source> - <translation>Разрешать соединения извне</translation> + <translation>Принимать входящие соединения</translation> </message> <message> <source>Allow incoming connections</source> @@ -934,6 +1260,97 @@ </message> </context> <context> + <name>PaymentServer</name> + <message> + <source>Payment request error</source> + <translation>Ошибка запроса платежа</translation> + </message> + <message> + <source>Cannot start bitcoin: click-to-pay handler</source> + <translation>Не удаётся запустить bitcoin: обработчик click-to-pay</translation> + </message> + <message> + <source>URI handling</source> + <translation>Обработка URI</translation> + </message> + <message> + <source>Payment request fetch URL is invalid: %1</source> + <translation>Неверный URL запроса платежа: %1</translation> + </message> + <message> + <source>Invalid payment address %1</source> + <translation>Неверный адрес платежа %1</translation> + </message> + <message> + <source>URI cannot be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters.</source> + <translation>Не удалось обработать URI! Это может быть связано с неверным адресом Bitcoin или неправильными параметрами URI.</translation> + </message> + <message> + <source>Payment request file handling</source> + <translation>Обработка файла запроса платежа</translation> + </message> + <message> + <source>Payment request file cannot be read! This can be caused by an invalid payment request file.</source> + <translation>Файл запроса платежа не может быть прочитан! Обычно это происходит из-за неверного файла запроса платежа.</translation> + </message> + <message> + <source>Payment request rejected</source> + <translation>Запрос платежа отклонён</translation> + </message> + <message> + <source>Payment request network doesn't match client network.</source> + <translation>Сеть запроса платежа не совпадает с сетью клиента.</translation> + </message> + <message> + <source>Payment request expired.</source> + <translation>Запрос платежа просрочен.</translation> + </message> + <message> + <source>Payment request is not initialized.</source> + <translation>Запрос платежа не инициализирован.</translation> + </message> + <message> + <source>Unverified payment requests to custom payment scripts are unsupported.</source> + <translation>Непроверенные запросы платежей с нестандартными платёжными сценариями не поддерживаются.</translation> + </message> + <message> + <source>Invalid payment request.</source> + <translation>Неверный запрос платежа.</translation> + </message> + <message> + <source>Requested payment amount of %1 is too small (considered dust).</source> + <translation>Запрошенная сумма платежа %1 слишком мала (считается пылью).</translation> + </message> + <message> + <source>Refund from %1</source> + <translation>Возврат от %1</translation> + </message> + <message> + <source>Payment request %1 is too large (%2 bytes, allowed %3 bytes).</source> + <translation>Запрос платежа %1 слишком большой (%2 байтов, разрешено %3 байтов).</translation> + </message> + <message> + <source>Error communicating with %1: %2</source> + <translation>Ошибка связи с %1: %2</translation> + </message> + <message> + <source>Payment request cannot be parsed!</source> + <translation>Запрос платежа не может быть разобран!</translation> + </message> + <message> + <source>Bad response from server %1</source> + <translation>Плохой ответ сервера %1</translation> + </message> + <message> + <source>Network request error</source> + <translation>Ошибка сетевого запроса</translation> + </message> + <message> + <source>Payment acknowledged</source> + <translation>Платёж принят</translation> + </message> +</context> +<context> <name>PeerTableModel</name> <message> <source>User Agent</source> @@ -944,8 +1361,12 @@ <translation>Узел/сервис</translation> </message> <message> - <source>Ping Time</source> - <translation>Время задержки</translation> + <source>NodeId</source> + <translation>Id узла</translation> + </message> + <message> + <source>Ping</source> + <translation>Пинг</translation> </message> </context> <context> @@ -986,6 +1407,72 @@ <source>%1 ms</source> <translation>%1 мс</translation> </message> + <message numerus="yes"> + <source>%n second(s)</source> + <translation><numerusform>%n секунда</numerusform><numerusform>%n секунды</numerusform><numerusform>%n секунд</numerusform><numerusform>%n секунд</numerusform></translation> + </message> + <message numerus="yes"> + <source>%n minute(s)</source> + <translation><numerusform>%n минута</numerusform><numerusform>%n минут</numerusform><numerusform>%n минут</numerusform><numerusform>%n минут</numerusform></translation> + </message> + <message numerus="yes"> + <source>%n hour(s)</source> + <translation><numerusform>%n час</numerusform><numerusform>%n часа</numerusform><numerusform>%n часов</numerusform><numerusform>%n часов</numerusform></translation> + </message> + <message numerus="yes"> + <source>%n day(s)</source> + <translation><numerusform>%n день</numerusform><numerusform>%n дня</numerusform><numerusform>%n дней</numerusform><numerusform>%n дней</numerusform></translation> + </message> + <message numerus="yes"> + <source>%n week(s)</source> + <translation><numerusform>%n неделя</numerusform><numerusform>%n недели</numerusform><numerusform>%n недель</numerusform><numerusform>%n недель</numerusform></translation> + </message> + <message> + <source>%1 and %2</source> + <translation>%1 и %2</translation> + </message> + <message numerus="yes"> + <source>%n year(s)</source> + <translation><numerusform>%n год</numerusform><numerusform>%n года</numerusform><numerusform>%n лет</numerusform><numerusform>%n лет</numerusform></translation> + </message> + <message> + <source>%1 didn't yet exit safely...</source> + <translation>%1 ещё не завершился безопасно...</translation> + </message> +</context> +<context> + <name>QObject::QObject</name> + <message> + <source>Error: Specified data directory "%1" does not exist.</source> + <translation>Ошибка: указанный каталог "%1" не существует.</translation> + </message> + <message> + <source>Error: Cannot parse configuration file: %1. Only use key=value syntax.</source> + <translation>Ошибка: не удалось разобрать конфигурационный файл: %1. Используйте синтаксис вида ключ=значение.</translation> + </message> + <message> + <source>Error: %1</source> + <translation>Ошибка: %1</translation> + </message> +</context> +<context> + <name>QRImageWidget</name> + <message> + <source>&Save Image...</source> + <translation>&Сохранить изображение...</translation> + </message> + <message> + <source>&Copy Image</source> + <translation>Копировать &изображение</translation> + </message> + <message> + <source>Save QR Code</source> + <translation>Сохранить QR-код</translation> + </message> + <message> + <source>PNG Image (*.png)</source> + <translation>Изображение PNG (*.png)</translation> + </message> </context> <context> <name>RPCConsole</name> @@ -1146,6 +1633,10 @@ <translation>Время задержки</translation> </message> <message> + <source>Min Ping</source> + <translation>Мин. пинг</translation> + </message> + <message> <source>Time Offset</source> <translation>Смещение времени</translation> </message> @@ -1190,14 +1681,6 @@ <translation>Очистить консоль</translation> </message> <message> - <source>&Disconnect Node</source> - <translation>&Отключить узел</translation> - </message> - <message> - <source>Ban Node for</source> - <translation>Заблокировать узел на</translation> - </message> - <message> <source>1 &hour</source> <translation>1 &час</translation> </message> @@ -1214,8 +1697,16 @@ <translation>1 &год</translation> </message> <message> - <source>&Unban Node</source> - <translation>&Разблокировать узел</translation> + <source>&Disconnect</source> + <translation>&Отключиться</translation> + </message> + <message> + <source>Ban for</source> + <translation>Бан на</translation> + </message> + <message> + <source>&Unban</source> + <translation>&Разбанить</translation> </message> <message> <source>Welcome to the %1 RPC console.</source> @@ -1230,6 +1721,14 @@ <translation>Напишите <b>help</b> для просмотра доступных команд.</translation> </message> <message> + <source>WARNING: Scammers have been active, telling users to type commands here, stealing their wallet contents. Do not use this console without fully understanding the ramification of a command.</source> + <translation>ВНИМАНИЕ: мошенники предлагали пользователям вводить сюда команды, похищая таким образом содержимое их бумажников. Не используйте эту консоль без полного понимания смысла команд.</translation> + </message> + <message> + <source>Network activity disabled</source> + <translation>Сетевая активность запрещена</translation> + </message> + <message> <source>%1 B</source> <translation>%1 Б</translation> </message> @@ -1348,6 +1847,22 @@ <source>Remove</source> <translation>Удалить</translation> </message> + <message> + <source>Copy URI</source> + <translation>Копировать URI</translation> + </message> + <message> + <source>Copy label</source> + <translation>Копировать метку</translation> + </message> + <message> + <source>Copy message</source> + <translation>Копировать сообщение</translation> + </message> + <message> + <source>Copy amount</source> + <translation>Копировать сумму</translation> + </message> </context> <context> <name>ReceiveRequestDialog</name> @@ -1367,6 +1882,73 @@ <source>&Save Image...</source> <translation>&Сохранить изображение...</translation> </message> + <message> + <source>Request payment to %1</source> + <translation>Запросить платёж на %1</translation> + </message> + <message> + <source>Payment information</source> + <translation>Информация платежа</translation> + </message> + <message> + <source>URI</source> + <translation>URI</translation> + </message> + <message> + <source>Address</source> + <translation>Адрес</translation> + </message> + <message> + <source>Amount</source> + <translation>Сумма</translation> + </message> + <message> + <source>Label</source> + <translation>Метка</translation> + </message> + <message> + <source>Message</source> + <translation>Сообщение</translation> + </message> + <message> + <source>Resulting URI too long, try to reduce the text for label / message.</source> + <translation>Получившийся URI слишком длинный, попробуйте сократить текст метки / сообщения.</translation> + </message> + <message> + <source>Error encoding URI into QR Code.</source> + <translation>Ошибка кодирования URI в QR-код</translation> + </message> +</context> +<context> + <name>RecentRequestsTableModel</name> + <message> + <source>Date</source> + <translation>Дата</translation> + </message> + <message> + <source>Label</source> + <translation>Метка</translation> + </message> + <message> + <source>Message</source> + <translation>Сообщение</translation> + </message> + <message> + <source>(no label)</source> + <translation>(нет метки)</translation> + </message> + <message> + <source>(no message)</source> + <translation>(нет сообщения)</translation> + </message> + <message> + <source>(no amount requested)</source> + <translation>(нет запрошенной суммы)</translation> + </message> + <message> + <source>Requested</source> + <translation>Запрошено</translation> + </message> </context> <context> <name>SendCoinsDialog</name> @@ -1403,10 +1985,6 @@ <translation>Сумма:</translation> </message> <message> - <source>Priority:</source> - <translation>Приоритет:</translation> - </message> - <message> <source>Fee:</source> <translation>Комиссия:</translation> </message> @@ -1475,10 +2053,6 @@ <translation>(Умная комиссия пока не инициализирована. Обычно для этого требуется несколько блоков...)</translation> </message> <message> - <source>Confirmation time:</source> - <translation>Время подтверждения:</translation> - </message> - <message> <source>normal</source> <translation>обычный</translation> </message> @@ -1503,6 +2077,10 @@ <translation>Пыль:</translation> </message> <message> + <source>Confirmation time target:</source> + <translation>Время подтверждения:</translation> + </message> + <message> <source>Clear &All</source> <translation>Очистить &всё</translation> </message> @@ -1518,6 +2096,126 @@ <source>S&end</source> <translation>&Отправить</translation> </message> + <message> + <source>Copy quantity</source> + <translation>Копировать количество</translation> + </message> + <message> + <source>Copy amount</source> + <translation>Копировать сумму</translation> + </message> + <message> + <source>Copy fee</source> + <translation>Копировать комиссию</translation> + </message> + <message> + <source>Copy after fee</source> + <translation>Копировать после комиссии</translation> + </message> + <message> + <source>Copy bytes</source> + <translation>Копировать байты</translation> + </message> + <message> + <source>Copy dust</source> + <translation>Копировать пыль</translation> + </message> + <message> + <source>Copy change</source> + <translation>Копировать сдачу</translation> + </message> + <message> + <source>%1 to %2</source> + <translation>С %1 на %2</translation> + </message> + <message> + <source>Are you sure you want to send?</source> + <translation>Вы уверены, что хотите отправить?</translation> + </message> + <message> + <source>added as transaction fee</source> + <translation>добавлено как комиссия</translation> + </message> + <message> + <source>Total Amount %1</source> + <translation>Общая сумма %1</translation> + </message> + <message> + <source>or</source> + <translation>или</translation> + </message> + <message> + <source>Confirm send coins</source> + <translation>Подтвердите отправку монет</translation> + </message> + <message> + <source>The recipient address is not valid. Please recheck.</source> + <translation>Адрес получателя неверный. Пожалуйста, перепроверьте.</translation> + </message> + <message> + <source>The amount to pay must be larger than 0.</source> + <translation>Сумма для отправки должна быть больше 0.</translation> + </message> + <message> + <source>The amount exceeds your balance.</source> + <translation>Сумма превышает ваш баланс.</translation> + </message> + <message> + <source>The total exceeds your balance when the %1 transaction fee is included.</source> + <translation>Сумма с учётом комиссии %1 превысит ваш баланс.</translation> + </message> + <message> + <source>Duplicate address found: addresses should only be used once each.</source> + <translation>Обнаружен дублирующийся адрес: используйте каждый адрес только один раз.</translation> + </message> + <message> + <source>Transaction creation failed!</source> + <translation>Не удалось создать транзакцию!</translation> + </message> + <message> + <source>The transaction was rejected with the following reason: %1</source> + <translation>Транзакция была отвергнута по следующей причине: %1</translation> + </message> + <message> + <source>A fee higher than %1 is considered an absurdly high fee.</source> + <translation>Комиссия больше чем %1 считается невероятно большой.</translation> + </message> + <message> + <source>Payment request expired.</source> + <translation>Запрос платежа просрочен.</translation> + </message> + <message numerus="yes"> + <source>%n block(s)</source> + <translation><numerusform>%n блок</numerusform><numerusform>%n блока</numerusform><numerusform>%n блоков</numerusform><numerusform>%n блоков</numerusform></translation> + </message> + <message> + <source>Pay only the required fee of %1</source> + <translation>Заплатить только обязательную комиссию %1</translation> + </message> + <message numerus="yes"> + <source>Estimated to begin confirmation within %n block(s).</source> + <translation><numerusform>Начало подтверждения ожидается через %n блок.</numerusform><numerusform>Начало подтверждения ожидается через %n блока.</numerusform><numerusform>Начало подтверждения ожидается через %n блоков.</numerusform><numerusform>Начало подтверждения ожидается через %n блоков.</numerusform></translation> + </message> + <message> + <source>Warning: Invalid Bitcoin address</source> + <translation>Внимание: неверный адрес Bitcoin</translation> + </message> + <message> + <source>Warning: Unknown change address</source> + <translation>Внимание: неизвестный адрес для сдачи</translation> + </message> + <message> + <source>Confirm custom change address</source> + <translation>Подтвердите свой адрес для сдачи</translation> + </message> + <message> + <source>The address you selected for change is not part of this wallet. Any or all funds in your wallet may be sent to this address. Are you sure?</source> + <translation>Выбранный вами адрес для сдачи не принадлежит этому кошельку. Часть или все средства могут быть отправлены на этот адрес. Вы уверены?</translation> + </message> + <message> + <source>(no label)</source> + <translation>(нет метки)</translation> + </message> </context> <context> <name>SendCoinsEntry</name> @@ -1597,6 +2295,17 @@ <source>Memo:</source> <translation>Примечание:</translation> </message> + <message> + <source>Enter a label for this address to add it to your address book</source> + <translation>Введите метку для данного адреса, чтобы добавить его в адресную книгу</translation> + </message> +</context> +<context> + <name>SendConfirmationDialog</name> + <message> + <source>Yes</source> + <translation>Да</translation> + </message> </context> <context> <name>ShutdownWindow</name> @@ -1695,6 +2404,58 @@ <source>Reset all verify message fields</source> <translation>Сбросить все поля проверки сообщения</translation> </message> + <message> + <source>Click "Sign Message" to generate signature</source> + <translation>Нажмите "Подписать сообщение" для создания подписи</translation> + </message> + <message> + <source>The entered address is invalid.</source> + <translation>Введённый адрес неверен.</translation> + </message> + <message> + <source>Please check the address and try again.</source> + <translation>Пожалуйста, проверьте адрес и попробуйте ещё раз.</translation> + </message> + <message> + <source>The entered address does not refer to a key.</source> + <translation>Введённый адрес не связан с ключом.</translation> + </message> + <message> + <source>Wallet unlock was cancelled.</source> + <translation>Разблокировка бумажника была отменена.</translation> + </message> + <message> + <source>Private key for the entered address is not available.</source> + <translation>Недоступен секретный ключ для введённого адреса.</translation> + </message> + <message> + <source>Message signing failed.</source> + <translation>Не удалось подписать сообщение.</translation> + </message> + <message> + <source>Message signed.</source> + <translation>Сообщение подписано.</translation> + </message> + <message> + <source>The signature could not be decoded.</source> + <translation>Подпись не может быть раскодирована.</translation> + </message> + <message> + <source>Please check the signature and try again.</source> + <translation>Пожалуйста, проверьте подпись и попробуйте ещё раз.</translation> + </message> + <message> + <source>The signature did not match the message digest.</source> + <translation>Подпись не соответствует отпечатку сообщения.</translation> + </message> + <message> + <source>Message verification failed.</source> + <translation>Сообщение не прошло проверку.</translation> + </message> + <message> + <source>Message verified.</source> + <translation>Сообщение проверено.</translation> + </message> </context> <context> <name>SplashScreen</name> @@ -1711,11 +2472,460 @@ </message> </context> <context> + <name>TransactionDesc</name> + <message numerus="yes"> + <source>Open for %n more block(s)</source> + <translation><numerusform>Открыто для ещё %n блока</numerusform><numerusform>Открыто для ещё %n блоков</numerusform><numerusform>Открыто для ещё %n блоков</numerusform><numerusform>Открыто для ещё %n блоков</numerusform></translation> + </message> + <message> + <source>Open until %1</source> + <translation>Открыто до %1</translation> + </message> + <message> + <source>conflicted with a transaction with %1 confirmations</source> + <translation>конфликт с транзакцией с %1 подтверждений</translation> + </message> + <message> + <source>%1/offline</source> + <translation>%1/отключен</translation> + </message> + <message> + <source>0/unconfirmed, %1</source> + <translation>0/не подтверждено, %1</translation> + </message> + <message> + <source>in memory pool</source> + <translation>В памяти</translation> + </message> + <message> + <source>not in memory pool</source> + <translation>Не в памяти</translation> + </message> + <message> + <source>abandoned</source> + <translation>заброшено</translation> + </message> + <message> + <source>%1/unconfirmed</source> + <translation>%1/не подтверждено</translation> + </message> + <message> + <source>%1 confirmations</source> + <translation>%1 подтверждений</translation> + </message> + <message> + <source>Status</source> + <translation>Статус</translation> + </message> + <message> + <source>, has not been successfully broadcast yet</source> + <translation>, ещё не было успешно разослано</translation> + </message> + <message numerus="yes"> + <source>, broadcast through %n node(s)</source> + <translation><numerusform>, разослано через %n узел</numerusform><numerusform>, разослано через %n узла</numerusform><numerusform>, разослано через %n узлов</numerusform><numerusform>, разослано через %n узлов</numerusform></translation> + </message> + <message> + <source>Date</source> + <translation>Дата</translation> + </message> + <message> + <source>Source</source> + <translation>Источник</translation> + </message> + <message> + <source>Generated</source> + <translation>Сгенерированно</translation> + </message> + <message> + <source>From</source> + <translation>От</translation> + </message> + <message> + <source>unknown</source> + <translation>неизвестно</translation> + </message> + <message> + <source>To</source> + <translation>Для</translation> + </message> + <message> + <source>own address</source> + <translation>свой адрес</translation> + </message> + <message> + <source>watch-only</source> + <translation>только наблюдение</translation> + </message> + <message> + <source>label</source> + <translation>метка</translation> + </message> + <message> + <source>Credit</source> + <translation>Кредит</translation> + </message> + <message numerus="yes"> + <source>matures in %n more block(s)</source> + <translation><numerusform>будет доступно через %n блок</numerusform><numerusform>будет доступно через %n блока</numerusform><numerusform>будет доступно через %n блоков</numerusform><numerusform>будет доступно через %n блоков</numerusform></translation> + </message> + <message> + <source>not accepted</source> + <translation>не принято</translation> + </message> + <message> + <source>Debit</source> + <translation>Дебет</translation> + </message> + <message> + <source>Total debit</source> + <translation>Всего дебет</translation> + </message> + <message> + <source>Total credit</source> + <translation>Всего кредит</translation> + </message> + <message> + <source>Transaction fee</source> + <translation>Комиссия</translation> + </message> + <message> + <source>Net amount</source> + <translation>Чистая сумма</translation> + </message> + <message> + <source>Message</source> + <translation>Сообщение</translation> + </message> + <message> + <source>Comment</source> + <translation>Комментарий</translation> + </message> + <message> + <source>Transaction ID</source> + <translation>ID транзакции</translation> + </message> + <message> + <source>Transaction total size</source> + <translation>Общий размер транзакции</translation> + </message> + <message> + <source>Output index</source> + <translation>Номер выхода</translation> + </message> + <message> + <source>Merchant</source> + <translation>Продавец</translation> + </message> + <message> + <source>Generated coins must mature %1 blocks before they can be spent. When you generated this block, it was broadcast to the network to be added to the block chain. If it fails to get into the chain, its state will change to "not accepted" and it won't be spendable. This may occasionally happen if another node generates a block within a few seconds of yours.</source> + <translation>Сгенерированные монеты должны подождать %1 блоков, прежде чем они могут быть потрачены. Когда вы сгенерировали этот блок, он был отправлен в сеть для добавления в цепочку блоков. Если он не попадёт в цепь, его статус изменится на "не принят", и монеты будут недействительны. Это иногда происходит в случае, если другой узел сгенерирует блок на несколько секунд раньше вас.</translation> + </message> + <message> + <source>Debug information</source> + <translation>Отладочная информация</translation> + </message> + <message> + <source>Transaction</source> + <translation>Транзакция</translation> + </message> + <message> + <source>Inputs</source> + <translation>Входы</translation> + </message> + <message> + <source>Amount</source> + <translation>Сумма</translation> + </message> + <message> + <source>true</source> + <translation>истина</translation> + </message> + <message> + <source>false</source> + <translation>ложь</translation> + </message> +</context> +<context> <name>TransactionDescDialog</name> <message> <source>This pane shows a detailed description of the transaction</source> <translation>Эта панель отображает детальное описание транзакции.</translation> </message> + <message> + <source>Details for %1</source> + <translation>Подробности %1</translation> + </message> +</context> +<context> + <name>TransactionTableModel</name> + <message> + <source>Date</source> + <translation>Дата</translation> + </message> + <message> + <source>Type</source> + <translation>Тип</translation> + </message> + <message> + <source>Label</source> + <translation>Метка</translation> + </message> + <message numerus="yes"> + <source>Open for %n more block(s)</source> + <translation><numerusform>Открыто для ещё %n блока</numerusform><numerusform>Открыто для ещё %n блоков</numerusform><numerusform>Открыто для ещё %n блоков</numerusform><numerusform>Открыто для ещё %n блоков</numerusform></translation> + </message> + <message> + <source>Open until %1</source> + <translation>Открыто до %1</translation> + </message> + <message> + <source>Offline</source> + <translation>Отключен</translation> + </message> + <message> + <source>Unconfirmed</source> + <translation>Не подтверждено</translation> + </message> + <message> + <source>Abandoned</source> + <translation>Заброшено</translation> + </message> + <message> + <source>Confirming (%1 of %2 recommended confirmations)</source> + <translation>Подтверждается (%1 из %2 рекомендуемых подтверждений)</translation> + </message> + <message> + <source>Confirmed (%1 confirmations)</source> + <translation>Подтверждено (%1 подтверждений)</translation> + </message> + <message> + <source>Conflicted</source> + <translation>В противоречии</translation> + </message> + <message> + <source>Immature (%1 confirmations, will be available after %2)</source> + <translation>Незрелый (%1 подтверждений, будет доступно после %2)</translation> + </message> + <message> + <source>This block was not received by any other nodes and will probably not be accepted!</source> + <translation>Этот блок не был получен другими узлами и, возможно, не будет принят!</translation> + </message> + <message> + <source>Generated but not accepted</source> + <translation>Сгенерировано, но не принято</translation> + </message> + <message> + <source>Received with</source> + <translation>Получено на</translation> + </message> + <message> + <source>Received from</source> + <translation>Получено от</translation> + </message> + <message> + <source>Sent to</source> + <translation>Отправлено на</translation> + </message> + <message> + <source>Payment to yourself</source> + <translation>Отправлено себе</translation> + </message> + <message> + <source>Mined</source> + <translation>Добыто</translation> + </message> + <message> + <source>watch-only</source> + <translation>только наблюдение</translation> + </message> + <message> + <source>(n/a)</source> + <translation>(недоступно)</translation> + </message> + <message> + <source>(no label)</source> + <translation>(нет метки)</translation> + </message> + <message> + <source>Transaction status. Hover over this field to show number of confirmations.</source> + <translation>Статус транзакции. Подведите курсор к этому полю, чтобы увидеть количество подтверждений.</translation> + </message> + <message> + <source>Date and time that the transaction was received.</source> + <translation>Дата и время получения транзакции.</translation> + </message> + <message> + <source>Type of transaction.</source> + <translation>Тип транзакции.</translation> + </message> + <message> + <source>Whether or not a watch-only address is involved in this transaction.</source> + <translation>Использовался ли в транзакции адрес для наблюдения.</translation> + </message> + <message> + <source>User-defined intent/purpose of the transaction.</source> + <translation>Определяемое пользователем намерение/цель транзакции.</translation> + </message> + <message> + <source>Amount removed from or added to balance.</source> + <translation>Снятая или добавленная к балансу сумма.</translation> + </message> +</context> +<context> + <name>TransactionView</name> + <message> + <source>All</source> + <translation>Все</translation> + </message> + <message> + <source>Today</source> + <translation>Сегодня</translation> + </message> + <message> + <source>This week</source> + <translation>На этой неделе</translation> + </message> + <message> + <source>This month</source> + <translation>В этом месяце</translation> + </message> + <message> + <source>Last month</source> + <translation>В прошлом месяце</translation> + </message> + <message> + <source>This year</source> + <translation>В этом году</translation> + </message> + <message> + <source>Range...</source> + <translation>Диапазон...</translation> + </message> + <message> + <source>Received with</source> + <translation>Получено на</translation> + </message> + <message> + <source>Sent to</source> + <translation>Отправлено на</translation> + </message> + <message> + <source>To yourself</source> + <translation>Себе</translation> + </message> + <message> + <source>Mined</source> + <translation>Добыто</translation> + </message> + <message> + <source>Other</source> + <translation>Другое</translation> + </message> + <message> + <source>Enter address or label to search</source> + <translation>Введите адрес или метку для поиска</translation> + </message> + <message> + <source>Min amount</source> + <translation>Мин. сумма</translation> + </message> + <message> + <source>Abandon transaction</source> + <translation>Отказаться от транзакции</translation> + </message> + <message> + <source>Copy address</source> + <translation>Копировать адрес</translation> + </message> + <message> + <source>Copy label</source> + <translation>Копировать метку</translation> + </message> + <message> + <source>Copy amount</source> + <translation>Копировать сумму</translation> + </message> + <message> + <source>Copy transaction ID</source> + <translation>Копировать ID транзакции</translation> + </message> + <message> + <source>Copy raw transaction</source> + <translation>Копировать исходный код транзакции</translation> + </message> + <message> + <source>Copy full transaction details</source> + <translation>Копировать все подробности транзакции</translation> + </message> + <message> + <source>Edit label</source> + <translation>Изменить метку</translation> + </message> + <message> + <source>Show transaction details</source> + <translation>Показать подробности транзакции</translation> + </message> + <message> + <source>Export Transaction History</source> + <translation>Экспортировать историю транзакций</translation> + </message> + <message> + <source>Comma separated file (*.csv)</source> + <translation>Текст, разделённый запятыми (*.csv)</translation> + </message> + <message> + <source>Confirmed</source> + <translation>Подтверждено</translation> + </message> + <message> + <source>Watch-only</source> + <translation>Для наблюдения</translation> + </message> + <message> + <source>Date</source> + <translation>Дата</translation> + </message> + <message> + <source>Type</source> + <translation>Тип</translation> + </message> + <message> + <source>Label</source> + <translation>Метка</translation> + </message> + <message> + <source>Address</source> + <translation>Адрес</translation> + </message> + <message> + <source>ID</source> + <translation>ID</translation> + </message> + <message> + <source>Exporting Failed</source> + <translation>Экспорт не удался</translation> + </message> + <message> + <source>There was an error trying to save the transaction history to %1.</source> + <translation>Произошла ошибка при сохранении истории транзакций в %1.</translation> + </message> + <message> + <source>Exporting Successful</source> + <translation>Экспорт успешно завершён</translation> + </message> + <message> + <source>The transaction history was successfully saved to %1.</source> + <translation>История транзакций была успешно сохранена в %1.</translation> + </message> + <message> + <source>Range:</source> + <translation>Диапазон:</translation> + </message> + <message> + <source>to</source> + <translation>до</translation> + </message> </context> <context> <name>UnitDisplayStatusBarControl</name> @@ -1725,6 +2935,55 @@ </message> </context> <context> + <name>WalletFrame</name> + <message> + <source>No wallet has been loaded.</source> + <translation>Не был загружен ни один бумажник.</translation> + </message> +</context> +<context> + <name>WalletModel</name> + <message> + <source>Send Coins</source> + <translation>Отправка</translation> + </message> +</context> +<context> + <name>WalletView</name> + <message> + <source>&Export</source> + <translation>&Экспорт</translation> + </message> + <message> + <source>Export the data in the current tab to a file</source> + <translation>Экспортировать данные текущей вкладки в файл</translation> + </message> + <message> + <source>Backup Wallet</source> + <translation>Резервная копия бумажника</translation> + </message> + <message> + <source>Wallet Data (*.dat)</source> + <translation>Данные бумажника (*.dat)</translation> + </message> + <message> + <source>Backup Failed</source> + <translation>Резервное копирование не удалось</translation> + </message> + <message> + <source>There was an error trying to save the wallet data to %1.</source> + <translation>Произошла ошибка при сохранении данных бумажника в %1.</translation> + </message> + <message> + <source>Backup Successful</source> + <translation>Резервное копирование успешно завершено</translation> + </message> + <message> + <source>The wallet data was successfully saved to %1.</source> + <translation>Данные бумажника были успешно сохранены в %1.</translation> + </message> +</context> +<context> <name>bitcoin-core</name> <message> <source>Options:</source> @@ -1747,6 +3006,18 @@ <translation>Принимать командную строку и команды JSON-RPC</translation> </message> <message> + <source>Accept connections from outside (default: 1 if no -proxy or -connect/-noconnect)</source> + <translation>Принимать подключения снаружи (по умолчанию: 1, если не -proxy или -connect/-disconnect)</translation> + </message> + <message> + <source>Connect only to the specified node(s); -noconnect or -connect=0 alone to disable automatic connections</source> + <translation>Подключаться только к указанному узлу(ам); -noconnect или -connect=0 для запрета автоматических подключений</translation> + </message> + <message> + <source>Distributed under the MIT software license, see the accompanying file %s or %s</source> + <translation>Распространяется под лицензией MIT, см. приложенный файл %s или %s</translation> + </message> + <message> <source>If <category> is not supplied or if <category> = 1, output all debugging information.</source> <translation>Если <category> не предоставлена или равна 1, выводить всю отладочную информацию.</translation> </message> @@ -1759,10 +3030,6 @@ <translation>Удаление: последняя синхронизация кошелька вышла за рамки удаленных данных. Вам нужен -reindex (скачать всю цепь блоков в случае удаленного узла)</translation> </message> <message> - <source>Reduce storage requirements by pruning (deleting) old blocks. This mode is incompatible with -txindex and -rescan. Warning: Reverting this setting requires re-downloading the entire blockchain. (default: 0 = disable pruning blocks, >%u = target size in MiB to use for block files)</source> - <translation>Уменьшить размер хранилища за счёт удаления (обрезания) старых блоков. Этот режим несовместим с -txindex и -rescan. Внимание: переключение этой опции обратно потребует полной загрузки цепи блоков. (по умолчанию: 0 = отключить удаление блоков, >%u = целевой размер в Мб для файлов блоков)</translation> - </message> - <message> <source>Rescans are not possible in pruned mode. You will need to use -reindex which will download the whole blockchain again.</source> <translation>Повторное сканирование не возможно в режиме удаления. Вам надо будет использовать -reindex, который загрузит заново всю цепь блоков.</translation> </message> @@ -1787,10 +3054,6 @@ <translation>Невозможно запустить HTTP сервер. Смотри debug лог для подробностей.</translation> </message> <message> - <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> - <translation>Принимать подключения извне (по умолчанию: 1, если не используется -proxy или -connect)</translation> - </message> - <message> <source>Bitcoin Core</source> <translation>Bitcoin Core</translation> </message> @@ -1799,8 +3062,8 @@ <translation>Разработчики %s</translation> </message> <message> - <source>-fallbackfee is set very high! This is the transaction fee you may pay when fee estimates are not available.</source> - <translation>Установлено очень большое значение -fallbackfee! Это комиссия за транзацию, которую вы можете заплатить, если оценка размера комиссии не доступна. </translation> + <source>Accept relayed transactions received from whitelisted peers even when not relaying transactions (default: %d)</source> + <translation>Принимать транзакции пересылаемые от узлов из белого списка даже если они не удовлетворяют требованиям ретрансляции (по умолчанию: %d)</translation> </message> <message> <source>Bind to given address and always listen on it. Use [host]:port notation for IPv6</source> @@ -1815,8 +3078,8 @@ <translation>Удалить все транзакции бумажника с возможностью восстановить эти части цепи блоков с помощью -rescan при запуске</translation> </message> <message> - <source>Distributed under the MIT software license, see the accompanying file COPYING or <http://www.opensource.org/licenses/mit-license.php>.</source> - <translation>Распространяется под лицензией MIT, см. приложенный файл COPYING или <http://www.opensource.org/licenses/mit-license.php>.</translation> + <source>Error loading %s: You can't enable HD on a already existing non-HD wallet</source> + <translation>Ошибка загрузки %s: Вы не можете включить HD в уже существующем не-HD кошельке</translation> </message> <message> <source>Error reading %s! All keys read correctly, but transaction data or address book entries might be missing or incorrect.</source> @@ -1827,14 +3090,22 @@ <translation>Выполнить команду, когда меняется транзакция в бумажнике (%s в команде заменяется на TxID)</translation> </message> <message> - <source>Force relay of transactions from whitelisted peers even they violate local relay policy (default: %d)</source> - <translation>Всегда разрешать транзакции, полученные от участников из белого списка (по умолчанию: %d)</translation> + <source>Maximum allowed median peer time offset adjustment. Local perspective of time may be influenced by peers forward or backward by this amount. (default: %u seconds)</source> + <translation>Максимально допустимое среднее отклонение времени участников. Локальное представление времени может меняться вперед или назад на это количество. (по умолчанию: %u секунд)</translation> + </message> + <message> + <source>Maximum total fees (in %s) to use in a single wallet transaction or raw transaction; setting this too low may abort large transactions (default: %s)</source> + <translation>Максимальная сумма комиссий (%s) для одной транзакции в бумажнике или сырой транзакции; слишком низкое значение может вызвать прерывание больших транзакций (по умолчанию: %s)</translation> </message> <message> <source>Please check that your computer's date and time are correct! If your clock is wrong, %s will not work properly.</source> <translation>Пожалуйста убедитесь в корректности установки времени и даты на вашем компьютере! Если время установлено неверно, %s не будет работать правильно.</translation> </message> <message> + <source>Please contribute if you find %s useful. Visit %s for further information about the software.</source> + <translation>Пожалуйста, внести свой вклад, если вы найдете %s полезными. Посетите %s для получения дополнительной информации о программном обеспечении.</translation> + </message> + <message> <source>Set the number of script verification threads (%u to %d, 0 = auto, <0 = leave that many cores free, default: %d)</source> <translation>Задать число потоков проверки скрипта (от %u до %d, 0=авто, <0 = оставить столько ядер свободными, по умолчанию: %d)</translation> </message> @@ -1847,20 +3118,32 @@ <translation>Это пре-релизная тестовая сборка - используйте на свой страх и риск - не используйте для добычи или торговых приложений</translation> </message> <message> + <source>Unable to rewind the database to a pre-fork state. You will need to redownload the blockchain</source> + <translation>Невозможно отмотать базу данных до пред-форкового состояния. Вам будет необходимо перекачать цепочку блоков.</translation> + </message> + <message> <source>Use UPnP to map the listening port (default: 1 when listening and no -proxy)</source> <translation>Использовать UPnP для проброса порта (по умолчанию: 1, если используется прослушивание и нет -proxy)</translation> </message> <message> + <source>Username and hashed password for JSON-RPC connections. The field <userpw> comes in the format: <USERNAME>:<SALT>$<HASH>. A canonical python script is included in share/rpcuser. The client then connects normally using the rpcuser=<USERNAME>/rpcpassword=<PASSWORD> pair of arguments. This option can be specified multiple times</source> + <translation>Имя пользователя и хэш пароля для JSON-RPC соединений. Поле <userpw> использует формат: <USERNAME>:<SALT>$<HASH>. Каноничный пример скрипта на питоне находится в share/rpcuser. Эта опция может быть указана несколько раз</translation> + </message> + <message> + <source>Wallet will not create transactions that violate mempool chain limits (default: %u)</source> + <translation>Бумажник не будет создавать транзакции, которые нарушают лимиты цепочки пула в памяти (по умолчанию: %u)</translation> + </message> + <message> <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source> - <translation>Внимание: похоже, в сети нет полного согласия! Некоторый майнеры, возможно, испытывают проблемы.</translation> + <translation>Внимание: похоже, в сети нет полного согласия! Некоторые майнеры, возможно, испытывают проблемы.</translation> </message> <message> <source>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</source> <translation>Внимание: мы не полностью согласны с подключенными участниками! Вам или другим участникам, возможно, следует обновиться.</translation> </message> <message> - <source>Whitelist peers connecting from the given netmask or IP address. Can be specified multiple times.</source> - <translation>Вносить в белый список участников, подключающихся с указанной маски сети или IP. Можно использовать многократно.</translation> + <source>You need to rebuild the database using -reindex-chainstate to change -txindex</source> + <translation>Вам необходимо пересобрать базы данных с помощью -reindex-chainstate, чтобы изменить -txindex</translation> </message> <message> <source>%s corrupt, salvage failed</source> @@ -1887,8 +3170,16 @@ <translation>Параметры создания блоков:</translation> </message> <message> - <source>Connect only to the specified node(s)</source> - <translation>Подключаться только к указанному узлу(ам)</translation> + <source>Cannot resolve -%s address: '%s'</source> + <translation>Не удаётся разрешить адрес в параметре -%s: '%s'</translation> + </message> + <message> + <source>Chain selection options:</source> + <translation>Параметры выбора цепочки:</translation> + </message> + <message> + <source>Change index out of range</source> + <translation>Изменение индекса вне диапазона</translation> </message> <message> <source>Connection options:</source> @@ -1931,6 +3222,10 @@ <translation>Включить публичную сырую транзакцию в <address></translation> </message> <message> + <source>Enable transaction replacement in the memory pool (default: %u)</source> + <translation>Включить замену транзакций в пуле памяти (по умолчанию:%u)</translation> + </message> + <message> <source>Error initializing block database</source> <translation>Ошибка инициализации БД блоков</translation> </message> @@ -1951,6 +3246,10 @@ <translation>Ошибка загрузки %s: Для бумажника требуется более новая версия %s</translation> </message> <message> + <source>Error loading %s: You can't disable HD on a already existing HD wallet</source> + <translation>Ошибка загрузки %s: Вы не можете включить HD в уже существующем не-HD кошельке</translation> + </message> + <message> <source>Error loading block database</source> <translation>Ошибка чтения базы данных блоков</translation> </message> @@ -1975,6 +3274,10 @@ <translation>Неверный или отсутствующий начальный блок. Неправильный каталог данных для сети?</translation> </message> <message> + <source>Initialization sanity check failed. %s is shutting down.</source> + <translation>Начальная проверка исправности не удалась. %s завершает работу.</translation> + </message> + <message> <source>Invalid -onion address: '%s'</source> <translation>Неверный -onion адрес: '%s'</translation> </message> @@ -1983,6 +3286,10 @@ <translation>Неверная сумма для -%s=<amount>: '%s'</translation> </message> <message> + <source>Invalid amount for -fallbackfee=<amount>: '%s'</source> + <translation>Недопустимая сумма для -fallbackfee=<amount>: '%s'</translation> + </message> + <message> <source>Keep the transaction memory pool below <n> megabytes (default: %u)</source> <translation>Сбрасывать транзакции из памяти на диск каждые <n> мегабайт (по умолчанию: %u)</translation> </message> @@ -2019,16 +3326,20 @@ <translation>Режим удаления блоков несовместим с -txindex.</translation> </message> <message> + <source>Rebuild chain state and block index from the blk*.dat files on disk</source> + <translation>Перестроить состояние цепи блоков и индекс блоков из blk*.dat файлов с диска</translation> + </message> + <message> <source>Rebuild chain state from the currently indexed blocks</source> <translation>Перестроить индекс цепи из текущих индексированных блоков</translation> </message> <message> - <source>Set database cache size in megabytes (%d to %d, default: %d)</source> - <translation>Установить размер кэша БД в мегабайтах(от %d до %d, по умолчанию: %d)</translation> + <source>Rewinding blocks...</source> + <translation>Перемотка блоков...</translation> </message> <message> - <source>Set maximum block cost (default: %d)</source> - <translation>Задать максимальную стоимость блока (по умолчанию: %d)</translation> + <source>Set database cache size in megabytes (%d to %d, default: %d)</source> + <translation>Установить размер кэша БД в мегабайтах(от %d до %d, по умолчанию: %d)</translation> </message> <message> <source>Set maximum block size in bytes (default: %d)</source> @@ -2063,6 +3374,10 @@ <translation>Использовать UPnP для проброса порта (по умолчанию: %u)</translation> </message> <message> + <source>Use the test chain</source> + <translation>Использовать тестовую цепочку</translation> + </message> + <message> <source>User Agent comment (%s) contains unsafe characters.</source> <translation>Комментарий пользователя (%s) содержит небезопасные символы.</translation> </message> @@ -2135,10 +3450,6 @@ <translation>Наибольший размер данных в носителе данных транзакций, которые мы передаем и генерируем (по умолчанию: %u)</translation> </message> <message> - <source>Query for peer addresses via DNS lookup, if low on addresses (default: 1 unless -connect)</source> - <translation>Запрашивать адреса участников с помощью DNS, если адресов мало (по умолчанию: 1, если не указан -connect)</translation> - </message> - <message> <source>Randomize credentials for every proxy connection. This enables Tor stream isolation (default: %u)</source> <translation>Использовать случайные учётные данные для каждого прокси-подключения. Эта функция позволяет изолировать потоки Tor (по умолчанию: %u)</translation> </message> @@ -2151,8 +3462,8 @@ <translation>Сумма транзакции за вычетом комиссии слишком мала</translation> </message> <message> - <source>This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit <https://www.openssl.org/> and cryptographic software written by Eric Young and UPnP software written by Thomas Bernard.</source> - <translation>Этот продукт включает ПО, разработанное OpenSSL Project для использования в OpenSSL Toolkit <https://www.openssl.org/> и криптографическое ПО, написанное Eric Young и ПО для работы с UPnP, написанное Thomas Bernard.</translation> + <source>Use hierarchical deterministic key generation (HD) after BIP32. Only has effect during wallet creation/first start</source> + <translation>Использовать иерархическую детерминированную генерацию ключей (HD) после BIP32. Применяется в процессе создания бумажника / первого запуска</translation> </message> <message> <source>Whitelisted peers cannot be DoS banned and their transactions are always relayed, even if they are already in the mempool, useful e.g. for a gateway</source> @@ -2263,10 +3574,6 @@ <translation>Сумма транзакции слишком мала</translation> </message> <message> - <source>Transaction amounts must be positive</source> - <translation>Сумма транзакции должна быть положительна</translation> - </message> - <message> <source>Transaction too large for fee policy</source> <translation>Транзакция слишком большая для правил комиссии.</translation> </message> @@ -2331,18 +3638,22 @@ <translation>Установлено очень большое значение -maxtxfee. Такие большие комиссии могут быть уплачены в отдельной транзакции.</translation> </message> <message> - <source>-paytxfee is set very high! This is the transaction fee you will pay if you send a transaction.</source> - <translation>Установлено очень большое значение -paytxfee. Такие большие комиссии могут быть уплачены в отдельной транзакции.</translation> - </message> - <message> <source>Do not keep transactions in the mempool longer than <n> hours (default: %u)</source> <translation>Не хранить транзакции в памяти дольше, чем <n> часов (по умолчанию %u)</translation> </message> <message> + <source>Equivalent bytes per sigop in transactions for relay and mining (default: %u)</source> + <translation>Эквивалентных байт на sigop в транзакциях для ретрансляции или добычи (по умолчанию: %u)</translation> + </message> + <message> <source>Fees (in %s/kB) smaller than this are considered zero fee for transaction creation (default: %s)</source> <translation>Комиссии (в %s/Кб) меньшие этого значения считаются нулевыми при создании транзакций (по умолчанию: %s)</translation> </message> <message> + <source>Force relay of transactions from whitelisted peers even if they violate local relay policy (default: %d)</source> + <translation>Всегда ретранслировать транзакции, полученные из белого списка участников, даже если они нарушают локальную политику ретрансляции (по умолчанию: %d)</translation> + </message> + <message> <source>How thorough the block verification of -checkblocks is (0-4, default: %u)</source> <translation>Насколько тщательна проверка контрольных блоков -checkblocks (0-4, по умолчанию: %u)</translation> </message> @@ -2359,10 +3670,26 @@ <translation>Выводить отладочную информацию (по умолчанию: %u, указание <category> необязательно)</translation> </message> <message> + <source>Query for peer addresses via DNS lookup, if low on addresses (default: 1 unless -connect/-noconnect)</source> + <translation>Запрашивать адреса участников с помощью DNS, если адресов мало (по умолчанию: 1, если не указан -connect/-noconnect)</translation> + </message> + <message> + <source>Sets the serialization of raw transaction or block hex returned in non-verbose mode, non-segwit(0) or segwit(1) (default: %d)</source> + <translation>Задаёт сериализацию сырой транзакции или хекса блока, возвращённого в не подробном режиме, non-segwit(0) или segwit(1) (по умолчанию: %d)</translation> + </message> + <message> <source>Support filtering of blocks and transaction with bloom filters (default: %u)</source> <translation>Поддерживать фильтрацию блоков и транзакций с помощью фильтра Блума (по умолчанию: %u)</translation> </message> <message> + <source>This is the transaction fee you may pay when fee estimates are not available.</source> + <translation>Это комиссия за транзакцию, которую вы можете заплатить, когда расчёт комиссии недоступен.</translation> + </message> + <message> + <source>This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit %s and cryptographic software written by Eric Young and UPnP software written by Thomas Bernard.</source> + <translation>Этот продукт включает ПО, разработанное OpenSSL Project для использования в OpenSSL Toolkit %s и криптографическое ПО, написанное Eric Young и ПО для работы с UPnP, написанное Thomas Bernard.</translation> + </message> + <message> <source>Total length of network version string (%i) exceeds maximum length (%i). Reduce the number or size of uacomments.</source> <translation>Текущая длина строки версии сети (%i) превышает максимальную длину (%i). Увеливается количество или размер uacomments.</translation> </message> @@ -2375,12 +3702,12 @@ <translation>Обнаружен не поддерживаемый аргумент -socks. Выбор версии SOCKS более невозможен, поддерживаются только прокси SOCKS5.</translation> </message> <message> - <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: %s)</source> - <translation>Использовать отдельный прокси SOCKS5 для соединения с участниками через скрытые сервисы Tor (по умолчанию: %s)</translation> + <source>Unsupported argument -whitelistalwaysrelay ignored, use -whitelistrelay and/or -whitelistforcerelay.</source> + <translation>Не поддерживаемый аргумент -whitelistalwaysrelay игнорируется, используйте -whitelistrelay и/или -whitelistforcerelay.</translation> </message> <message> - <source>Username and hashed password for JSON-RPC connections. The field <userpw> comes in the format: <USERNAME>:<SALT>$<HASH>. A canonical python script is included in share/rpcuser. This option can be specified multiple times</source> - <translation>Имя пользователя и хэш пароля для JSON-RPC соединений. Поле <userpw> использует формат: <USERNAME>:<SALT>$<HASH>. Каноничный пример скрипта на питоне включен в "share/rpcuser". Эта опция может быть указана несколько раз</translation> + <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: %s)</source> + <translation>Использовать отдельный прокси SOCKS5 для соединения с участниками через скрытые сервисы Tor (по умолчанию: %s)</translation> </message> <message> <source>Warning: Unknown block versions being mined! It's possible unknown rules are in effect</source> @@ -2391,6 +3718,14 @@ <translation>Внимание: Файл бумажника поврежден, данные восстановлены! Оригинальный %s сохранен как %s в %s; Если баланс или транзакции некорректны, вы должны восстановить файл из резервной копии.</translation> </message> <message> + <source>Whitelist peers connecting from the given IP address (e.g. 1.2.3.4) or CIDR notated network (e.g. 1.2.3.0/24). Can be specified multiple times.</source> + <translation>Вносить в белый список участников, подключающихся с указанного IP (напр. 1.2.3.4) или CIDR-адреса сети (напр. 1.2.3.0/24). Можно использовать многократно.</translation> + </message> + <message> + <source>%s is set very high!</source> + <translation>%s задан слишком высоким!</translation> + </message> + <message> <source>(default: %s)</source> <translation>(по умолчанию: %s)</translation> </message> @@ -2411,6 +3746,10 @@ <translation>Неверный адрес -proxy: '%s'</translation> </message> <message> + <source>Keypool ran out, please call keypoolrefill first</source> + <translation>Пул ключей опустел, пожалуйста, выполните keypoolrefill</translation> + </message> + <message> <source>Listen for JSON-RPC connections on <port> (default: %u or testnet: %u)</source> <translation>Прослушивать подключения JSON-RPC на <порту> (по умолчанию: %u или %u в тестовой сети)</translation> </message> @@ -2447,12 +3786,16 @@ <translation>Транслировать не-P2SH мультиподпись (по умолчанию: %u)</translation> </message> <message> + <source>Send transactions with full-RBF opt-in enabled (default: %u)</source> + <translation>Отправлять транзакции с включенным full-RBF (по умолчанию: %u)</translation> + </message> + <message> <source>Set key pool size to <n> (default: %u)</source> <translation>Установить размер пула ключей в <n> (по умолчанию: %u)</translation> </message> <message> - <source>Set minimum block size in bytes (default: %u)</source> - <translation>Задать минимальный размер блока в байтах (по умолчанию: %u)</translation> + <source>Set maximum BIP141 block weight (default: %d)</source> + <translation>Задать максимальное BIP141 значение блока (по умолчанию: %d)</translation> </message> <message> <source>Set the number of threads to service RPC calls (default: %d)</source> @@ -2475,10 +3818,38 @@ <translation>Тратить неподтвержденную сдачу при отправке транзакций (по умолчанию: %u)</translation> </message> <message> + <source>Starting network threads...</source> + <translation>Запускаем сетевые потоки...</translation> + </message> + <message> + <source>The wallet will avoid paying less than the minimum relay fee.</source> + <translation>Бумажник постарается не платить меньше, чем минимальная комиссия передачи.</translation> + </message> + <message> + <source>This is the minimum transaction fee you pay on every transaction.</source> + <translation>Это минимальная комиссия, которую вы платите с каждой транзакцией.</translation> + </message> + <message> + <source>This is the transaction fee you will pay if you send a transaction.</source> + <translation>Это комиссия, которую вы заплатите за эту транзакцию.</translation> + </message> + <message> <source>Threshold for disconnecting misbehaving peers (default: %u)</source> <translation>Порог для отключения неправильно ведущих себя узлов (по умолчанию: %u)</translation> </message> <message> + <source>Transaction amounts must not be negative</source> + <translation>Сумма транзакции не должна быть негативной</translation> + </message> + <message> + <source>Transaction has too long of a mempool chain</source> + <translation>У транзакции слишком длинная цепочка в пуле в памяти.</translation> + </message> + <message> + <source>Transaction must have at least one recipient</source> + <translation>У транзакции должен быть как минимум один получатель</translation> + </message> + <message> <source>Unknown network specified in -onlynet: '%s'</source> <translation>В параметре -onlynet указана неизвестная сеть: '%s'</translation> </message> diff --git a/src/qt/locale/bitcoin_ru_RU.ts b/src/qt/locale/bitcoin_ru_RU.ts index 66419728e2..60d98c41d9 100644 --- a/src/qt/locale/bitcoin_ru_RU.ts +++ b/src/qt/locale/bitcoin_ru_RU.ts @@ -23,7 +23,7 @@ </message> <message> <source>C&lose</source> - <translation>Закрыть</translation> + <translation>&Закрыть</translation> </message> <message> <source>Delete the currently selected address from the list</source> @@ -41,20 +41,27 @@ <source>&Delete</source> <translation>Удалить</translation> </message> -</context> + </context> +<context> + <name>AddressTableModel</name> + </context> <context> <name>AskPassphraseDialog</name> <message> <source>Repeat new passphrase</source> <translation>Повторите новый пароль</translation> </message> -</context> + </context> <context> <name>BanTableModel</name> </context> <context> <name>BitcoinGUI</name> <message> + <source>Bitcoin</source> + <translation>Bitcoin Core</translation> + </message> + <message> <source>&Command-line options</source> <translation>Опции командной строки</translation> </message> @@ -119,6 +126,9 @@ </message> </context> <context> + <name>ModalOverlay</name> + </context> +<context> <name>OpenURIDialog</name> <message> <source>Open URI</source> @@ -136,12 +146,21 @@ <name>OverviewPage</name> </context> <context> + <name>PaymentServer</name> + </context> +<context> <name>PeerTableModel</name> </context> <context> <name>QObject</name> </context> <context> + <name>QObject::QObject</name> + </context> +<context> + <name>QRImageWidget</name> + </context> +<context> <name>RPCConsole</name> <message> <source>&Information</source> @@ -155,12 +174,18 @@ <name>ReceiveRequestDialog</name> </context> <context> + <name>RecentRequestsTableModel</name> + </context> +<context> <name>SendCoinsDialog</name> </context> <context> <name>SendCoinsEntry</name> </context> <context> + <name>SendConfirmationDialog</name> + </context> +<context> <name>ShutdownWindow</name> </context> <context> @@ -173,18 +198,44 @@ <name>TrafficGraphWidget</name> </context> <context> + <name>TransactionDesc</name> + </context> +<context> <name>TransactionDescDialog</name> </context> <context> + <name>TransactionTableModel</name> + </context> +<context> + <name>TransactionView</name> + </context> +<context> <name>UnitDisplayStatusBarControl</name> </context> <context> + <name>WalletFrame</name> + </context> +<context> + <name>WalletModel</name> + </context> +<context> + <name>WalletView</name> + <message> + <source>&Export</source> + <translation>Экспортировать</translation> + </message> + </context> +<context> <name>bitcoin-core</name> <message> <source>Bitcoin Core</source> <translation>Bitcoin Core</translation> </message> <message> + <source>Whitelisted peers cannot be DoS banned and their transactions are always relayed, even if they are already in the mempool, useful e.g. for a gateway</source> + <translation>bitcoin-core</translation> + </message> + <message> <source>Information</source> <translation>Информация</translation> </message> @@ -193,6 +244,10 @@ <translation>Предупреждение</translation> </message> <message> + <source>Do not keep transactions in the mempool longer than <n> hours (default: %u)</source> + <translation>Do not keep transactions in the mempool longer than <n> hours (default: %u)</translation> + </message> + <message> <source>Error</source> <translation>Ошибка</translation> </message> diff --git a/src/qt/locale/bitcoin_sk.ts b/src/qt/locale/bitcoin_sk.ts index a4f0ebcb4e..87dc620f0e 100644 --- a/src/qt/locale/bitcoin_sk.ts +++ b/src/qt/locale/bitcoin_sk.ts @@ -3,7 +3,7 @@ <name>AddressBookPage</name> <message> <source>Right-click to edit address or label</source> - <translation>Kliknutím pravým tlačidlom upravte adresu alebo popis</translation> + <translation>Kliknutím pravým tlačidlom upraviť adresu alebo popis</translation> </message> <message> <source>Create a new address</source> @@ -11,11 +11,11 @@ </message> <message> <source>&New</source> - <translation>&Nové</translation> + <translation>&Nový</translation> </message> <message> <source>Copy the currently selected address to the system clipboard</source> - <translation>Kopírovať práve zvolenú adresu do systémového klipbordu</translation> + <translation>Zkopírovať práve zvolenú adresu</translation> </message> <message> <source>&Copy</source> @@ -41,6 +41,13 @@ <source>&Delete</source> <translation>&Zmazať</translation> </message> + </context> +<context> + <name>AddressTableModel</name> + <message> + <source>(no label)</source> + <translation>(bez popisu)</translation> + </message> </context> <context> <name>AskPassphraseDialog</name> @@ -60,7 +67,7 @@ <source>Repeat new passphrase</source> <translation>Zopakujte nové heslo</translation> </message> -</context> + </context> <context> <name>BanTableModel</name> <message> @@ -115,6 +122,10 @@ <translation>&O %1</translation> </message> <message> + <source>Show information about %1</source> + <translation>Ukázať informácie o %1</translation> + </message> + <message> <source>About &Qt</source> <translation>O &Qt</translation> </message> @@ -127,6 +138,10 @@ <translation>&Možnosti...</translation> </message> <message> + <source>Modify configuration options for %1</source> + <translation>Upraviť nastavenia pre %1</translation> + </message> + <message> <source>&Encrypt Wallet...</source> <translation>&Zašifrovať Peňaženku...</translation> </message> @@ -255,32 +270,16 @@ <translation><numerusform>%n aktívne pripojenie do siete Bitcoin</numerusform><numerusform>%n aktívne pripojenia do siete Bitcoin</numerusform><numerusform>%n aktívnych pripojení do siete Bitcoin</numerusform></translation> </message> <message> - <source>No block source available...</source> - <translation>Nedostupný zdroj blokov...</translation> - </message> - <message numerus="yes"> - <source>Processed %n block(s) of transaction history.</source> - <translation><numerusform>Spracovaných %n blok transakčnej histórie.</numerusform><numerusform>Spracovaných %n bloky transakčnej histórie.</numerusform><numerusform>Spracovaných %n blokov transakčnej histórie.</numerusform></translation> - </message> - <message numerus="yes"> - <source>%n hour(s)</source> - <translation><numerusform>%n hodina</numerusform><numerusform>%n hodiny</numerusform><numerusform>%n hodín</numerusform></translation> - </message> - <message numerus="yes"> - <source>%n day(s)</source> - <translation><numerusform>%n deň</numerusform><numerusform>%n dni</numerusform><numerusform>%n dní</numerusform></translation> - </message> - <message numerus="yes"> - <source>%n week(s)</source> - <translation><numerusform>%n týždeň</numerusform><numerusform>%n týždne</numerusform><numerusform>%n týždňov</numerusform></translation> + <source>Indexing blocks on disk...</source> + <translation>Indexujem bloky na disku...</translation> </message> <message> - <source>%1 and %2</source> - <translation> %1 a %2</translation> + <source>Processing blocks on disk...</source> + <translation>Spracovávam bloky na disku...</translation> </message> <message numerus="yes"> - <source>%n year(s)</source> - <translation><numerusform>%n rok</numerusform><numerusform>%n roky</numerusform><numerusform>%n rokov</numerusform></translation> + <source>Processed %n block(s) of transaction history.</source> + <translation><numerusform>Spracovaných %n blok transakčnej histórie.</numerusform><numerusform>Spracovaných %n bloky transakčnej histórie.</numerusform><numerusform>Spracovaných %n blokov transakčnej histórie.</numerusform></translation> </message> <message> <source>%1 behind</source> @@ -311,6 +310,14 @@ <translation>Aktualizovaný</translation> </message> <message> + <source>Show the %1 help message to get a list with possible Bitcoin command-line options</source> + <translation>Ukáž %1 zoznam možných nastavení Bitcoinu pomocou príkazového riadku</translation> + </message> + <message> + <source>%1 client</source> + <translation>%1 klient</translation> + </message> + <message> <source>Catching up...</source> <translation>Sťahujem...</translation> </message> @@ -360,7 +367,7 @@ <source>Wallet is <b>encrypted</b> and currently <b>locked</b></source> <translation>Peňaženka je <b>zašifrovaná</b> a momentálne <b>zamknutá</b></translation> </message> -</context> + </context> <context> <name>CoinControlDialog</name> <message> @@ -380,10 +387,6 @@ <translation>Suma:</translation> </message> <message> - <source>Priority:</source> - <translation>Priorita:</translation> - </message> - <message> <source>Fee:</source> <translation>Poplatok:</translation> </message> @@ -436,10 +439,10 @@ <translation>Potvrdené</translation> </message> <message> - <source>Priority</source> - <translation>Priorita</translation> + <source>(no label)</source> + <translation>(bez popisu)</translation> </message> -</context> + </context> <context> <name>EditAddressDialog</name> <message> @@ -462,7 +465,7 @@ <source>&Address</source> <translation>&Adresa</translation> </message> -</context> + </context> <context> <name>FreespaceChecker</name> <message> @@ -497,6 +500,10 @@ <translation>(%1-bit)</translation> </message> <message> + <source>About %1</source> + <translation>O %1</translation> + </message> + <message> <source>Command-line options</source> <translation>Voľby príkazového riadku</translation> </message> @@ -532,7 +539,11 @@ <source>Show splash screen on startup (default: %u)</source> <translation>Zobraziť uvítaciu obrazovku pri štarte (predvolené: %u)</translation> </message> - </context> + <message> + <source>Reset all settings changed in the GUI</source> + <translation>Zrušiť všetky zmeny v GUI</translation> + </message> +</context> <context> <name>Intro</name> <message> @@ -540,6 +551,18 @@ <translation>Vitajte</translation> </message> <message> + <source>Welcome to %1.</source> + <translation>Vitajte v %1</translation> + </message> + <message> + <source>As this is the first time the program is launched, you can choose where %1 will store its data.</source> + <translation>Keďže toto je prvé spustenie programu, môžete si vybrať, kam %1 bude ukladať vaše údaje.</translation> + </message> + <message> + <source>%1 will download and store a copy of the Bitcoin block chain. At least %2GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source> + <translation>%1 stiahne a uloží kópiu Bitcoin block chain. Minimálne %2GB dát bude uložených v tejto zložke, a bude sa zväčšovať postupom času. Peňaženka bude taktiež uložená v tejto zložke.</translation> + </message> + <message> <source>Use the default data directory</source> <translation>Použiť predvolený dátový adresár</translation> </message> @@ -565,6 +588,21 @@ </message> </context> <context> + <name>ModalOverlay</name> + <message> + <source>Form</source> + <translation>Forma</translation> + </message> + <message> + <source>Last block time</source> + <translation>Čas posledného bloku</translation> + </message> + <message> + <source>Hide</source> + <translation>Skryť</translation> + </message> + </context> +<context> <name>OpenURIDialog</name> <message> <source>Open URI</source> @@ -582,7 +620,7 @@ <source>Select payment request file</source> <translation>Vyberte súbor s výzvou k platbe</translation> </message> -</context> + </context> <context> <name>OptionsDialog</name> <message> @@ -594,6 +632,14 @@ <translation>&Hlavné</translation> </message> <message> + <source>Automatically start %1 after logging in to the system.</source> + <translation>Automaticky spustiť %1 pri spustení systému.</translation> + </message> + <message> + <source>&Start %1 on system login</source> + <translation>&Spustiť %1 pri prihlásení</translation> + </message> + <message> <source>Size of &database cache</source> <translation>Veľkosť vyrovnávacej pamäti &databázy</translation> </message> @@ -730,6 +776,14 @@ <translation>&Okno</translation> </message> <message> + <source>&Hide the icon from the system tray.</source> + <translation>&Skryť ikonu zo systémovej lišty.</translation> + </message> + <message> + <source>Hide tray icon</source> + <translation>Skryť ikonu v oblasti oznámení</translation> + </message> + <message> <source>Show only a tray icon after minimizing the window.</source> <translation>Zobraziť len ikonu na lište po minimalizovaní okna.</translation> </message> @@ -750,6 +804,10 @@ <translation>Jazyk užívateľského rozhrania:</translation> </message> <message> + <source>The user interface language can be set here. This setting will take effect after restarting %1.</source> + <translation>Jazyk uživateľského rozhrania sa dá nastaviť tu. Toto nastavenie sa uplatní až po reštarte %1.</translation> + </message> + <message> <source>&Unit to show amounts in:</source> <translation>&Zobrazovať hodnoty v jednotkách:</translation> </message> @@ -874,6 +932,9 @@ </message> </context> <context> + <name>PaymentServer</name> + </context> +<context> <name>PeerTableModel</name> <message> <source>User Agent</source> @@ -883,11 +944,7 @@ <source>Node/Service</source> <translation>Uzol/Služba</translation> </message> - <message> - <source>Ping Time</source> - <translation>Čas odozvy</translation> - </message> -</context> + </context> <context> <name>QObject</name> <message> @@ -926,7 +983,17 @@ <source>%1 ms</source> <translation>%1 ms</translation> </message> -</context> + <message> + <source>%1 and %2</source> + <translation> %1 a %2</translation> + </message> + </context> +<context> + <name>QObject::QObject</name> + </context> +<context> + <name>QRImageWidget</name> + </context> <context> <name>RPCConsole</name> <message> @@ -954,6 +1021,10 @@ <translation>Používa BerkeleyDB verziu</translation> </message> <message> + <source>Datadir</source> + <translation>Zložka s dátami</translation> + </message> + <message> <source>Startup time</source> <translation>Čas spustenia</translation> </message> @@ -1039,6 +1110,18 @@ <translation>Aplikácia</translation> </message> <message> + <source>Open the %1 debug log file from the current data directory. This can take a few seconds for large log files.</source> + <translation>Otvoriť %1 ladiaci výpis z aktuálnej zložky. Pre veľké súbory to môže chvíľu trvať.</translation> + </message> + <message> + <source>Decrease font size</source> + <translation>Zmenšiť písmo</translation> + </message> + <message> + <source>Increase font size</source> + <translation>Zväčšiť písmo</translation> + </message> + <message> <source>Services</source> <translation>Služby</translation> </message> @@ -1063,6 +1146,10 @@ <translation>Čas odozvy</translation> </message> <message> + <source>The duration of a currently outstanding ping.</source> + <translation>Trvanie aktuálneho pingu</translation> + </message> + <message> <source>Ping Wait</source> <translation>Čakanie na ping</translation> </message> @@ -1111,14 +1198,6 @@ <translation>Vymazať konzolu</translation> </message> <message> - <source>&Disconnect Node</source> - <translation>&Odpojené uzly</translation> - </message> - <message> - <source>Ban Node for</source> - <translation>Blokovať uzol na</translation> - </message> - <message> <source>1 &hour</source> <translation>1 &hodinu</translation> </message> @@ -1135,8 +1214,8 @@ <translation>1 &rok</translation> </message> <message> - <source>&Unban Node</source> - <translation>&odblokovať uzol</translation> + <source>Welcome to the %1 RPC console.</source> + <translation>Vitajte v %1 RPC konzole</translation> </message> <message> <source>Use up and down arrows to navigate history, and <b>Ctrl-L</b> to clear screen.</source> @@ -1265,7 +1344,7 @@ <source>Remove</source> <translation>Odstrániť</translation> </message> -</context> + </context> <context> <name>ReceiveRequestDialog</name> <message> @@ -1284,7 +1363,14 @@ <source>&Save Image...</source> <translation>Uložiť obrázok...</translation> </message> -</context> + </context> +<context> + <name>RecentRequestsTableModel</name> + <message> + <source>(no label)</source> + <translation>(bez popisu)</translation> + </message> + </context> <context> <name>SendCoinsDialog</name> <message> @@ -1320,10 +1406,6 @@ <translation>Suma:</translation> </message> <message> - <source>Priority:</source> - <translation>Priorita:</translation> - </message> - <message> <source>Fee:</source> <translation>Poplatok:</translation> </message> @@ -1392,10 +1474,6 @@ <translation>(Automatický poplatok ešte nebol aktivovaný. Toto zvyčajne trvá niekoľko blokov...)</translation> </message> <message> - <source>Confirmation time:</source> - <translation>Čas potvrdenia:</translation> - </message> - <message> <source>normal</source> <translation>normálne</translation> </message> @@ -1435,6 +1513,14 @@ <source>S&end</source> <translation>&Odoslať</translation> </message> + <message> + <source>or</source> + <translation>alebo</translation> + </message> + <message> + <source>(no label)</source> + <translation>(bez popisu)</translation> + </message> </context> <context> <name>SendCoinsEntry</name> @@ -1514,10 +1600,17 @@ <source>Memo:</source> <translation>Poznámka:</translation> </message> -</context> + </context> +<context> + <name>SendConfirmationDialog</name> + </context> <context> <name>ShutdownWindow</name> <message> + <source>%1 is shutting down...</source> + <translation>%1 sa vypína...</translation> + </message> + <message> <source>Do not shut down the computer until this window disappears.</source> <translation>Nevypínajte počítač kým toto okno nezmizne.</translation> </message> @@ -1600,7 +1693,7 @@ <source>Reset all verify message fields</source> <translation>Obnoviť všetky polia v overiť správu</translation> </message> -</context> + </context> <context> <name>SplashScreen</name> <message> @@ -1616,12 +1709,25 @@ </message> </context> <context> + <name>TransactionDesc</name> + </context> +<context> <name>TransactionDescDialog</name> <message> <source>This pane shows a detailed description of the transaction</source> <translation>Táto časť obrazovky zobrazuje detailný popis transakcie</translation> </message> -</context> + </context> +<context> + <name>TransactionTableModel</name> + <message> + <source>(no label)</source> + <translation>(bez popisu)</translation> + </message> + </context> +<context> + <name>TransactionView</name> + </context> <context> <name>UnitDisplayStatusBarControl</name> <message> @@ -1630,6 +1736,15 @@ </message> </context> <context> + <name>WalletFrame</name> + </context> +<context> + <name>WalletModel</name> + </context> +<context> + <name>WalletView</name> + </context> +<context> <name>bitcoin-core</name> <message> <source>Options:</source> @@ -1652,6 +1767,14 @@ <translation>Prijímať príkazy z príkazového riadku a JSON-RPC</translation> </message> <message> + <source>If <category> is not supplied or if <category> = 1, output all debugging information.</source> + <translation>Pokiaľ <category> nie je nastavená, alebo <category> = 1, vypíš všetky informácie pre ladenie.</translation> + </message> + <message> + <source>Prune configured below the minimum of %d MiB. Please use a higher number.</source> + <translation>Redukcia nastavená pod minimálnu hodnotu %d MiB. Prosím použite vyššiu hodnotu.</translation> + </message> + <message> <source>Error: A fatal internal error occurred, see debug.log for details</source> <translation>Chyba: Vyskytla sa interná chyba, pre viac informácií zobrazte debug.log</translation> </message> @@ -1672,50 +1795,52 @@ <translation>Nepodarilo sa spustiť HTTP server. Pre viac detailov zobrazte debug log.</translation> </message> <message> - <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> - <translation>Prijať spojenia zvonku (predvolené: 1 ak žiadne -proxy alebo -connect)</translation> - </message> - <message> <source>Bitcoin Core</source> <translation>Jadro Bitcoin</translation> </message> <message> + <source>The %s developers</source> + <translation>Vývojári %s</translation> + </message> + <message> <source>Bind to given address and always listen on it. Use [host]:port notation for IPv6</source> <translation>Spojiť s danou adresou a vždy na nej počúvať. Použite zápis [host]:port pre IPv6</translation> </message> <message> + <source>Cannot obtain a lock on data directory %s. %s is probably already running.</source> + <translation>Nemožné uzamknúť zložku %s. %s pravdepodobne už beží.</translation> + </message> + <message> <source>Delete all wallet transactions and only recover those parts of the blockchain through -rescan on startup</source> <translation>Vymazať všetky transakcie z peňaženky a pri spustení znova získať z reťazca blokov iba tie získané pomocou -rescan</translation> </message> <message> - <source>Distributed under the MIT software license, see the accompanying file COPYING or <http://www.opensource.org/licenses/mit-license.php>.</source> - <translation>Distribuované pod softvérovou licenciou MIT, viď sprievodný súbor COPYING alebo <http://www.opensource.org/licenses/mit-license.php>.</translation> + <source>Error loading %s: You can't enable HD on a already existing non-HD wallet</source> + <translation>Chyba počas načítavania %s: Nemôžete povoliť HD na už existujúcej non-HD peaženke</translation> </message> <message> <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source> <translation>Vykonaj príkaz keď sa zmení transakcia peňaženky (%s v príkaze je nahradená TxID)</translation> </message> <message> - <source>Set the number of script verification threads (%u to %d, 0 = auto, <0 = leave that many cores free, default: %d)</source> - <translation>Nastaviť počeť vlákien overujúcich skripty (%u až %d, 0 = auto, <0 = nechať toľkoto jadier voľných, prednastavené: %d)</translation> + <source>Please check that your computer's date and time are correct! If your clock is wrong, %s will not work properly.</source> + <translation>Prosím skontrolujte systémový čas a dátum. Keď je váš čas nesprávny, %s nebude fungovať správne.</translation> </message> <message> - <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source> - <translation>Toto je pred-testovacia verzia - použitie je na vlastné riziko - nepoužívajte na tvorbu bitcoin ani obchodovanie.</translation> + <source>Please contribute if you find %s useful. Visit %s for further information about the software.</source> + <translation>Keď si myslíte, že %s je užitočný, podporte nás. Pre viac informácií o software navštívte %s.</translation> </message> <message> - <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source> - <translation>Varovanie: Javí sa že sieť sieť úplne nesúhlasí! Niektorí mineri zjavne majú ťažkosti. - -The network does not appear to fully agree! Some miners appear to be experiencing issues.</translation> + <source>Set the number of script verification threads (%u to %d, 0 = auto, <0 = leave that many cores free, default: %d)</source> + <translation>Nastaviť počeť vlákien overujúcich skripty (%u až %d, 0 = auto, <0 = nechať toľkoto jadier voľných, prednastavené: %d)</translation> </message> <message> - <source>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</source> - <translation>Varovanie: Zjavne sa úplne nezhodujeme s našimi peer-mi! Možno potrebujete prejsť na novšiu verziu alebo ostatné uzly potrebujú vyššiu verziu.</translation> + <source>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</source> + <translation>Databáza blokov obsahuje blok, ktorý vyzerá byť z budúcnosti. Toto môže byť spôsobené nesprávnym systémovým časom vášho počítača. Obnovujte databázu blokov len keď ste si istý, že systémový čas je nastavený správne.</translation> </message> <message> - <source>Whitelist peers connecting from the given netmask or IP address. Can be specified multiple times.</source> - <translation>Uzle na zoznam povolených, ktoré sa pripájajú z danej netmask alebo IP adresy. Môže byť zadané viac krát.</translation> + <source>%s corrupt, salvage failed</source> + <translation>%s je poškodený, záchrana zlyhala</translation> </message> <message> <source>-maxmempool must be at least %d MB</source> @@ -1730,14 +1855,18 @@ The network does not appear to fully agree! Some miners appear to be experiencin <translation>Voľby vytvorenia bloku:</translation> </message> <message> - <source>Connect only to the specified node(s)</source> - <translation>Pripojiť sa len k určenej nóde</translation> + <source>Change index out of range</source> + <translation>Menný index mimo rozsah</translation> </message> <message> <source>Connection options:</source> <translation>Možnosti pripojenia:</translation> </message> <message> + <source>Copyright (C) %i-%i</source> + <translation>Copyright (C) %i-%i</translation> + </message> + <message> <source>Corrupted block database detected</source> <translation>Zistená poškodená databáza blokov</translation> </message> @@ -1766,6 +1895,10 @@ The network does not appear to fully agree! Some miners appear to be experiencin <translation>Povoliť zverejnenie raw bloku pre <address></translation> </message> <message> + <source>Enable publish raw transaction in <address></source> + <translation>Povoliť publikovať hrubý prevod v <address></translation> + </message> + <message> <source>Error initializing block database</source> <translation>Chyba inicializácie databázy blokov</translation> </message> @@ -1810,6 +1943,10 @@ The network does not appear to fully agree! Some miners appear to be experiencin <translation>Nesprávny alebo žiadny genesis blok nájdený. Nesprávny dátový priečinok alebo sieť?</translation> </message> <message> + <source>Initialization sanity check failed. %s is shutting down.</source> + <translation>Kontrola čistoty pri inicializácií zlyhala. %s sa vypína.</translation> + </message> + <message> <source>Invalid -onion address: '%s'</source> <translation>Neplatná -onion adresa: '%s'</translation> </message> @@ -1826,6 +1963,10 @@ The network does not appear to fully agree! Some miners appear to be experiencin <translation>Načítavam banlist...</translation> </message> <message> + <source>Location of the auth cookie (default: data dir)</source> + <translation>Poloha overovacieho cookie súboru (predvolená: zložka s dátami)</translation> + </message> + <message> <source>Not enough file descriptors available.</source> <translation>Nedostatok kľúčových slov súboru.</translation> </message> @@ -1834,6 +1975,14 @@ The network does not appear to fully agree! Some miners appear to be experiencin <translation>Pripojiť iba k uzlom v sieti <net> (ipv4, ipv6, alebo onion)</translation> </message> <message> + <source>Print this help message and exit</source> + <translation>Vytlačiť túto pomocnú správu a ukončiť</translation> + </message> + <message> + <source>Print version and exit</source> + <translation>Vytlačiť verziu a ukončiť</translation> + </message> + <message> <source>Prune cannot be configured with a negative value.</source> <translation>Redukovanie nemôže byť nastavené na zápornú hodnotu.</translation> </message> @@ -1842,6 +1991,14 @@ The network does not appear to fully agree! Some miners appear to be experiencin <translation>Redukovanie je nekompatibilné s -txindex.</translation> </message> <message> + <source>Rebuild chain state and block index from the blk*.dat files on disk</source> + <translation>Obnoviť stav reťazca a index blokov zo súborov blk*.dat na disku.</translation> + </message> + <message> + <source>Rebuild chain state from the currently indexed blocks</source> + <translation>Obnoviť stav reťazca z aktuálne indexovaných blokov.</translation> + </message> + <message> <source>Set database cache size in megabytes (%d to %d, default: %d)</source> <translation>Nastaviť veľkosť pomocnej pamäti databázy v megabajtoch (%d do %d, prednastavené: %d)</translation> </message> @@ -1854,6 +2011,14 @@ The network does not appear to fully agree! Some miners appear to be experiencin <translation>Označ súbor peňaženky (v priečinku s dátami)</translation> </message> <message> + <source>The source code is available from %s.</source> + <translation>Zdrojový kód je dostupný z %s</translation> + </message> + <message> + <source>Unable to bind to %s on this computer. %s is probably already running.</source> + <translation>Nemožné pripojiť k %s na tomto počíťači. %s už pravdepodobne beží.</translation> + </message> + <message> <source>Unsupported argument -benchmark ignored, use -debug=bench.</source> <translation>Nepodporovaný parameter -benchmark bol ignorovaný, použite -debug=bench.</translation> </message> @@ -1882,6 +2047,14 @@ The network does not appear to fully agree! Some miners appear to be experiencin <translation>Peňaženka %s sa nachádza mimo dátového priečinka %s </translation> </message> <message> + <source>Wallet debugging/testing options:</source> + <translation>Ladiace / testovacie možnosti peňaženky.</translation> + </message> + <message> + <source>Wallet needed to be rewritten: restart %s to complete</source> + <translation>Peňaženka musí byť prepísaná: pre dokončenie reštartujte %s</translation> + </message> + <message> <source>Wallet options:</source> <translation>Voľby peňaženky:</translation> </message> @@ -1926,10 +2099,6 @@ The network does not appear to fully agree! Some miners appear to be experiencin <translation>Maximálna veľkosť dát v transakciách nosných dát, ktoré prenášame a ťažíme (predvolené: %u)</translation> </message> <message> - <source>Query for peer addresses via DNS lookup, if low on addresses (default: 1 unless -connect)</source> - <translation>Dotaz na partnerské adresy pomocou vyhľadávania DNS v prípade nedostatku adries (predvolené: 1, pokiaľ -connect)</translation> - </message> - <message> <source>Set maximum size of high-priority/low-fee transactions in bytes (default: %d)</source> <translation>Nastaviť najväčšiu veľkosť vysoká-dôležitosť/nízke-poplatky transakcií v bajtoch (prednastavené: %d)</translation> </message> @@ -1938,10 +2107,6 @@ The network does not appear to fully agree! Some miners appear to be experiencin <translation>Suma je príliš malá pre odoslanie tranzakcie</translation> </message> <message> - <source>This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit <https://www.openssl.org/> and cryptographic software written by Eric Young and UPnP software written by Thomas Bernard.</source> - <translation>Tento produkt obsahuje softvér vyvinutý projektom OpenSSL pre použitie sady nástrojov OpenSSL <https://www.openssl.org/> a kryptografického softvéru napísaného Eric Young a UPnP softvér napísaný Thomas Bernard.</translation> - </message> - <message> <source>Whitelisted peers cannot be DoS banned and their transactions are always relayed, even if they are already in the mempool, useful e.g. for a gateway</source> <translation>Uzle na zoznam povolených nemôžu byť DoS zakázané a ich transakcie vždy postúpené ďalej, aj v prípade, ak sú už pamäťovej fronte. Užitočné napr. pre brány</translation> </message> @@ -1998,6 +2163,10 @@ The network does not appear to fully agree! Some miners appear to be experiencin <translation>Možnosti servra RPC:</translation> </message> <message> + <source>Rescan the block chain for missing wallet transactions on startup</source> + <translation>Pri spustení skontrolovať reťaz blokov pre chýbajúce transakcie peňaženky</translation> + </message> + <message> <source>Send trace/debug info to console instead of debug.log file</source> <translation>Odoslať trace/debug informácie na konzolu namiesto debug.info žurnálu</translation> </message> @@ -2034,10 +2203,6 @@ The network does not appear to fully agree! Some miners appear to be experiencin <translation>Suma transakcie príliš malá</translation> </message> <message> - <source>Transaction amounts must be positive</source> - <translation>Hodnoty transakcie musia byť väčšie ako nula (pozitívne)</translation> - </message> - <message> <source>Transaction too large for fee policy</source> <translation>Transakcia je príliš veľká pre aktuálne podmienky poplatkov</translation> </message> @@ -2066,6 +2231,10 @@ The network does not appear to fully agree! Some miners appear to be experiencin <translation>Zmazať všetky transakcie z peňaženky...</translation> </message> <message> + <source>ZeroMQ notification options:</source> + <translation>Možnosti pripojenia ZeroMQ:</translation> + </message> + <message> <source>Password for JSON-RPC connections</source> <translation>Heslo pre JSON-rPC spojenia</translation> </message> @@ -2102,10 +2271,34 @@ The network does not appear to fully agree! Some miners appear to be experiencin <translation>Výstupné ladiace informácie (predvolené: %u, dodanie <category> je voliteľné)</translation> </message> <message> + <source>Total length of network version string (%i) exceeds maximum length (%i). Reduce the number or size of uacomments.</source> + <translation>Celková dĺžka verzie sieťového reťazca (%i) prekračuje maximálnu dĺžku (%i). Znížte počet a veľkosť komentárov.</translation> + </message> + <message> + <source>Tries to keep outbound traffic under the given target (in MiB per 24h), 0 = no limit (default: %d)</source> + <translation>Sa snaží držať odchádzajúce prevádzku v rámci daného cieľa (v MB za 24h), 0 = žiadny limit (predvolený: %d)</translation> + </message> + <message> + <source>Unsupported argument -socks found. Setting SOCKS version isn't possible anymore, only SOCKS5 proxies are supported.</source> + <translation>Nepodporovaný argument -socks nájdený. Nastavenie SOCKS verzie už nie je viac moźné, iba SOCKS5 proxies sú podporované.</translation> + </message> + <message> + <source>Unsupported argument -whitelistalwaysrelay ignored, use -whitelistrelay and/or -whitelistforcerelay.</source> + <translation>Nepodporovaný argument -whitelistalwaysrelay ignorovaný, použite -whitelistrelay a/alebo -whitelistforcerelay.</translation> + </message> + <message> <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: %s)</source> <translation>Použiť samostatný SOCKS5 proxy server na dosiahnutie počítačov cez skryté služby Tor (predvolené: %s)</translation> </message> <message> + <source>Warning: Unknown block versions being mined! It's possible unknown rules are in effect</source> + <translation>Varovanie: Neznáma verzia blokov sa doluje! Je možné, že neznáme pravidlá majú efekt</translation> + </message> + <message> + <source>Warning: Wallet file corrupt, data salvaged! Original %s saved as %s in %s; if your balance or transactions are incorrect you should restore from a backup.</source> + <translation>Varovanie: Peňaženka poškodená, dáta boli zachránené! Originálna %s ako %s v %s; ak váš zostatok alebo transakcie sú nesprávne, mali by ste obnoviť zálohu.</translation> + </message> + <message> <source>(default: %s)</source> <translation>(predvolené: %s)</translation> </message> @@ -2162,10 +2355,6 @@ The network does not appear to fully agree! Some miners appear to be experiencin <translation>Nastaviť veľkosť kľúča fronty na <n> (predvolené: %u)</translation> </message> <message> - <source>Set minimum block size in bytes (default: %u)</source> - <translation>Nastaviť minimálnu veľkosť bloku v bajtoch (predvolené: %u)</translation> - </message> - <message> <source>Set the number of threads to service RPC calls (default: %d)</source> <translation>Nastaviť počet vlákien na obsluhu RPC volaní (predvolené: %d)</translation> </message> diff --git a/src/qt/locale/bitcoin_sl_SI.ts b/src/qt/locale/bitcoin_sl_SI.ts index 16ef20ea3a..8a21f978ef 100644 --- a/src/qt/locale/bitcoin_sl_SI.ts +++ b/src/qt/locale/bitcoin_sl_SI.ts @@ -41,7 +41,10 @@ <source>&Delete</source> <translation>I&zbriši</translation> </message> -</context> + </context> +<context> + <name>AddressTableModel</name> + </context> <context> <name>AskPassphraseDialog</name> <message> @@ -60,10 +63,18 @@ <source>Repeat new passphrase</source> <translation>Ponovite novo geslo</translation> </message> -</context> + </context> <context> <name>BanTableModel</name> - </context> + <message> + <source>IP/Netmask</source> + <translation>IP/Netmaska</translation> + </message> + <message> + <source>Banned Until</source> + <translation>Prepoved do</translation> + </message> +</context> <context> <name>BitcoinGUI</name> <message> @@ -243,32 +254,16 @@ <translation><numerusform>%n aktivna povezava v omrežje Bitcoin</numerusform><numerusform>%n aktivni povezavi v omrežje Bitcoin</numerusform><numerusform>%n aktivne povezave v omrežje Bitcoin</numerusform><numerusform>%n aktivnih povezav v omrežje Bitcoin</numerusform></translation> </message> <message> - <source>No block source available...</source> - <translation>Ni virov za prenos blokov ...</translation> - </message> - <message numerus="yes"> - <source>Processed %n block(s) of transaction history.</source> - <translation><numerusform>%n obdelan blok zgodovine transakcij.</numerusform><numerusform>%n obdelana bloka zgodovine transakcij.</numerusform><numerusform>%n obdelani bloki zgodovine transakcij.</numerusform><numerusform>%n obdelanih blokov zgodovine transakcij.</numerusform></translation> - </message> - <message numerus="yes"> - <source>%n hour(s)</source> - <translation><numerusform>%n uro</numerusform><numerusform>%n uri</numerusform><numerusform>%n ure</numerusform><numerusform>%n ur</numerusform></translation> - </message> - <message numerus="yes"> - <source>%n day(s)</source> - <translation><numerusform>%n dan</numerusform><numerusform>%n dneva</numerusform><numerusform>%n dni</numerusform><numerusform>%n dni</numerusform></translation> - </message> - <message numerus="yes"> - <source>%n week(s)</source> - <translation><numerusform>%n teden</numerusform><numerusform>%n tedna</numerusform><numerusform>%n tedne</numerusform><numerusform>%n tednov</numerusform></translation> + <source>Indexing blocks on disk...</source> + <translation>Indeksirani bloki na disku ...</translation> </message> <message> - <source>%1 and %2</source> - <translation>%1 in %2</translation> + <source>Processing blocks on disk...</source> + <translation>Obdelava blokov na disku ...</translation> </message> <message numerus="yes"> - <source>%n year(s)</source> - <translation><numerusform>%n leto</numerusform><numerusform>%n leti</numerusform><numerusform>%n leta</numerusform><numerusform>%n let</numerusform></translation> + <source>Processed %n block(s) of transaction history.</source> + <translation><numerusform>%n obdelan blok zgodovine transakcij.</numerusform><numerusform>%n obdelana bloka zgodovine transakcij.</numerusform><numerusform>%n obdelani bloki zgodovine transakcij.</numerusform><numerusform>%n obdelanih blokov zgodovine transakcij.</numerusform></translation> </message> <message> <source>%1 behind</source> @@ -299,6 +294,10 @@ <translation>Posodobljeno</translation> </message> <message> + <source>%1 client</source> + <translation>%1 odjemalec</translation> + </message> + <message> <source>Catching up...</source> <translation>Dohitevam omrežje ...</translation> </message> @@ -348,7 +347,7 @@ <source>Wallet is <b>encrypted</b> and currently <b>locked</b></source> <translation>Denarnica je <b>šifrirana</b> in trenutno <b>zaklenjena</b></translation> </message> -</context> + </context> <context> <name>CoinControlDialog</name> <message> @@ -368,10 +367,6 @@ <translation>Znesek:</translation> </message> <message> - <source>Priority:</source> - <translation>Prioriteta:</translation> - </message> - <message> <source>Fee:</source> <translation>Provizija:</translation> </message> @@ -423,11 +418,7 @@ <source>Confirmed</source> <translation>Potrjeno</translation> </message> - <message> - <source>Priority</source> - <translation>Prioriteta</translation> - </message> -</context> + </context> <context> <name>EditAddressDialog</name> <message> @@ -450,7 +441,7 @@ <source>&Address</source> <translation>&Naslov</translation> </message> -</context> + </context> <context> <name>FreespaceChecker</name> <message> @@ -485,6 +476,10 @@ <translation>(%1-bit)</translation> </message> <message> + <source>About %1</source> + <translation>O %1</translation> + </message> + <message> <source>Command-line options</source> <translation>Možnosti ukazne vrstice</translation> </message> @@ -496,6 +491,18 @@ <source>command-line options</source> <translation>možnosti ukazne vrstice</translation> </message> + <message> + <source>UI Options:</source> + <translation>UI možnosti:</translation> + </message> + <message> + <source>Set language, for example "de_DE" (default: system locale)</source> + <translation>Nastavi jezik, na primer "sl_SI" (privzeto: sistemsko)</translation> + </message> + <message> + <source>Start minimized</source> + <translation>Začni minimizirano</translation> + </message> </context> <context> <name>Intro</name> @@ -504,6 +511,10 @@ <translation>Dobrodošli</translation> </message> <message> + <source>Welcome to %1.</source> + <translation>Dobrodošli v %1</translation> + </message> + <message> <source>Use the default data directory</source> <translation>Uporabi privzeto podatkovno mapo</translation> </message> @@ -529,6 +540,21 @@ </message> </context> <context> + <name>ModalOverlay</name> + <message> + <source>Form</source> + <translation>Oblika</translation> + </message> + <message> + <source>Last block time</source> + <translation>Čas zadnjega bloka</translation> + </message> + <message> + <source>Hide</source> + <translation>Skrij</translation> + </message> + </context> +<context> <name>OpenURIDialog</name> <message> <source>Open URI</source> @@ -546,7 +572,7 @@ <source>Select payment request file</source> <translation>Izbiranje datoteke z zahtevkom za plačilo</translation> </message> -</context> + </context> <context> <name>OptionsDialog</name> <message> @@ -814,6 +840,9 @@ </message> </context> <context> + <name>PaymentServer</name> + </context> +<context> <name>PeerTableModel</name> <message> <source>User Agent</source> @@ -823,11 +852,7 @@ <source>Node/Service</source> <translation>Naslov</translation> </message> - <message> - <source>Ping Time</source> - <translation>Odzivni čas</translation> - </message> -</context> + </context> <context> <name>QObject</name> <message> @@ -866,7 +891,17 @@ <source>%1 ms</source> <translation>%1 ms</translation> </message> -</context> + <message> + <source>%1 and %2</source> + <translation>%1 in %2</translation> + </message> + </context> +<context> + <name>QObject::QObject</name> + </context> +<context> + <name>QRImageWidget</name> + </context> <context> <name>RPCConsole</name> <message> @@ -1136,7 +1171,7 @@ <source>Remove</source> <translation>Odstrani</translation> </message> -</context> + </context> <context> <name>ReceiveRequestDialog</name> <message> @@ -1155,7 +1190,10 @@ <source>&Save Image...</source> <translation>&Shrani sliko ...</translation> </message> -</context> + </context> +<context> + <name>RecentRequestsTableModel</name> + </context> <context> <name>SendCoinsDialog</name> <message> @@ -1191,10 +1229,6 @@ <translation>Znesek:</translation> </message> <message> - <source>Priority:</source> - <translation>Prioriteta:</translation> - </message> - <message> <source>Fee:</source> <translation>Provizija:</translation> </message> @@ -1263,10 +1297,6 @@ <translation>(Samodejni obračun provizije še ni pripravljen. Po navadi izračun traja nekaj blokov ...)</translation> </message> <message> - <source>Confirmation time:</source> - <translation>Čas do potrditve:</translation> - </message> - <message> <source>normal</source> <translation>navadno</translation> </message> @@ -1306,7 +1336,7 @@ <source>S&end</source> <translation>&Pošlji</translation> </message> -</context> + </context> <context> <name>SendCoinsEntry</name> <message> @@ -1385,7 +1415,10 @@ <source>Memo:</source> <translation>Opomba:</translation> </message> -</context> + </context> +<context> + <name>SendConfirmationDialog</name> + </context> <context> <name>ShutdownWindow</name> <message> @@ -1479,7 +1512,7 @@ <source>Reset all verify message fields</source> <translation>Počisti vsa polja za vnos v oknu za preverjanje</translation> </message> -</context> + </context> <context> <name>SplashScreen</name> <message> @@ -1495,12 +1528,21 @@ </message> </context> <context> + <name>TransactionDesc</name> + </context> +<context> <name>TransactionDescDialog</name> <message> <source>This pane shows a detailed description of the transaction</source> <translation>V tem podoknu so prikazane podrobnosti o transakciji</translation> </message> -</context> + </context> +<context> + <name>TransactionTableModel</name> + </context> +<context> + <name>TransactionView</name> + </context> <context> <name>UnitDisplayStatusBarControl</name> <message> @@ -1509,6 +1551,19 @@ </message> </context> <context> + <name>WalletFrame</name> + </context> +<context> + <name>WalletModel</name> + </context> +<context> + <name>WalletView</name> + <message> + <source>Export the data in the current tab to a file</source> + <translation>Izvozi podatke v trenutnem zavihku v datoteko</translation> + </message> + </context> +<context> <name>bitcoin-core</name> <message> <source>Options:</source> @@ -1535,10 +1590,6 @@ <translation>Teci v ozadju in sprejemaj ukaze</translation> </message> <message> - <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> - <translation>Sprejemaj zunanje povezave (privzeto: 1, razen če ste vklopili opciji -proxy ali -connect)</translation> - </message> - <message> <source>Bitcoin Core</source> <translation>Bitcoin Core</translation> </message> @@ -1547,10 +1598,6 @@ <translation>Veži dani naslov in tam vedno poslušaj. Za naslove protokola IPv6 uporabite zapis [gostitelj]:vrata.</translation> </message> <message> - <source>Distributed under the MIT software license, see the accompanying file COPYING or <http://www.opensource.org/licenses/mit-license.php>.</source> - <translation>Distribuirano v okviru programske licence MIT. Podrobnosti so navedene v priloženi datoteki COPYING ali na naslovu <http://www.opensource.org/licenses/mit-license.php>.</translation> - </message> - <message> <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source> <translation>Izvedi ukaz, ko bo transakcija denarnice se spremenila (V cmd je bil TxID zamenjan za %s)</translation> </message> @@ -1559,22 +1606,6 @@ <translation>Nastavi število niti za preverjanje skript (%u do %d, 0 = samodejno, <0 toliko procesorskih jeder naj ostane prostih, privzeto: %d)</translation> </message> <message> - <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source> - <translation>To je preizkusna različica še neizdanega programa. Uporabljate jo na lastno odgovornost. Programa ne uporabljajte je za rudarjenje ali trgovske aplikacije.</translation> - </message> - <message> - <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source> - <translation>Opozorilo: Trenutno na omrežju ni videti konsenza! Videti je, kot da bi imeli nekateri rudarji težave.</translation> - </message> - <message> - <source>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</source> - <translation>Opozorilo: Trenutno se s soležniki ne strinjam v popolnosti! Mogoče bi morali vi ali drugi udeleženci posodobiti odjemalce.</translation> - </message> - <message> - <source>Whitelist peers connecting from the given netmask or IP address. Can be specified multiple times.</source> - <translation>Sprejemaj povezave samo od soležnikov, ki so na naslovih, ki ustrezajo navedeni omrežni maski ali naslovu. Opcijo lahko navedete večkrat.</translation> - </message> - <message> <source><category> can be:</source> <translation><category> je lahko:</translation> </message> @@ -1583,10 +1614,6 @@ <translation>Možnosti ustvarjanja blokov:</translation> </message> <message> - <source>Connect only to the specified node(s)</source> - <translation>Poveži se samo z (enim ali več) navedenimi vozlišči</translation> - </message> - <message> <source>Connection options:</source> <translation>Izbire povezave:</translation> </message> @@ -1763,10 +1790,6 @@ <translation>Znesek je pramajhen</translation> </message> <message> - <source>Transaction amounts must be positive</source> - <translation>Znesek mora biti pozitiven</translation> - </message> - <message> <source>Transaction too large</source> <translation>Transkacija je prevelika</translation> </message> diff --git a/src/qt/locale/bitcoin_sq.ts b/src/qt/locale/bitcoin_sq.ts index 6c86b7d9fc..8baddf6912 100644 --- a/src/qt/locale/bitcoin_sq.ts +++ b/src/qt/locale/bitcoin_sq.ts @@ -33,6 +33,69 @@ <source>&Delete</source> <translation>&Fshi</translation> </message> + <message> + <source>Choose the address to send coins to</source> + <translation>Zgjidh adresen ku do te dergoni monedhat</translation> + </message> + <message> + <source>Sending addresses</source> + <translation>Duke derguar adresen</translation> + </message> + <message> + <source>Receiving addresses</source> + <translation>Duke marr adresen</translation> + </message> + <message> + <source>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source> + <translation>Këto janë Bitcoin adresat e juaja për të dërguar pagesa. Gjithmon kontrolloni shumën dhe adresën pranuese para se të dërgoni monedha.</translation> + </message> + <message> + <source>These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction.</source> + <translation>Këto janë Bitcoin adresat e juaja për të pranuar pagesa. Rekomandohet që gjithmon të përdorni një adresë të re për çdo transaksion.</translation> + </message> + <message> + <source>&Copy Address</source> + <translation>&Kopjo adresen</translation> + </message> + <message> + <source>Copy &Label</source> + <translation>Kopjo &Etiketë</translation> + </message> + <message> + <source>&Edit</source> + <translation>&Ndrysho</translation> + </message> + <message> + <source>Export Address List</source> + <translation>Eksporto listën e adresave</translation> + </message> + <message> + <source>Comma separated file (*.csv)</source> + <translation>Skedar i ndarë me pikëpresje(*.csv)</translation> + </message> + <message> + <source>Exporting Failed</source> + <translation>Eksportimi dështoj</translation> + </message> + <message> + <source>There was an error trying to save the address list to %1. Please try again.</source> + <translation>Gabim gjatë ruajtjes së listës së adresave në %1. Ju lutem provoni prapë.</translation> + </message> +</context> +<context> + <name>AddressTableModel</name> + <message> + <source>Label</source> + <translation>Etiketë</translation> + </message> + <message> + <source>Address</source> + <translation>Adresë</translation> + </message> + <message> + <source>(no label)</source> + <translation>(pa etiketë)</translation> + </message> </context> <context> <name>AskPassphraseDialog</name> @@ -48,7 +111,67 @@ <source>Repeat new passphrase</source> <translation>Përsërisni frazkalimin e ri</translation> </message> -</context> + <message> + <source>Encrypt wallet</source> + <translation>Kripto portofolin</translation> + </message> + <message> + <source>This operation needs your wallet passphrase to unlock the wallet.</source> + <translation>Ky veprim ka nevojë per frazkalimin e portofolit tuaj që të ç'kyç portofolin.</translation> + </message> + <message> + <source>Unlock wallet</source> + <translation>ç'kyç portofolin.</translation> + </message> + <message> + <source>This operation needs your wallet passphrase to decrypt the wallet.</source> + <translation>Ky veprim kërkon frazkalimin e portofolit tuaj që të dekriptoj portofolin.</translation> + </message> + <message> + <source>Decrypt wallet</source> + <translation>Dekripto portofolin</translation> + </message> + <message> + <source>Change passphrase</source> + <translation>Ndrysho frazkalimin</translation> + </message> + <message> + <source>Confirm wallet encryption</source> + <translation>Konfirmoni enkriptimin e portofolit</translation> + </message> + <message> + <source>Are you sure you wish to encrypt your wallet?</source> + <translation>Jeni te sigurt te enkriptoni portofolin tuaj?</translation> + </message> + <message> + <source>Wallet encrypted</source> + <translation>Portofoli u enkriptua</translation> + </message> + <message> + <source>Wallet encryption failed</source> + <translation>Enkriptimi i portofolit dështoi</translation> + </message> + <message> + <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source> + <translation>Enkriptimi i portofolit dështoi për shkak të një gabimi të brëndshëm. portofoli juaj nuk u enkriptua.</translation> + </message> + <message> + <source>The supplied passphrases do not match.</source> + <translation>Frazkalimet e plotësuara nuk përputhen.</translation> + </message> + <message> + <source>Wallet unlock failed</source> + <translation>ç'kyçja e portofolit dështoi</translation> + </message> + <message> + <source>The passphrase entered for the wallet decryption was incorrect.</source> + <translation>Frazkalimi i futur për dekriptimin e portofolit nuk ishte i saktë.</translation> + </message> + <message> + <source>Wallet decryption failed</source> + <translation>Dekriptimi i portofolit dështoi</translation> + </message> + </context> <context> <name>BanTableModel</name> </context> @@ -127,10 +250,6 @@ <translation>Shiriti i mjeteve</translation> </message> <message> - <source>%1 and %2</source> - <translation>%1 dhe %2</translation> - </message> - <message> <source>%1 behind</source> <translation>%1 Pas</translation> </message> @@ -166,7 +285,7 @@ <source>Wallet is <b>encrypted</b> and currently <b>locked</b></source> <translation>Portofoli po <b> enkriptohet</b> dhe është <b> i kyçur</b></translation> </message> -</context> + </context> <context> <name>CoinControlDialog</name> <message> @@ -185,6 +304,22 @@ <source>Date</source> <translation>Data</translation> </message> + <message> + <source>Copy address</source> + <translation>Kopjo adresën</translation> + </message> + <message> + <source>yes</source> + <translation>po</translation> + </message> + <message> + <source>no</source> + <translation>jo</translation> + </message> + <message> + <source>(no label)</source> + <translation>(pa etiketë)</translation> + </message> </context> <context> <name>EditAddressDialog</name> @@ -200,6 +335,34 @@ <source>&Address</source> <translation>&Adresa</translation> </message> + <message> + <source>New receiving address</source> + <translation>Adresë e re pritëse</translation> + </message> + <message> + <source>New sending address</source> + <translation>Adresë e re dërgimi</translation> + </message> + <message> + <source>Edit receiving address</source> + <translation>Ndrysho adresën pritëse</translation> + </message> + <message> + <source>Edit sending address</source> + <translation>ndrysho adresën dërguese</translation> + </message> + <message> + <source>The entered address "%1" is already in the address book.</source> + <translation>Adresa e dhënë "%1" është e zënë në librin e adresave. </translation> + </message> + <message> + <source>Could not unlock wallet.</source> + <translation>Nuk mund të ç'kyçet portofoli.</translation> + </message> + <message> + <source>New key generation failed.</source> + <translation>Krijimi i çelësit të ri dështoi.</translation> + </message> </context> <context> <name>FreespaceChecker</name> @@ -227,6 +390,13 @@ </message> </context> <context> + <name>ModalOverlay</name> + <message> + <source>Form</source> + <translation>Formilarë</translation> + </message> + </context> +<context> <name>OpenURIDialog</name> </context> <context> @@ -248,6 +418,9 @@ </message> </context> <context> + <name>PaymentServer</name> + </context> +<context> <name>PeerTableModel</name> </context> <context> @@ -256,6 +429,16 @@ <source>Amount</source> <translation>Sasia</translation> </message> + <message> + <source>%1 and %2</source> + <translation>%1 dhe %2</translation> + </message> + </context> +<context> + <name>QObject::QObject</name> + </context> +<context> + <name>QRImageWidget</name> </context> <context> <name>RPCConsole</name> @@ -301,6 +484,33 @@ <source>Copy &Address</source> <translation>&Kopjo adresen</translation> </message> + <message> + <source>Address</source> + <translation>Adresë</translation> + </message> + <message> + <source>Amount</source> + <translation>Sasia</translation> + </message> + <message> + <source>Label</source> + <translation>Etiketë</translation> + </message> + </context> +<context> + <name>RecentRequestsTableModel</name> + <message> + <source>Date</source> + <translation>Data</translation> + </message> + <message> + <source>Label</source> + <translation>Etiketë</translation> + </message> + <message> + <source>(no label)</source> + <translation>(pa etiketë)</translation> + </message> </context> <context> <name>SendCoinsDialog</name> @@ -328,7 +538,19 @@ <source>Confirm the send action</source> <translation>Konfirmo veprimin e dërgimit</translation> </message> - </context> + <message> + <source>Confirm send coins</source> + <translation>konfirmo dërgimin e monedhave</translation> + </message> + <message> + <source>The amount to pay must be larger than 0.</source> + <translation>Shuma e paguar duhet të jetë më e madhe se 0.</translation> + </message> + <message> + <source>(no label)</source> + <translation>(pa etiketë)</translation> + </message> +</context> <context> <name>SendCoinsEntry</name> <message> @@ -359,6 +581,13 @@ <source>Pay To:</source> <translation>Paguaj drejt:</translation> </message> + <message> + <source>Enter a label for this address to add it to your address book</source> + <translation>Krijoni një etiketë për këtë adresë që t'ja shtoni librit të adresave</translation> + </message> +</context> +<context> + <name>SendConfirmationDialog</name> </context> <context> <name>ShutdownWindow</name> @@ -389,16 +618,166 @@ <name>TrafficGraphWidget</name> </context> <context> + <name>TransactionDesc</name> + <message> + <source>Open until %1</source> + <translation>Hapur deri më %1</translation> + </message> + <message> + <source>%1/unconfirmed</source> + <translation>%1/I pakonfirmuar</translation> + </message> + <message> + <source>%1 confirmations</source> + <translation>%1 konfirmimet</translation> + </message> + <message> + <source>, has not been successfully broadcast yet</source> + <translation>, nuk është transmetuar me sukses deri tani</translation> + </message> + <message> + <source>Date</source> + <translation>Data</translation> + </message> + <message> + <source>unknown</source> + <translation>i/e panjohur</translation> + </message> + <message> + <source>Transaction</source> + <translation>transaksionit</translation> + </message> + <message> + <source>Amount</source> + <translation>Sasia</translation> + </message> + </context> +<context> <name>TransactionDescDialog</name> <message> <source>This pane shows a detailed description of the transaction</source> <translation>Ky panel tregon një përshkrim të detajuar të transaksionit</translation> </message> -</context> + </context> +<context> + <name>TransactionTableModel</name> + <message> + <source>Date</source> + <translation>Data</translation> + </message> + <message> + <source>Type</source> + <translation>Lloji</translation> + </message> + <message> + <source>Label</source> + <translation>Etiketë</translation> + </message> + <message> + <source>Open until %1</source> + <translation>Hapur deri më %1</translation> + </message> + <message> + <source>Confirmed (%1 confirmations)</source> + <translation>I/E konfirmuar(%1 konfirmime)</translation> + </message> + <message> + <source>This block was not received by any other nodes and will probably not be accepted!</source> + <translation>Ky bllok është marrë nga ndonjë nyje dhe ka shumë mundësi të mos pranohet! </translation> + </message> + <message> + <source>Generated but not accepted</source> + <translation>I krijuar por i papranuar</translation> + </message> + <message> + <source>Received with</source> + <translation>Marrë me</translation> + </message> + <message> + <source>Sent to</source> + <translation>Dërguar drejt</translation> + </message> + <message> + <source>Payment to yourself</source> + <translation>Pagesë ndaj vetvetes</translation> + </message> + <message> + <source>Mined</source> + <translation>Minuar</translation> + </message> + <message> + <source>(n/a)</source> + <translation>(p/a)</translation> + </message> + <message> + <source>(no label)</source> + <translation>(pa etiketë)</translation> + </message> + </context> +<context> + <name>TransactionView</name> + <message> + <source>Received with</source> + <translation>Marrë me</translation> + </message> + <message> + <source>Sent to</source> + <translation>Dërguar drejt</translation> + </message> + <message> + <source>Mined</source> + <translation>Minuar</translation> + </message> + <message> + <source>Copy address</source> + <translation>Kopjo adresën</translation> + </message> + <message> + <source>Comma separated file (*.csv)</source> + <translation>Skedar i ndarë me pikëpresje(*.csv)</translation> + </message> + <message> + <source>Date</source> + <translation>Data</translation> + </message> + <message> + <source>Type</source> + <translation>Lloji</translation> + </message> + <message> + <source>Label</source> + <translation>Etiketë</translation> + </message> + <message> + <source>Address</source> + <translation>Adresë</translation> + </message> + <message> + <source>Exporting Failed</source> + <translation>Eksportimi dështoj</translation> + </message> + </context> <context> <name>UnitDisplayStatusBarControl</name> </context> <context> + <name>WalletFrame</name> + </context> +<context> + <name>WalletModel</name> + <message> + <source>Send Coins</source> + <translation>Dërgo Monedha</translation> + </message> +</context> +<context> + <name>WalletView</name> + <message> + <source>Export the data in the current tab to a file</source> + <translation>Eksporto të dhënat e skedës korrente në një skedar</translation> + </message> + </context> +<context> <name>bitcoin-core</name> <message> <source>Options:</source> diff --git a/src/qt/locale/bitcoin_sr.ts b/src/qt/locale/bitcoin_sr.ts index 6b6f1af6f6..f880dd227e 100644 --- a/src/qt/locale/bitcoin_sr.ts +++ b/src/qt/locale/bitcoin_sr.ts @@ -2,6 +2,10 @@ <context> <name>AddressBookPage</name> <message> + <source>Right-click to edit address or label</source> + <translation>Kliknite desnim klikom radi izmene adrese ili oznake</translation> + </message> + <message> <source>Create a new address</source> <translation>Napravite novu adresu</translation> </message> @@ -18,14 +22,41 @@ <translation>Kopirajte</translation> </message> <message> + <source>C&lose</source> + <translation>Zatvorite</translation> + </message> + <message> <source>Delete the currently selected address from the list</source> <translation>Izbrisite trenutno izabranu adresu sa liste</translation> </message> <message> + <source>Export the data in the current tab to a file</source> + <translation>Eksportuj podatke iz izabrane kartice u fajl</translation> + </message> + <message> <source>&Delete</source> <translation>&Избриши</translation> </message> -</context> + <message> + <source>Choose the address to send coins to</source> + <translation>Izbirajte adresu za slanje</translation> + </message> + <message> + <source>Choose the address to receive coins with</source> + <translation>Izbirajte adresu za primanje</translation> + </message> + <message> + <source>Sending addresses</source> + <translation>Adresa za slanje</translation> + </message> + <message> + <source>Receiving addresses</source> + <translation>Adresa za primanje</translation> + </message> + </context> +<context> + <name>AddressTableModel</name> + </context> <context> <name>AskPassphraseDialog</name> <message> @@ -40,7 +71,7 @@ <source>Repeat new passphrase</source> <translation>Поновите нову лозинку</translation> </message> -</context> + </context> <context> <name>BanTableModel</name> </context> @@ -131,6 +162,10 @@ <translation>Трака са картицама</translation> </message> <message> + <source>Error</source> + <translation>Greška</translation> + </message> + <message> <source>Up to date</source> <translation>Ажурно</translation> </message> @@ -154,7 +189,7 @@ <source>Wallet is <b>encrypted</b> and currently <b>locked</b></source> <translation>Новчаник јс <b>шифрован</b> и тренутно <b>закључан</b></translation> </message> -</context> + </context> <context> <name>CoinControlDialog</name> <message> @@ -188,7 +223,7 @@ <source>&Address</source> <translation>&Адреса</translation> </message> -</context> + </context> <context> <name>FreespaceChecker</name> </context> @@ -205,6 +240,17 @@ </context> <context> <name>Intro</name> + <message> + <source>Error</source> + <translation>Greška</translation> + </message> + </context> +<context> + <name>ModalOverlay</name> + <message> + <source>Form</source> + <translation>Форма</translation> + </message> </context> <context> <name>OpenURIDialog</name> @@ -236,6 +282,9 @@ </message> </context> <context> + <name>PaymentServer</name> + </context> +<context> <name>PeerTableModel</name> </context> <context> @@ -246,7 +295,21 @@ </message> </context> <context> + <name>QObject::QObject</name> + </context> +<context> + <name>QRImageWidget</name> + </context> +<context> <name>RPCConsole</name> + <message> + <source>Yes</source> + <translation>Da</translation> + </message> + <message> + <source>No</source> + <translation>Ne</translation> + </message> </context> <context> <name>ReceiveCoinsDialog</name> @@ -262,6 +325,10 @@ <source>&Message:</source> <translation>Poruka:</translation> </message> + <message> + <source>Show</source> + <translation>Prikaži</translation> + </message> </context> <context> <name>ReceiveRequestDialog</name> @@ -271,6 +338,9 @@ </message> </context> <context> + <name>RecentRequestsTableModel</name> + </context> +<context> <name>SendCoinsDialog</name> <message> <source>Send Coins</source> @@ -288,7 +358,7 @@ <source>S&end</source> <translation>&Пошаљи</translation> </message> -</context> + </context> <context> <name>SendCoinsEntry</name> <message> @@ -313,6 +383,13 @@ </message> </context> <context> + <name>SendConfirmationDialog</name> + <message> + <source>Yes</source> + <translation>Da</translation> + </message> +</context> +<context> <name>ShutdownWindow</name> </context> <context> @@ -337,16 +414,34 @@ <name>TrafficGraphWidget</name> </context> <context> + <name>TransactionDesc</name> + </context> +<context> <name>TransactionDescDialog</name> <message> <source>This pane shows a detailed description of the transaction</source> <translation>Ovaj odeljak pokazuje detaljan opis transakcije</translation> </message> -</context> + </context> +<context> + <name>TransactionTableModel</name> + </context> +<context> + <name>TransactionView</name> + </context> <context> <name>UnitDisplayStatusBarControl</name> </context> <context> + <name>WalletFrame</name> + </context> +<context> + <name>WalletModel</name> + </context> +<context> + <name>WalletView</name> + </context> +<context> <name>bitcoin-core</name> <message> <source>Options:</source> @@ -377,6 +472,10 @@ <translation>učitavam adrese....</translation> </message> <message> + <source>Insufficient funds</source> + <translation>Nedovoljno sredstava</translation> + </message> + <message> <source>Loading block index...</source> <translation>Učitavam blok indeksa...</translation> </message> @@ -392,5 +491,9 @@ <source>Done loading</source> <translation>Završeno učitavanje</translation> </message> - </context> + <message> + <source>Error</source> + <translation>Greška</translation> + </message> +</context> </TS>
\ No newline at end of file diff --git a/src/qt/locale/bitcoin_sr@latin.ts b/src/qt/locale/bitcoin_sr@latin.ts index 86243bc14c..2cfb95fb21 100644 --- a/src/qt/locale/bitcoin_sr@latin.ts +++ b/src/qt/locale/bitcoin_sr@latin.ts @@ -41,7 +41,10 @@ <source>&Delete</source> <translation>&Izbrisati</translation> </message> -</context> + </context> +<context> + <name>AddressTableModel</name> + </context> <context> <name>AskPassphraseDialog</name> <message> @@ -60,7 +63,55 @@ <source>Repeat new passphrase</source> <translation>Ponovo unesite pristupnu frazu</translation> </message> -</context> + <message> + <source>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>.</source> + <translation>Unesite novu pristupnu frazu u novčanik. <br/>Molimo, koristite pristupnu frazu koja ima <b> deset ili više nasumičnih znakova</b>, ili <b>osam ili više reči</b>.</translation> + </message> + <message> + <source>Encrypt wallet</source> + <translation>Šifrujte novčanik</translation> + </message> + <message> + <source>This operation needs your wallet passphrase to unlock the wallet.</source> + <translation>Da biste otključali novčanik potrebno je da unesete svoju pristupnu frazu.</translation> + </message> + <message> + <source>Unlock wallet</source> + <translation>Otključajte novčanik</translation> + </message> + <message> + <source>This operation needs your wallet passphrase to decrypt the wallet.</source> + <translation>Da biste dešifrovali novčanik, potrebno je da unesete svoju pristupnu frazu.</translation> + </message> + <message> + <source>Decrypt wallet</source> + <translation>Dešifrujte novčanik</translation> + </message> + <message> + <source>Change passphrase</source> + <translation>Promenite pristupnu frazu</translation> + </message> + <message> + <source>Enter the old passphrase and new passphrase to the wallet.</source> + <translation>Unesite u novčanik staru pristupnu frazu i novu pristupnu frazu.</translation> + </message> + <message> + <source>Confirm wallet encryption</source> + <translation>Potvrdite šifrovanje novčanika</translation> + </message> + <message> + <source>Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR BITCOINS</b>!</source> + <translation>Upozorenje: Ako šifrujete svoj novčanik, i potom izgubite svoju pristupnu frazu <b>IZGUBIĆETE SVE SVOJE BITKOINE</b>!</translation> + </message> + <message> + <source>Are you sure you wish to encrypt your wallet?</source> + <translation>Da li ste sigurni da želite da šifrujete svoj novčanik?</translation> + </message> + <message> + <source>Wallet encrypted</source> + <translation>Novčanik je šifrovan</translation> + </message> + </context> <context> <name>BanTableModel</name> <message> @@ -75,13 +126,143 @@ <context> <name>BitcoinGUI</name> <message> + <source>Synchronizing with network...</source> + <translation>Usklađivanje sa mrežom...</translation> + </message> + <message> + <source>&Overview</source> + <translation>&Pregled</translation> + </message> + <message> + <source>Quit application</source> + <translation>Isključi aplikaciju</translation> + </message> + <message> + <source>&Options...</source> + <translation>&Opcije...</translation> + </message> + <message> + <source>&Change Passphrase...</source> + <translation>&Izmeni pristupnu frazu...</translation> + </message> + <message> + <source>&Sending addresses...</source> + <translation>&Slanje adresa...</translation> + </message> + <message> + <source>&Receiving addresses...</source> + <translation>&Primanje adresa...</translation> + </message> + <message> + <source>Open &URI...</source> + <translation>Otvori &URI...</translation> + </message> + <message> + <source>Send coins to a Bitcoin address</source> + <translation>Pošalji novčiće na Bitcoin adresu</translation> + </message> + <message> + <source>&Verify message...</source> + <translation>&Proveri poruku...</translation> + </message> + <message> + <source>Bitcoin</source> + <translation>Bitcoin</translation> + </message> + <message> + <source>Wallet</source> + <translation>Novčanik</translation> + </message> + <message> + <source>&Send</source> + <translation>&Pošalji</translation> + </message> + <message> + <source>&Receive</source> + <translation>&Primi</translation> + </message> + <message> + <source>&Show / Hide</source> + <translation>&Prikazati / Sakriti</translation> + </message> + <message> + <source>Show or hide the main Window</source> + <translation>Prikaži ili sakrij glavni prozor</translation> + </message> + <message> + <source>&Settings</source> + <translation>&Podešavanja</translation> + </message> + <message> + <source>&Help</source> + <translation>&Pomoć</translation> + </message> + <message> <source>Error</source> <translation>Greska</translation> </message> + <message> + <source>Warning</source> + <translation>Upozorenje</translation> + </message> + <message> + <source>Information</source> + <translation>Informacije</translation> + </message> + <message> + <source>%1 client</source> + <translation>%1 klijent</translation> + </message> + <message> + <source>Date: %1 +</source> + <translation>Datum: %1 +</translation> + </message> + <message> + <source>Amount: %1 +</source> + <translation>Iznos: %1 +</translation> + </message> + <message> + <source>Type: %1 +</source> + <translation>Tip: %1 +</translation> + </message> + <message> + <source>Label: %1 +</source> + <translation>Oznaka: %1 +</translation> + </message> + <message> + <source>Address: %1 +</source> + <translation>Adresa: %1 +</translation> + </message> </context> <context> <name>CoinControlDialog</name> <message> + <source>Quantity:</source> + <translation>Količina:</translation> + </message> + <message> + <source>Amount:</source> + <translation>Iznos:</translation> + </message> + <message> + <source>Fee:</source> + <translation>Naknada:</translation> + </message> + <message> + <source>After Fee:</source> + <translation>Nakon Naknade:</translation> + </message> + <message> <source>Amount</source> <translation>Kolicina</translation> </message> @@ -92,6 +273,18 @@ </context> <context> <name>EditAddressDialog</name> + <message> + <source>Edit Address</source> + <translation>Izmeni Adresu</translation> + </message> + <message> + <source>&Label</source> + <translation>&Oznaka</translation> + </message> + <message> + <source>&Address</source> + <translation>&Adresa</translation> + </message> </context> <context> <name>FreespaceChecker</name> @@ -107,6 +300,9 @@ </message> </context> <context> + <name>ModalOverlay</name> + </context> +<context> <name>OpenURIDialog</name> </context> <context> @@ -116,6 +312,9 @@ <name>OverviewPage</name> </context> <context> + <name>PaymentServer</name> + </context> +<context> <name>PeerTableModel</name> </context> <context> @@ -126,6 +325,12 @@ </message> </context> <context> + <name>QObject::QObject</name> + </context> +<context> + <name>QRImageWidget</name> + </context> +<context> <name>RPCConsole</name> </context> <context> @@ -135,12 +340,34 @@ <name>ReceiveRequestDialog</name> </context> <context> + <name>RecentRequestsTableModel</name> + </context> +<context> <name>SendCoinsDialog</name> + <message> + <source>Quantity:</source> + <translation>Količina:</translation> + </message> + <message> + <source>Amount:</source> + <translation>Iznos:</translation> + </message> + <message> + <source>Fee:</source> + <translation>Naknada:</translation> + </message> + <message> + <source>After Fee:</source> + <translation>Nakon Naknade:</translation> + </message> </context> <context> <name>SendCoinsEntry</name> </context> <context> + <name>SendConfirmationDialog</name> + </context> +<context> <name>ShutdownWindow</name> </context> <context> @@ -153,18 +380,44 @@ <name>TrafficGraphWidget</name> </context> <context> + <name>TransactionDesc</name> + </context> +<context> <name>TransactionDescDialog</name> </context> <context> + <name>TransactionTableModel</name> + </context> +<context> + <name>TransactionView</name> + </context> +<context> <name>UnitDisplayStatusBarControl</name> </context> <context> + <name>WalletFrame</name> + </context> +<context> + <name>WalletModel</name> + </context> +<context> + <name>WalletView</name> + </context> +<context> <name>bitcoin-core</name> <message> <source>Bitcoin Core</source> <translation>Bitcoin Core</translation> </message> <message> + <source>Information</source> + <translation>Informacije</translation> + </message> + <message> + <source>Warning</source> + <translation>Upozorenje</translation> + </message> + <message> <source>Insufficient funds</source> <translation>Nedovoljno sredstava</translation> </message> diff --git a/src/qt/locale/bitcoin_sv.ts b/src/qt/locale/bitcoin_sv.ts index ee46974d8b..2986115a62 100644 --- a/src/qt/locale/bitcoin_sv.ts +++ b/src/qt/locale/bitcoin_sv.ts @@ -41,6 +41,78 @@ <source>&Delete</source> <translation>&Radera</translation> </message> + <message> + <source>Choose the address to send coins to</source> + <translation>Välj en adress att sända betalning till</translation> + </message> + <message> + <source>Choose the address to receive coins with</source> + <translation>Välj en adress att ta emot betalning till</translation> + </message> + <message> + <source>C&hoose</source> + <translation>V&älj</translation> + </message> + <message> + <source>Sending addresses</source> + <translation>Avsändaradresser</translation> + </message> + <message> + <source>Receiving addresses</source> + <translation>Mottagaradresser</translation> + </message> + <message> + <source>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source> + <translation>Detta är dina Bitcoin adresser för att skicka betalningar. Kolla alltid summan och den mottagande adressen innan du skickar Bitcoins.</translation> + </message> + <message> + <source>These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction.</source> + <translation>Detta är dina Bitcoin adresser för att ta emot betalningar. Det rekommenderas att använda en ny mottagningsadress för varje transaktion.</translation> + </message> + <message> + <source>&Copy Address</source> + <translation>&Kopiera adress</translation> + </message> + <message> + <source>Copy &Label</source> + <translation>Kopiera &etikett</translation> + </message> + <message> + <source>&Edit</source> + <translation>&Redigera</translation> + </message> + <message> + <source>Export Address List</source> + <translation>Exportera adresslista</translation> + </message> + <message> + <source>Comma separated file (*.csv)</source> + <translation>Kommaseparerad fil (*.csv)</translation> + </message> + <message> + <source>Exporting Failed</source> + <translation>Export misslyckades</translation> + </message> + <message> + <source>There was an error trying to save the address list to %1. Please try again.</source> + <translation>Det inträffade ett fel när adresslistan skulle sparas till %1. +Var vänlig och försök igen.</translation> + </message> +</context> +<context> + <name>AddressTableModel</name> + <message> + <source>Label</source> + <translation>Etikett</translation> + </message> + <message> + <source>Address</source> + <translation>Adress</translation> + </message> + <message> + <source>(no label)</source> + <translation>(Ingen etikett)</translation> + </message> </context> <context> <name>AskPassphraseDialog</name> @@ -60,6 +132,94 @@ <source>Repeat new passphrase</source> <translation>Upprepa nytt lösenord</translation> </message> + <message> + <source>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>.</source> + <translation>Ange plånbokens nya lösenord. <br/> Använd ett lösenord på <b>tio eller fler slumpmässiga tecken,</b> eller <b>åtta eller fler ord.</b>.</translation> + </message> + <message> + <source>Encrypt wallet</source> + <translation>Kryptera plånbok</translation> + </message> + <message> + <source>This operation needs your wallet passphrase to unlock the wallet.</source> + <translation>Denna operation behöver din plånboks lösenord för att låsa upp plånboken.</translation> + </message> + <message> + <source>Unlock wallet</source> + <translation>Lås upp plånbok</translation> + </message> + <message> + <source>This operation needs your wallet passphrase to decrypt the wallet.</source> + <translation>Denna operation behöver din plånboks lösenord för att dekryptera plånboken.</translation> + </message> + <message> + <source>Decrypt wallet</source> + <translation>Dekryptera plånbok</translation> + </message> + <message> + <source>Change passphrase</source> + <translation>Ändra lösenord</translation> + </message> + <message> + <source>Enter the old passphrase and new passphrase to the wallet.</source> + <translation>Ge det gamla lösenordet och det nya lösenordet för plånboken.</translation> + </message> + <message> + <source>Confirm wallet encryption</source> + <translation>Bekräfta kryptering av plånbok</translation> + </message> + <message> + <source>Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR BITCOINS</b>!</source> + <translation>VARNING: Om du krypterar din plånbok och glömmer ditt lösenord, kommer du att <b>FÖRLORA ALLA DINA BITCOIN</b>!</translation> + </message> + <message> + <source>Are you sure you wish to encrypt your wallet?</source> + <translation>Är du säker på att du vill kryptera din plånbok?</translation> + </message> + <message> + <source>Wallet encrypted</source> + <translation>Plånbok krypterad</translation> + </message> + <message> + <source>%1 will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your bitcoins from being stolen by malware infecting your computer.</source> + <translation>%1 kommer nu att stänga ner för att färdigställa krypteringen. Tänk på att en krypterad plånbok inte skyddar mot stöld om din dator är infekterad med en keylogger.</translation> + </message> + <message> + <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source> + <translation>VIKTIGT: Alla tidigare säkerhetskopior du har gjort av plånboksfilen ska ersättas med den nya genererade, krypterade plånboksfilen. Av säkerhetsskäl kommer tidigare säkerhetskopior av den okrypterade plånboksfilen blir oanvändbara när du börjar använda en ny, krypterad plånbok.</translation> + </message> + <message> + <source>Wallet encryption failed</source> + <translation>Kryptering av plånbok misslyckades</translation> + </message> + <message> + <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source> + <translation>Kryptering av plånbok misslyckades på grund av ett internt fel. Din plånbok blev inte krypterad.</translation> + </message> + <message> + <source>The supplied passphrases do not match.</source> + <translation>De angivna lösenorden överensstämmer inte.</translation> + </message> + <message> + <source>Wallet unlock failed</source> + <translation>Misslyckades låsa upp plånboken</translation> + </message> + <message> + <source>The passphrase entered for the wallet decryption was incorrect.</source> + <translation>Lösenordet för dekryptering av plånboken var felaktig.</translation> + </message> + <message> + <source>Wallet decryption failed</source> + <translation>Dekryptering av plånbok misslyckades</translation> + </message> + <message> + <source>Wallet passphrase was successfully changed.</source> + <translation>Plånbokens lösenord har ändrats.</translation> + </message> + <message> + <source>Warning: The Caps Lock key is on!</source> + <translation>Varning: Caps Lock är påslaget!</translation> + </message> </context> <context> <name>BanTableModel</name> @@ -159,6 +319,22 @@ <translation>Öppna &URI...</translation> </message> <message> + <source>Click to disable network activity.</source> + <translation>Klicka för att inaktivera nätverksaktivitet.</translation> + </message> + <message> + <source>Network activity disabled.</source> + <translation>Nätverksaktivitet inaktiverad.</translation> + </message> + <message> + <source>Click to enable network activity again.</source> + <translation>Klicka för att aktivera nätverksaktivitet igen.</translation> + </message> + <message> + <source>Syncing Headers (%1%)...</source> + <translation>Synkar huvuden (%1%)...</translation> + </message> + <message> <source>Reindexing blocks on disk...</source> <translation>Återindexerar block på disken...</translation> </message> @@ -270,34 +446,10 @@ <source>Processing blocks on disk...</source> <translation>Bearbetar block på disken...</translation> </message> - <message> - <source>No block source available...</source> - <translation>Ingen block-källa tillgänglig...</translation> - </message> <message numerus="yes"> <source>Processed %n block(s) of transaction history.</source> <translation><numerusform>Bearbetade %n block av transaktionshistoriken.</numerusform><numerusform>Bearbetade %n block av transaktionshistoriken.</numerusform></translation> </message> - <message numerus="yes"> - <source>%n hour(s)</source> - <translation><numerusform>%n timme</numerusform><numerusform>%n timmar</numerusform></translation> - </message> - <message numerus="yes"> - <source>%n day(s)</source> - <translation><numerusform>%n dag</numerusform><numerusform>%n dagar</numerusform></translation> - </message> - <message numerus="yes"> - <source>%n week(s)</source> - <translation><numerusform>%n vecka</numerusform><numerusform>%n veckor</numerusform></translation> - </message> - <message> - <source>%1 and %2</source> - <translation>%1 och %2</translation> - </message> - <message numerus="yes"> - <source>%n year(s)</source> - <translation><numerusform>%n år</numerusform><numerusform>%n år</numerusform></translation> - </message> <message> <source>%1 behind</source> <translation>%1 efter</translation> @@ -335,6 +487,10 @@ <translation>%1-klient</translation> </message> <message> + <source>Connecting to peers...</source> + <translation>Ansluter till noder...</translation> + </message> + <message> <source>Catching up...</source> <translation>Hämtar senaste...</translation> </message> @@ -384,7 +540,7 @@ <source>Wallet is <b>encrypted</b> and currently <b>locked</b></source> <translation>Denna plånbok är <b>krypterad</b> och för närvarande <b>låst</b></translation> </message> -</context> + </context> <context> <name>CoinControlDialog</name> <message> @@ -404,10 +560,6 @@ <translation>Belopp:</translation> </message> <message> - <source>Priority:</source> - <translation>Prioritet:</translation> - </message> - <message> <source>Fee:</source> <translation>Avgift:</translation> </message> @@ -460,10 +612,34 @@ <translation>Bekräftad</translation> </message> <message> - <source>Priority</source> - <translation>Prioritet</translation> + <source>Copy address</source> + <translation>Kopiera adress</translation> </message> -</context> + <message> + <source>Copy label</source> + <translation>Kopiera etikett</translation> + </message> + <message> + <source>Copy amount</source> + <translation>Kopiera belopp</translation> + </message> + <message> + <source>Copy transaction ID</source> + <translation>Kopiera transaktions-ID</translation> + </message> + <message> + <source>yes</source> + <translation>ja</translation> + </message> + <message> + <source>no</source> + <translation>nej</translation> + </message> + <message> + <source>(no label)</source> + <translation>(Ingen etikett)</translation> + </message> + </context> <context> <name>EditAddressDialog</name> <message> @@ -486,7 +662,11 @@ <source>&Address</source> <translation>&Adress</translation> </message> -</context> + <message> + <source>Could not unlock wallet.</source> + <translation>Kunde inte låsa upp plånboken.</translation> + </message> + </context> <context> <name>FreespaceChecker</name> <message> @@ -609,6 +789,41 @@ </message> </context> <context> + <name>ModalOverlay</name> + <message> + <source>Form</source> + <translation>Formulär</translation> + </message> + <message> + <source>Number of blocks left</source> + <translation>Antal block kvar</translation> + </message> + <message> + <source>Unknown...</source> + <translation>Okänt...</translation> + </message> + <message> + <source>Last block time</source> + <translation>Sista blocktid</translation> + </message> + <message> + <source>Progress</source> + <translation>Förlopp</translation> + </message> + <message> + <source>calculating...</source> + <translation>beräknar...</translation> + </message> + <message> + <source>Hide</source> + <translation>Göm</translation> + </message> + <message> + <source>Unknown. Syncing Headers (%1)...</source> + <translation>Okänd. Synkar huvuden (%1)...</translation> + </message> +</context> +<context> <name>OpenURIDialog</name> <message> <source>Open URI</source> @@ -626,7 +841,7 @@ <source>Select payment request file</source> <translation>Välj betalningsbegäransfil</translation> </message> -</context> + </context> <context> <name>OptionsDialog</name> <message> @@ -938,6 +1153,21 @@ </message> </context> <context> + <name>PaymentServer</name> + <message> + <source>URI handling</source> + <translation>URI-hantering</translation> + </message> + <message> + <source>Refund from %1</source> + <translation>Återbetalning från %1</translation> + </message> + <message> + <source>Bad response from server %1</source> + <translation>Felaktigt svar från server %1</translation> + </message> + </context> +<context> <name>PeerTableModel</name> <message> <source>User Agent</source> @@ -948,8 +1178,8 @@ <translation>Nod/Tjänst</translation> </message> <message> - <source>Ping Time</source> - <translation>Pingtid</translation> + <source>Ping</source> + <translation>Ping</translation> </message> </context> <context> @@ -990,8 +1220,46 @@ <source>%1 ms</source> <translation>%1 ms</translation> </message> + <message numerus="yes"> + <source>%n second(s)</source> + <translation><numerusform>%n sekund</numerusform><numerusform>%n sekunder</numerusform></translation> + </message> + <message numerus="yes"> + <source>%n minute(s)</source> + <translation><numerusform>%n minut</numerusform><numerusform>%n minuter</numerusform></translation> + </message> + <message numerus="yes"> + <source>%n hour(s)</source> + <translation><numerusform>%n timme</numerusform><numerusform>%n timmar</numerusform></translation> + </message> + <message numerus="yes"> + <source>%n day(s)</source> + <translation><numerusform>%n dag</numerusform><numerusform>%n dagar</numerusform></translation> + </message> + <message numerus="yes"> + <source>%n week(s)</source> + <translation><numerusform>%n vecka</numerusform><numerusform>%n veckor</numerusform></translation> + </message> + <message> + <source>%1 and %2</source> + <translation>%1 och %2</translation> + </message> + <message numerus="yes"> + <source>%n year(s)</source> + <translation><numerusform>%n år</numerusform><numerusform>%n år</numerusform></translation> + </message> + </context> +<context> + <name>QObject::QObject</name> + <message> + <source>Error: %1</source> + <translation>Fel: %1</translation> + </message> </context> <context> + <name>QRImageWidget</name> + </context> +<context> <name>RPCConsole</name> <message> <source>N/A</source> @@ -1194,14 +1462,6 @@ <translation>Rensa konsollen</translation> </message> <message> - <source>&Disconnect Node</source> - <translation>&Koppla från nod</translation> - </message> - <message> - <source>Ban Node for</source> - <translation>Banna nod i</translation> - </message> - <message> <source>1 &hour</source> <translation>1 &timme</translation> </message> @@ -1218,10 +1478,6 @@ <translation>1 &år</translation> </message> <message> - <source>&Unban Node</source> - <translation>&Ta bort ban från nod</translation> - </message> - <message> <source>Welcome to the %1 RPC console.</source> <translation>Välkommen till %1 RPC-konsolen.</translation> </message> @@ -1352,6 +1608,22 @@ <source>Remove</source> <translation>Ta bort</translation> </message> + <message> + <source>Copy URI</source> + <translation>Kopiera URI</translation> + </message> + <message> + <source>Copy label</source> + <translation>Kopiera etikett</translation> + </message> + <message> + <source>Copy message</source> + <translation>Kopiera meddelande</translation> + </message> + <message> + <source>Copy amount</source> + <translation>Kopiera belopp</translation> + </message> </context> <context> <name>ReceiveRequestDialog</name> @@ -1371,7 +1643,50 @@ <source>&Save Image...</source> <translation>&Spara Bild...</translation> </message> -</context> + <message> + <source>Payment information</source> + <translation>Betalinformaton</translation> + </message> + <message> + <source>URI</source> + <translation>URI</translation> + </message> + <message> + <source>Address</source> + <translation>Adress</translation> + </message> + <message> + <source>Label</source> + <translation>Etikett</translation> + </message> + <message> + <source>Message</source> + <translation>Meddelande</translation> + </message> + </context> +<context> + <name>RecentRequestsTableModel</name> + <message> + <source>Date</source> + <translation>Datum</translation> + </message> + <message> + <source>Label</source> + <translation>Etikett</translation> + </message> + <message> + <source>Message</source> + <translation>Meddelande</translation> + </message> + <message> + <source>(no label)</source> + <translation>(Ingen etikett)</translation> + </message> + <message> + <source>(no message)</source> + <translation>(inget meddelande)</translation> + </message> + </context> <context> <name>SendCoinsDialog</name> <message> @@ -1407,10 +1722,6 @@ <translation>Belopp:</translation> </message> <message> - <source>Priority:</source> - <translation>Prioritet:</translation> - </message> - <message> <source>Fee:</source> <translation>Avgift:</translation> </message> @@ -1479,10 +1790,6 @@ <translation>(Smartavgiften är inte initierad än. Detta tar vanligen några block...)</translation> </message> <message> - <source>Confirmation time:</source> - <translation>Bekräftelsetid:</translation> - </message> - <message> <source>normal</source> <translation>normal</translation> </message> @@ -1522,6 +1829,26 @@ <source>S&end</source> <translation>&Skicka</translation> </message> + <message> + <source>Copy amount</source> + <translation>Kopiera belopp</translation> + </message> + <message> + <source>%1 to %2</source> + <translation>%1 till %2</translation> + </message> + <message> + <source>or</source> + <translation>eller</translation> + </message> + <message numerus="yes"> + <source>%n block(s)</source> + <translation><numerusform>%n block</numerusform><numerusform>%n block</numerusform></translation> + </message> + <message> + <source>(no label)</source> + <translation>(Ingen etikett)</translation> + </message> </context> <context> <name>SendCoinsEntry</name> @@ -1601,6 +1928,13 @@ <source>Memo:</source> <translation>PM:</translation> </message> + </context> +<context> + <name>SendConfirmationDialog</name> + <message> + <source>Yes</source> + <translation>Ja</translation> + </message> </context> <context> <name>ShutdownWindow</name> @@ -1699,6 +2033,18 @@ <source>Reset all verify message fields</source> <translation>Rensa alla fält</translation> </message> + <message> + <source>Message signed.</source> + <translation>Meddelande signerat.</translation> + </message> + <message> + <source>The signature could not be decoded.</source> + <translation>Signaturen kunde inte avkodas.</translation> + </message> + <message> + <source>Message verified.</source> + <translation>Meddelande verifierat.</translation> + </message> </context> <context> <name>SplashScreen</name> @@ -1715,12 +2061,81 @@ </message> </context> <context> + <name>TransactionDesc</name> + <message> + <source>Status</source> + <translation>Status</translation> + </message> + <message> + <source>Date</source> + <translation>Datum</translation> + </message> + <message> + <source>Message</source> + <translation>Meddelande</translation> + </message> + </context> +<context> <name>TransactionDescDialog</name> <message> <source>This pane shows a detailed description of the transaction</source> <translation>Den här panelen visar en detaljerad beskrivning av transaktionen</translation> </message> -</context> + </context> +<context> + <name>TransactionTableModel</name> + <message> + <source>Date</source> + <translation>Datum</translation> + </message> + <message> + <source>Label</source> + <translation>Etikett</translation> + </message> + <message> + <source>(no label)</source> + <translation>(Ingen etikett)</translation> + </message> + </context> +<context> + <name>TransactionView</name> + <message> + <source>Copy address</source> + <translation>Kopiera adress</translation> + </message> + <message> + <source>Copy label</source> + <translation>Kopiera etikett</translation> + </message> + <message> + <source>Copy amount</source> + <translation>Kopiera belopp</translation> + </message> + <message> + <source>Copy transaction ID</source> + <translation>Kopiera transaktions-ID</translation> + </message> + <message> + <source>Comma separated file (*.csv)</source> + <translation>Kommaseparerad fil (*.csv)</translation> + </message> + <message> + <source>Date</source> + <translation>Datum</translation> + </message> + <message> + <source>Label</source> + <translation>Etikett</translation> + </message> + <message> + <source>Address</source> + <translation>Adress</translation> + </message> + <message> + <source>Exporting Failed</source> + <translation>Export misslyckades</translation> + </message> + </context> <context> <name>UnitDisplayStatusBarControl</name> <message> @@ -1729,6 +2144,15 @@ </message> </context> <context> + <name>WalletFrame</name> + </context> +<context> + <name>WalletModel</name> + </context> +<context> + <name>WalletView</name> + </context> +<context> <name>bitcoin-core</name> <message> <source>Options:</source> @@ -1763,10 +2187,6 @@ <translation>Beskärning: sista plånbokssynkroniseringen ligger utanför beskuren data. Du måste använda -reindex (ladda ner hela blockkedjan igen eftersom noden beskurits)</translation> </message> <message> - <source>Reduce storage requirements by pruning (deleting) old blocks. This mode is incompatible with -txindex and -rescan. Warning: Reverting this setting requires re-downloading the entire blockchain. (default: 0 = disable pruning blocks, >%u = target size in MiB to use for block files)</source> - <translation>Minska lagringsbehovet genom att beskära (ta bort) gamla block. Detta läge är inkompatibelt med -txindex och -rescan. Varning: Ändras denna inställning måste hela blockkedjan laddas ner igen. (förvalt: 0 = inaktivera beskärning av block, >%u = målstorlek i MiB att använda för blockfiler)</translation> - </message> - <message> <source>Rescans are not possible in pruned mode. You will need to use -reindex which will download the whole blockchain again.</source> <translation>Omskanningar kan inte göras i beskuret läge. Du måste använda -reindex vilket kommer ladda ner hela blockkedjan igen.</translation> </message> @@ -1791,16 +2211,12 @@ <translation>Kunde inte starta HTTP-server. Se avlusningsloggen för detaljer.</translation> </message> <message> - <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> - <translation>Acceptera anslutningar utifrån (förvalt: 1 om ingen -proxy eller -connect)</translation> - </message> - <message> <source>Bitcoin Core</source> <translation>Bitcoin Core</translation> </message> <message> - <source>-fallbackfee is set very high! This is the transaction fee you may pay when fee estimates are not available.</source> - <translation>-fallbackfee är satt väldigt högt! Detta är avgiften du kan komma att betala om uppskattad avgift inte finns tillgänglig.</translation> + <source>The %s developers</source> + <translation>%s-utvecklarna</translation> </message> <message> <source>A fee rate (in %s/kB) that will be used when fee estimation has insufficient data (default: %s)</source> @@ -1823,10 +2239,6 @@ <translation>Ta bort alla plånbokstransaktioner och återskapa bara dom som är en del av blockkedjan genom att ange -rescan vid uppstart</translation> </message> <message> - <source>Distributed under the MIT software license, see the accompanying file COPYING or <http://www.opensource.org/licenses/mit-license.php>.</source> - <translation>Distribuerad under MIT mjukvarulicens, se den bifogade filen COPYING eller <http://www.opensource.org/licenses/mit-license.php>.</translation> - </message> - <message> <source>Error loading %s: You can't enable HD on a already existing non-HD wallet</source> <translation>Fel vid laddning av %s: Du kan inte aktivera HD på en existerande icke-HD plånbok</translation> </message> @@ -1839,10 +2251,6 @@ <translation>Exekvera kommando när en plånbokstransaktion ändras (%s i cmd är ersatt av TxID)</translation> </message> <message> - <source>Force relay of transactions from whitelisted peers even they violate local relay policy (default: %d)</source> - <translation>Vidarebefodra alltid transaktioner från vitlistade noder även om de bryter mot lokala reläpolicyn (förvalt: %d)</translation> - </message> - <message> <source>Maximum allowed median peer time offset adjustment. Local perspective of time may be influenced by peers forward or backward by this amount. (default: %u seconds)</source> <translation>Maximalt tillåten median-peer tidsoffset justering. Lokalt perspektiv av tiden kan bli påverkad av partners, framåt eller bakåt denna tidsrymd. (förvalt: %u sekunder)</translation> </message> @@ -1867,10 +2275,6 @@ <translation>Blockdatabasen innehåller ett block som verkar vara från framtiden. Detta kan vara på grund av att din dators datum och tid är felaktiga. Bygg bara om blockdatabasen om du är säker på att datorns datum och tid är korrekt</translation> </message> <message> - <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source> - <translation>Detta är ett förhands testbygge - använd på egen risk - använd inte för mining eller handels applikationer</translation> - </message> - <message> <source>Unable to rewind the database to a pre-fork state. You will need to redownload the blockchain</source> <translation>Kan inte spola tillbaka databasen till obeskärt läge. Du måste ladda ner blockkedjan igen</translation> </message> @@ -1879,18 +2283,6 @@ <translation>Använd UPnP för att mappa den lyssnande porten (förvalt: 1 när lyssning aktiverat och utan -proxy)</translation> </message> <message> - <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source> - <translation>Varning: Nätverket verkar inte vara helt överens! Några miners verkar ha problem.</translation> - </message> - <message> - <source>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</source> - <translation>Varning: Vi verkar inte helt överens med våra peers! Du kan behöva uppgradera, eller andra noder kan behöva uppgradera.</translation> - </message> - <message> - <source>Whitelist peers connecting from the given netmask or IP address. Can be specified multiple times.</source> - <translation>Vitlista klienter som ansluter från angivna nätmasker eller IP-adresser. Kan specificeras flera gånger.</translation> - </message> - <message> <source>You need to rebuild the database using -reindex-chainstate to change -txindex</source> <translation>Du måste återskapa databasen med -reindex-chainstate för att ändra -txindex</translation> </message> @@ -1927,10 +2319,6 @@ <translation>Förändringsindexet utom räckhåll</translation> </message> <message> - <source>Connect only to the specified node(s)</source> - <translation>Koppla enbart upp till den/de specificerade noden/noder</translation> - </message> - <message> <source>Connection options:</source> <translation>Anslutningsalternativ:</translation> </message> @@ -2051,10 +2439,6 @@ <translation>Plats för authcookie (förvalt: datamapp)</translation> </message> <message> - <source>Minimum bytes per sigop in transactions we relay and mine (default: %u)</source> - <translation>Minimum antal byte per sigop i transaktioner som vi reläar och bryter (förvalt: %u)</translation> - </message> - <message> <source>Not enough file descriptors available.</source> <translation>Inte tillräckligt med filbeskrivningar tillgängliga.</translation> </message> @@ -2095,10 +2479,6 @@ <translation>Sätt databasens cachestorlek i megabyte (%d till %d, förvalt: %d)</translation> </message> <message> - <source>Set maximum block cost (default: %d)</source> - <translation>Sätt maximal blockkostnad (förvalt: %d)</translation> - </message> - <message> <source>Set maximum block size in bytes (default: %d)</source> <translation>Sätt maximal blockstorlek i byte (förvalt: %d)</translation> </message> @@ -2203,10 +2583,6 @@ <translation>Maximal storlek på data i databärartransaktioner som vi reläar och bryter (förvalt: %u) </translation> </message> <message> - <source>Query for peer addresses via DNS lookup, if low on addresses (default: 1 unless -connect)</source> - <translation>Sök efter klientadresser med DNS sökningen, om det finns otillräckligt med adresser (förvalt: 1 om inte -connect)</translation> - </message> - <message> <source>Randomize credentials for every proxy connection. This enables Tor stream isolation (default: %u)</source> <translation>Slumpa autentiseringen för varje proxyanslutning. Detta möjliggör Tor ström-isolering (förvalt: %u)</translation> </message> @@ -2219,10 +2595,6 @@ <translation>Transaktionen är för liten att skicka efter det att avgiften har dragits</translation> </message> <message> - <source>This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit <https://www.openssl.org/> and cryptographic software written by Eric Young and UPnP software written by Thomas Bernard.</source> - <translation>Denna produkten innehåller mjukvara utvecklad av OpenSSL Project för användning i OpenSSL Toolkit <https://www.openssl.org/> och kryptografisk mjukvara utvecklad av Eric Young samt UPnP-mjukvara skriven av Thomas Bernard.</translation> - </message> - <message> <source>Use hierarchical deterministic key generation (HD) after BIP32. Only has effect during wallet creation/first start</source> <translation>Använd hierarkisk deterministisk nyckel generering (HD) efter BIP32. Har bara effekt under plånbokens skapande/första användning.</translation> </message> @@ -2335,10 +2707,6 @@ <translation>Transaktions belopp för liten</translation> </message> <message> - <source>Transaction amounts must be positive</source> - <translation>Transaktionens belopp måste vara positiva</translation> - </message> - <message> <source>Transaction too large for fee policy</source> <translation>Transaktionen är för stor för avgiftspolicyn</translation> </message> @@ -2403,14 +2771,14 @@ <translation>-maxtxfee är väldigt högt satt! Så höga avgifter kan komma att betalas för en enstaka transaktion.</translation> </message> <message> - <source>-paytxfee is set very high! This is the transaction fee you will pay if you send a transaction.</source> - <translation>-paytxfee är väldigt högt satt! Det här är avgiften du kommer betala om du skickar en transaktion.</translation> - </message> - <message> <source>Do not keep transactions in the mempool longer than <n> hours (default: %u)</source> <translation>Håll inte transaktioner i minnespoolen längre än <n> timmar (förvalt: %u)</translation> </message> <message> + <source>Equivalent bytes per sigop in transactions for relay and mining (default: %u)</source> + <translation>Samma antal byte per sigop i transaktioner som vi reläar och bryter (förvalt: %u)</translation> + </message> + <message> <source>Fees (in %s/kB) smaller than this are considered zero fee for transaction creation (default: %s)</source> <translation>Avgifter (i %s/kB) mindre än detta anses vara nollavgifter vid skapande av transaktion (standard: %s)</translation> </message> @@ -2455,10 +2823,6 @@ <translation>Använd separat SOCKS5 proxy för att nå kollegor via dolda tjänster i Tor (förvalt: -%s)</translation> </message> <message> - <source>Username and hashed password for JSON-RPC connections. The field <userpw> comes in the format: <USERNAME>:<SALT>$<HASH>. A canonical python script is included in share/rpcuser. This option can be specified multiple times</source> - <translation>Användarnamn och hashat lösenord för JSON-RPC-anslutningar. Fältet <userpw> kommer i formatet: <USERNAME>:<SALT>$<HASH>. Ett kanoniskt pythonskript finns inkluderat i share/rpcuser. Detta alternativ kan anges flera gånger</translation> - </message> - <message> <source>Warning: Unknown block versions being mined! It's possible unknown rules are in effect</source> <translation>Varning: Okända blockversioner bryts! Det är möjligt att okända regler används</translation> </message> @@ -2527,8 +2891,8 @@ <translation>Sätt storleken på nyckelpoolen till <n> (förvalt: %u)</translation> </message> <message> - <source>Set minimum block size in bytes (default: %u)</source> - <translation>Sätt minsta blockstorlek i byte (standard: %u)</translation> + <source>Set maximum BIP141 block weight (default: %d)</source> + <translation>Sätt maximal BIP141 blockvikt (förvalt: %d)</translation> </message> <message> <source>Set the number of threads to service RPC calls (default: %d)</source> diff --git a/src/qt/locale/bitcoin_ta.ts b/src/qt/locale/bitcoin_ta.ts index 921171c544..ef8c26c41d 100644 --- a/src/qt/locale/bitcoin_ta.ts +++ b/src/qt/locale/bitcoin_ta.ts @@ -25,7 +25,22 @@ <source>&Delete</source> <translation>&அழி</translation> </message> -</context> + <message> + <source>Sending addresses</source> + <translation>முகவரிகள் அனுப்பப்படுகின்றன</translation> + </message> + <message> + <source>Receiving addresses</source> + <translation>முகவரிகள் பெறப்படுகின்றன</translation> + </message> + </context> +<context> + <name>AddressTableModel</name> + <message> + <source>Address</source> + <translation>முகவரி</translation> + </message> + </context> <context> <name>AskPassphraseDialog</name> </context> @@ -106,14 +121,6 @@ <source>&Help</source> <translation>&உதவி</translation> </message> - <message numerus="yes"> - <source>%n hour(s)</source> - <translation><numerusform>%n மணி</numerusform><numerusform>%n மணி</numerusform></translation> - </message> - <message> - <source>%1 and %2</source> - <translation>%1 மற்றும் %2</translation> - </message> <message> <source>%1 behind</source> <translation>%1 பின்னால்</translation> @@ -170,10 +177,6 @@ <translation>விலை:</translation> </message> <message> - <source>Priority:</source> - <translation>முன்னுரிமை</translation> - </message> - <message> <source>Fee:</source> <translation>கட்டணம்:</translation> </message> @@ -201,11 +204,7 @@ <source>Confirmed</source> <translation>உறுதியாக</translation> </message> - <message> - <source>Priority</source> - <translation>முன்னுரிமை</translation> - </message> -</context> + </context> <context> <name>EditAddressDialog</name> </context> @@ -231,6 +230,17 @@ </message> </context> <context> + <name>ModalOverlay</name> + <message> + <source>Form</source> + <translation>படிவம்</translation> + </message> + <message> + <source>Hide</source> + <translation>மறை</translation> + </message> + </context> +<context> <name>OpenURIDialog</name> <message> <source>Open URI</source> @@ -332,16 +342,15 @@ </message> </context> <context> + <name>PaymentServer</name> + </context> +<context> <name>PeerTableModel</name> <message> <source>User Agent</source> <translation>பயனர் முகவர்</translation> </message> - <message> - <source>Ping Time</source> - <translation>பிங் நேரம்</translation> - </message> -</context> + </context> <context> <name>QObject</name> <message> @@ -368,7 +377,17 @@ <source>%1 ms</source> <translation>%1 ms</translation> </message> -</context> + <message> + <source>%1 and %2</source> + <translation>%1 மற்றும் %2</translation> + </message> + </context> +<context> + <name>QObject::QObject</name> + </context> +<context> + <name>QRImageWidget</name> + </context> <context> <name>RPCConsole</name> <message> @@ -530,7 +549,7 @@ <source>Remove</source> <translation>நீக்கு</translation> </message> -</context> + </context> <context> <name>ReceiveRequestDialog</name> <message> @@ -549,7 +568,14 @@ <source>&Save Image...</source> <translation>&படத்தை சேமி...</translation> </message> -</context> + <message> + <source>Address</source> + <translation>முகவரி</translation> + </message> + </context> +<context> + <name>RecentRequestsTableModel</name> + </context> <context> <name>SendCoinsDialog</name> <message> @@ -561,10 +587,6 @@ <translation>விலை</translation> </message> <message> - <source>Priority:</source> - <translation>முன்னுரிமை</translation> - </message> - <message> <source>Fee:</source> <translation>கட்டணம்:</translation> </message> @@ -600,7 +622,7 @@ <source>S&end</source> <translation>&அனுப்பு</translation> </message> -</context> + </context> <context> <name>SendCoinsEntry</name> <message> @@ -625,6 +647,9 @@ </message> </context> <context> + <name>SendConfirmationDialog</name> + </context> +<context> <name>ShutdownWindow</name> </context> <context> @@ -653,12 +678,34 @@ </message> </context> <context> + <name>TransactionDesc</name> + </context> +<context> <name>TransactionDescDialog</name> </context> <context> + <name>TransactionTableModel</name> + </context> +<context> + <name>TransactionView</name> + <message> + <source>Address</source> + <translation>முகவரி</translation> + </message> + </context> +<context> <name>UnitDisplayStatusBarControl</name> </context> <context> + <name>WalletFrame</name> + </context> +<context> + <name>WalletModel</name> + </context> +<context> + <name>WalletView</name> + </context> +<context> <name>bitcoin-core</name> <message> <source>Bitcoin Core</source> diff --git a/src/qt/locale/bitcoin_th_TH.ts b/src/qt/locale/bitcoin_th_TH.ts index 34c7526341..ea84d11d39 100644 --- a/src/qt/locale/bitcoin_th_TH.ts +++ b/src/qt/locale/bitcoin_th_TH.ts @@ -41,7 +41,22 @@ <source>&Delete</source> <translation>&ลบ</translation> </message> -</context> + <message> + <source>Choose the address to send coins to</source> + <translation>เลือกที่อยู่เพื่อส่งเหรียญไปไว้</translation> + </message> + <message> + <source>Choose the address to receive coins with</source> + <translation>เลือกที่อยู่เพื่อส่งเหรียญไปไว้</translation> + </message> + <message> + <source>Sending addresses</source> + <translation>ส่งที่อยู่</translation> + </message> + </context> +<context> + <name>AddressTableModel</name> + </context> <context> <name>AskPassphraseDialog</name> <message> @@ -60,7 +75,7 @@ <source>Repeat new passphrase</source> <translation>กรุณากรอกรหัสผ่านใหม่อีกครั้งหนึ่ง</translation> </message> -</context> + </context> <context> <name>BanTableModel</name> <message> @@ -270,34 +285,10 @@ <source>Processing blocks on disk...</source> <translation>กำลังดำเนินการกับบล็อกในดิสก์...</translation> </message> - <message> - <source>No block source available...</source> - <translation>ไม่มีบล็อกเริ่มต้น ให้ใช้ได้...</translation> - </message> <message numerus="yes"> <source>Processed %n block(s) of transaction history.</source> <translation><numerusform>%n บล็อกในประวัติรายการ ได้รับการดำเนินการเรียบร้อยแล้ว</numerusform></translation> </message> - <message numerus="yes"> - <source>%n hour(s)</source> - <translation><numerusform>%n ชั่วโมง</numerusform></translation> - </message> - <message numerus="yes"> - <source>%n day(s)</source> - <translation><numerusform>%n วัน</numerusform></translation> - </message> - <message numerus="yes"> - <source>%n week(s)</source> - <translation><numerusform>%n สัปดาห์</numerusform></translation> - </message> - <message> - <source>%1 and %2</source> - <translation>%1 และ %2</translation> - </message> - <message numerus="yes"> - <source>%n year(s)</source> - <translation><numerusform>%n ปี</numerusform></translation> - </message> <message> <source>%1 behind</source> <translation>%1 ตามหลัง</translation> @@ -384,7 +375,7 @@ <source>Wallet is <b>encrypted</b> and currently <b>locked</b></source> <translation>กระเป๋าเงินถูก <b>เข้ารหัส</b> และในปัจจุบัน <b>ล็อค </b></translation> </message> -</context> + </context> <context> <name>CoinControlDialog</name> <message> @@ -404,10 +395,6 @@ <translation>จำนวน:</translation> </message> <message> - <source>Priority:</source> - <translation>ความเร่งด่วน:</translation> - </message> - <message> <source>Fee:</source> <translation>ค่าธรรมเนียม:</translation> </message> @@ -459,11 +446,7 @@ <source>Confirmed</source> <translation>ยืนยันแล้ว</translation> </message> - <message> - <source>Priority</source> - <translation>ระดับความสำคัญ</translation> - </message> -</context> + </context> <context> <name>EditAddressDialog</name> <message> @@ -486,7 +469,7 @@ <source>&Address</source> <translation>&ที่เก็บ</translation> </message> -</context> + </context> <context> <name>FreespaceChecker</name> <message> @@ -498,6 +481,10 @@ <translation>ชื่อ</translation> </message> <message> + <source>Directory already exists. Add %1 if you intend to create a new directory here.</source> + <translation>ไดเร็กทอรี่มีอยู่แล้ว ใส่เพิ่ม %1 หากท่านต้องการสร้างไดเร็กทอรี่ใหม่ที่นี่</translation> + </message> + <message> <source>Path already exists, and is not a directory.</source> <translation>พาธ มีอยู่แล้ว พาธนี่ไม่ใช่ไดเร็กทอรี่</translation> </message> @@ -605,6 +592,13 @@ </message> </context> <context> + <name>ModalOverlay</name> + <message> + <source>Form</source> + <translation>รูป</translation> + </message> + </context> +<context> <name>OpenURIDialog</name> <message> <source>Open URI</source> @@ -622,7 +616,7 @@ <source>Select payment request file</source> <translation>เลือก ไฟล์การเรียกการชำระเงิน</translation> </message> -</context> + </context> <context> <name>OptionsDialog</name> <message> @@ -798,6 +792,9 @@ </message> </context> <context> + <name>PaymentServer</name> + </context> +<context> <name>PeerTableModel</name> </context> <context> @@ -806,6 +803,16 @@ <source>Amount</source> <translation>จำนวน</translation> </message> + <message> + <source>%1 and %2</source> + <translation>%1 และ %2</translation> + </message> + </context> +<context> + <name>QObject::QObject</name> + </context> +<context> + <name>QRImageWidget</name> </context> <context> <name>RPCConsole</name> @@ -821,6 +828,9 @@ <name>ReceiveRequestDialog</name> </context> <context> + <name>RecentRequestsTableModel</name> + </context> +<context> <name>SendCoinsDialog</name> <message> <source>Send Coins</source> @@ -839,10 +849,6 @@ <translation>จำนวน:</translation> </message> <message> - <source>Priority:</source> - <translation>ความเร่งด่วน</translation> - </message> - <message> <source>Fee:</source> <translation>ค่าธรรมเนียม:</translation> </message> @@ -867,6 +873,9 @@ </message> </context> <context> + <name>SendConfirmationDialog</name> + </context> +<context> <name>ShutdownWindow</name> </context> <context> @@ -883,12 +892,30 @@ <name>TrafficGraphWidget</name> </context> <context> + <name>TransactionDesc</name> + </context> +<context> <name>TransactionDescDialog</name> </context> <context> + <name>TransactionTableModel</name> + </context> +<context> + <name>TransactionView</name> + </context> +<context> <name>UnitDisplayStatusBarControl</name> </context> <context> + <name>WalletFrame</name> + </context> +<context> + <name>WalletModel</name> + </context> +<context> + <name>WalletView</name> + </context> +<context> <name>bitcoin-core</name> <message> <source>Options:</source> diff --git a/src/qt/locale/bitcoin_tr.ts b/src/qt/locale/bitcoin_tr.ts index e3a811b504..2de0d14ddd 100644 --- a/src/qt/locale/bitcoin_tr.ts +++ b/src/qt/locale/bitcoin_tr.ts @@ -35,18 +35,89 @@ </message> <message> <source>&Export</source> - <translation>&Dışa aktar</translation> + <translation>&Dışarı aktar</translation> </message> <message> <source>&Delete</source> <translation>&Sil</translation> </message> + <message> + <source>Choose the address to send coins to</source> + <translation>Parayı göndermek istediğiniz adresi seçiniz</translation> + </message> + <message> + <source>Choose the address to receive coins with</source> + <translation>Parayı almak istediğiniz adresi seçiniz</translation> + </message> + <message> + <source>C&hoose</source> + <translation>S&eçiniz</translation> + </message> + <message> + <source>Sending addresses</source> + <translation>Gönderilen adresler</translation> + </message> + <message> + <source>Receiving addresses</source> + <translation>Alım adresleri</translation> + </message> + <message> + <source>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source> + <translation>Bunlar ödemeleri göndermek için kullanacağınız Bitcoin adreslerinizdir. Bitcoin yollamadan önce tutarı ve alıcının alım adresini her zaman kontrol ediniz.</translation> + </message> + <message> + <source>These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction.</source> + <translation>Bunlar ödemeleri almak için kullanacağınız Bitcoin adreslerinizdir. Her işlem için yeni bir alım adresi kullanmanız tavsiye edilir.</translation> + </message> + <message> + <source>&Copy Address</source> + <translation>&Adresi Kopyala</translation> + </message> + <message> + <source>Copy &Label</source> + <translation>&Etiketi Kopyala</translation> + </message> + <message> + <source>&Edit</source> + <translation>&Değiştir</translation> + </message> + <message> + <source>Export Address List</source> + <translation>Adres Listesini Dışarı Aktar</translation> + </message> + <message> + <source>Comma separated file (*.csv)</source> + <translation>Virgülle ayrılmış değerler dosyası (*.csv)</translation> + </message> + <message> + <source>Exporting Failed</source> + <translation>Dışarı Aktarım Başarısız Oldu</translation> + </message> + <message> + <source>There was an error trying to save the address list to %1. Please try again.</source> + <translation>Adres listesinin %1 konumuna kaydedilmesi sırasında bir hata meydana geldi. Lütfen tekrar deneyin.</translation> + </message> +</context> +<context> + <name>AddressTableModel</name> + <message> + <source>Label</source> + <translation>Etiket</translation> + </message> + <message> + <source>Address</source> + <translation>Adres</translation> + </message> + <message> + <source>(no label)</source> + <translation>(etiket yok)</translation> + </message> </context> <context> <name>AskPassphraseDialog</name> <message> <source>Passphrase Dialog</source> - <translation>Parola diyaloğu</translation> + <translation>Parola Diyaloğu</translation> </message> <message> <source>Enter passphrase</source> @@ -60,27 +131,115 @@ <source>Repeat new passphrase</source> <translation>Yeni parolayı tekrarlayınız</translation> </message> + <message> + <source>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>.</source> + <translation>Cüzdan için yeni parolayı giriniz.<br/>Lütfen <b>on ya da daha fazla rastgele karakter</b> veya <b>sekiz ya da daha fazla kelime</b> içeren bir parola kullanınız.</translation> + </message> + <message> + <source>Encrypt wallet</source> + <translation>Cüzdanı şifrele</translation> + </message> + <message> + <source>This operation needs your wallet passphrase to unlock the wallet.</source> + <translation>Bu eylem cüzdan kilidini açmak için cüzdan parolanızı gerektirir.</translation> + </message> + <message> + <source>Unlock wallet</source> + <translation>Cüzdan kilidini kaldır</translation> + </message> + <message> + <source>This operation needs your wallet passphrase to decrypt the wallet.</source> + <translation>Bu eylem, cüzdan şifresini çözmek için cüzdan parolanıza ihtiyaç duyuyor.</translation> + </message> + <message> + <source>Decrypt wallet</source> + <translation>Cüzdanın şifrelemesini aç</translation> + </message> + <message> + <source>Change passphrase</source> + <translation>Parola değiştir</translation> + </message> + <message> + <source>Enter the old passphrase and new passphrase to the wallet.</source> + <translation>Eski ve yeni parolanızı cüzdana giriniz.</translation> + </message> + <message> + <source>Confirm wallet encryption</source> + <translation>Cüzdan şifrelemesini onayla</translation> + </message> + <message> + <source>Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR BITCOINS</b>!</source> + <translation>Uyarı: Eğer cüzdanınızı şifreler ve parolanızı kaybederseniz <b>TÜM BİTCOİNLERİNİZİ KAYBEDECEKSİNİZ</b>!</translation> + </message> + <message> + <source>Are you sure you wish to encrypt your wallet?</source> + <translation>Cüzdanınızı şifrelemek istediğinizden emin misiniz?</translation> + </message> + <message> + <source>Wallet encrypted</source> + <translation>Cüzdan şifrelendi</translation> + </message> + <message> + <source>%1 will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your bitcoins from being stolen by malware infecting your computer.</source> + <translation>Şifreleme işleminin bitirilmesi için %1 kapatılacak. Her ne kadar cüzdanınızı şifreleseniz de şifrelemenin bitcoinlerinizi bilgisayarınıza bulaşan zararlılardan tam olarak koruyamayacağını unutmayın.</translation> + </message> + <message> + <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source> + <translation>ÖNEMLİ: Önceden yapmış olduğunuz cüzdan dosyası yedeklemelerinin yeni oluşturulan şifrelenmiş cüzdan dosyası ile değiştirilmeleri gerekir. Güvenlik nedenleriyle yeni, şifrelenmiş cüzdanı kullanmaya başladığınızda eski şifrelenmemiş cüzdan dosyaları işe yaramaz hale gelecektir.</translation> + </message> + <message> + <source>Wallet encryption failed</source> + <translation>Cüzdan şifreleme başarısız</translation> + </message> + <message> + <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source> + <translation>Dahili bir hata yüzünden cüzdan şifrelemesi başarısız oldu. Cüzdanın şifrelenmedi.</translation> + </message> + <message> + <source>The supplied passphrases do not match.</source> + <translation>Girilen parolalar birbiriyle eşleşmiyor.</translation> + </message> + <message> + <source>Wallet unlock failed</source> + <translation>Cüzdan kilidini kaldırma başarısız oldu</translation> + </message> + <message> + <source>The passphrase entered for the wallet decryption was incorrect.</source> + <translation>Cüzdan şifresinin açılması için girilen parola yanlıştı.</translation> + </message> + <message> + <source>Wallet decryption failed</source> + <translation>Cüzdan şifresinin açılması başarısız oldu</translation> + </message> + <message> + <source>Wallet passphrase was successfully changed.</source> + <translation>Cüzdan parolası başarılı bir şekilde değiştirildi.</translation> + </message> + <message> + <source>Warning: The Caps Lock key is on!</source> + <translation>Uyarı: Caps Lock tuşu etkin durumda!</translation> + </message> </context> <context> <name>BanTableModel</name> <message> <source>IP/Netmask</source> - <translation>IP/Ağ maskesi</translation> + <translation>IP/Ağ Maskesi</translation> </message> <message> <source>Banned Until</source> - <translation>Şu vakte kadar yasaklı:</translation> + <translation>Şu zamana kadar yasaklı:</translation> </message> </context> <context> <name>BitcoinGUI</name> <message> <source>Sign &message...</source> - <translation>&Mesaj imzala...</translation> + <translation>&İleti imzala...</translation> </message> <message> <source>Synchronizing with network...</source> - <translation>Şebeke ile senkronizasyon...</translation> + <translation>Ağ ile senkronize ediliyor...</translation> </message> <message> <source>&Overview</source> @@ -96,15 +255,15 @@ </message> <message> <source>&Transactions</source> - <translation>&Muameleler</translation> + <translation>&İşlemler</translation> </message> <message> <source>Browse transaction history</source> - <translation>Muamele tarihçesini tara</translation> + <translation>İşlem geçmişine gözat</translation> </message> <message> <source>E&xit</source> - <translation>&Çık</translation> + <translation>Ç&ık</translation> </message> <message> <source>Quit application</source> @@ -112,7 +271,7 @@ </message> <message> <source>&About %1</source> - <translation>%1 &hakkında</translation> + <translation>%1 &Hakkında</translation> </message> <message> <source>Show information about %1</source> @@ -120,11 +279,11 @@ </message> <message> <source>About &Qt</source> - <translation>&Qt hakkında</translation> + <translation>&Qt Hakkında</translation> </message> <message> <source>Show information about Qt</source> - <translation>Qt hakkında bilgi görüntü</translation> + <translation>Qt hakkında bilgi göster</translation> </message> <message> <source>&Options...</source> @@ -136,15 +295,15 @@ </message> <message> <source>&Encrypt Wallet...</source> - <translation>Cüzdanı &şifrele...</translation> + <translation>Cüzdanı &Şifrele...</translation> </message> <message> <source>&Backup Wallet...</source> - <translation>Cüzdanı &yedekle...</translation> + <translation>Cüzdanı &Yedekle...</translation> </message> <message> <source>&Change Passphrase...</source> - <translation>Parolayı &değiştir...</translation> + <translation>Parolayı &Değiştir...</translation> </message> <message> <source>&Sending addresses...</source> @@ -156,15 +315,31 @@ </message> <message> <source>Open &URI...</source> - <translation>&URI aç...</translation> + <translation>&URI Aç...</translation> + </message> + <message> + <source>Click to disable network activity.</source> + <translation>Ağ etkinliğini devre dışı bırakmak için tıklayın.</translation> + </message> + <message> + <source>Network activity disabled.</source> + <translation>Ağ etkinliği devre dışı bırakılmış.</translation> + </message> + <message> + <source>Click to enable network activity again.</source> + <translation>Ağ etkinliğini yeniden etkinleştirmek için tıklayın.</translation> + </message> + <message> + <source>Syncing Headers (%1%)...</source> + <translation>Üstbilgiler Senkronize Ediliyor (%1%)...</translation> </message> <message> <source>Reindexing blocks on disk...</source> - <translation>Diskteki bloklar yeniden endeksleniyor...</translation> + <translation>Diskteki bloklar yeniden indeksleniyor...</translation> </message> <message> <source>Send coins to a Bitcoin address</source> - <translation>Bir Bitcoin adresine Bitcoin yolla</translation> + <translation>Bir bitcoin adresine bitcoin gönder</translation> </message> <message> <source>Backup wallet to another location</source> @@ -184,7 +359,7 @@ </message> <message> <source>&Verify message...</source> - <translation>Mesaj &kontrol et...</translation> + <translation>İletiyi &kontrol et...</translation> </message> <message> <source>Bitcoin</source> @@ -204,23 +379,23 @@ </message> <message> <source>&Show / Hide</source> - <translation>&Göster / Sakla</translation> + <translation>&Göster / Gizle</translation> </message> <message> <source>Show or hide the main Window</source> - <translation>Ana pencereyi görüntüle ya da sakla</translation> + <translation>Ana pencereyi göster ya da gizle</translation> </message> <message> <source>Encrypt the private keys that belong to your wallet</source> - <translation>Cüzdanınızın özel anahtarlarını şifrele</translation> + <translation>Cüzdanınıza ait özel anahtarları şifreleyin</translation> </message> <message> <source>Sign messages with your Bitcoin addresses to prove you own them</source> - <translation>Mesajları adreslerin size ait olduğunu ispatlamak için Bitcoin adresleri ile imzala</translation> + <translation>İletileri adreslerin size ait olduğunu ispatlamak için Bitcoin adresleri ile imzala</translation> </message> <message> <source>Verify messages to ensure they were signed with specified Bitcoin addresses</source> - <translation>Belirtilen Bitcoin adresleri ile imzalandıklarından emin olmak için mesajları kontrol et</translation> + <translation>Belirtilen Bitcoin adresleri ile imzalandıklarından emin olmak için iletileri kontrol et</translation> </message> <message> <source>&File</source> @@ -260,7 +435,7 @@ </message> <message numerus="yes"> <source>%n active connection(s) to Bitcoin network</source> - <translation><numerusform>Bitcoin şebekesine %n faal bağlantı</numerusform><numerusform>Bitcoin şebekesine %n faal bağlantı</numerusform></translation> + <translation><numerusform>Bitcoin şebekesine %n faal bağlantı</numerusform><numerusform>Bitcoin ağına %n etkin bağlantı var</numerusform></translation> </message> <message> <source>Indexing blocks on disk...</source> @@ -268,35 +443,11 @@ </message> <message> <source>Processing blocks on disk...</source> - <translation>Bloklar diske yazıdırılıyor...</translation> - </message> - <message> - <source>No block source available...</source> - <translation>Hiçbir blok kaynağı mevcut değil...</translation> + <translation>Bloklar diske işleniyor...</translation> </message> <message numerus="yes"> <source>Processed %n block(s) of transaction history.</source> - <translation><numerusform>Muamele tarihçesinden %n blok işlendi.</numerusform><numerusform>Muamele tarihçesinden %n blok işlendi</numerusform></translation> - </message> - <message numerus="yes"> - <source>%n hour(s)</source> - <translation><numerusform>%n saat</numerusform><numerusform>%n saat</numerusform></translation> - </message> - <message numerus="yes"> - <source>%n day(s)</source> - <translation><numerusform>%n gün</numerusform><numerusform>%n gün</numerusform></translation> - </message> - <message numerus="yes"> - <source>%n week(s)</source> - <translation><numerusform>%n hafta</numerusform><numerusform>%n hafta</numerusform></translation> - </message> - <message> - <source>%1 and %2</source> - <translation>%1 ve %2</translation> - </message> - <message numerus="yes"> - <source>%n year(s)</source> - <translation><numerusform>%n yıl</numerusform><numerusform>%n yıl</numerusform></translation> + <translation><numerusform>Muamele tarihçesinden %n blok işlendi.</numerusform><numerusform>İşlem tarihçesinden %n blok işlendi</numerusform></translation> </message> <message> <source>%1 behind</source> @@ -304,11 +455,11 @@ </message> <message> <source>Last received block was generated %1 ago.</source> - <translation>Son alınan blok %1 evvel oluşturulmuştu.</translation> + <translation>Son alınan blok %1 önce oluşturulmuştu.</translation> </message> <message> <source>Transactions after this will not yet be visible.</source> - <translation>Bundan sonraki muameleler henüz görüntülenemez.</translation> + <translation>Bundan sonraki işlemler henüz görüntülenemez.</translation> </message> <message> <source>Error</source> @@ -332,7 +483,11 @@ </message> <message> <source>%1 client</source> - <translation>%1 istemcisi</translation> + <translation>%1 istemci</translation> + </message> + <message> + <source>Connecting to peers...</source> + <translation>Eşlere bağlanılıyor...</translation> </message> <message> <source>Catching up...</source> @@ -347,7 +502,7 @@ <message> <source>Amount: %1 </source> - <translation>Meblağ: %1 + <translation>Tutar: %1 </translation> </message> <message> @@ -370,11 +525,19 @@ </message> <message> <source>Sent transaction</source> - <translation>Muamele yollandı</translation> + <translation>İşlem gönderildi</translation> </message> <message> <source>Incoming transaction</source> - <translation>Gelen muamele</translation> + <translation>Gelen işlem</translation> + </message> + <message> + <source>HD key generation is <b>enabled</b></source> + <translation>HD anahtar oluşturma <b>etkin</b></translation> + </message> + <message> + <source>HD key generation is <b>disabled</b></source> + <translation>HD anahtar oluşturma <b>devre dışı</b></translation> </message> <message> <source>Wallet is <b>encrypted</b> and currently <b>unlocked</b></source> @@ -384,6 +547,10 @@ <source>Wallet is <b>encrypted</b> and currently <b>locked</b></source> <translation>Cüzdan <b>şifrelenmiştir</b> ve şu anda <b>kilitlidir</b></translation> </message> + <message> + <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> + <translation>Ölümcül bir hata oluştu. Bitcoin yazılımı artık güvenli bir şekilde çalışmaya devam edemediği için kapatılacaktır.</translation> + </message> </context> <context> <name>CoinControlDialog</name> @@ -401,11 +568,7 @@ </message> <message> <source>Amount:</source> - <translation>Meblağ:</translation> - </message> - <message> - <source>Priority:</source> - <translation>Öncelik:</translation> + <translation>Tutar:</translation> </message> <message> <source>Fee:</source> @@ -437,7 +600,7 @@ </message> <message> <source>Amount</source> - <translation>Meblağ</translation> + <translation>Tutar</translation> </message> <message> <source>Received with label</source> @@ -460,8 +623,84 @@ <translation>Doğrulandı</translation> </message> <message> - <source>Priority</source> - <translation>Öncelik</translation> + <source>Copy address</source> + <translation>Adres kopyala</translation> + </message> + <message> + <source>Copy label</source> + <translation>Etiket kopyala</translation> + </message> + <message> + <source>Copy amount</source> + <translation>Tutarı kopyala</translation> + </message> + <message> + <source>Copy transaction ID</source> + <translation>İşlem ID'sini kopyala</translation> + </message> + <message> + <source>Lock unspent</source> + <translation>Harcanmamışı kilitle</translation> + </message> + <message> + <source>Unlock unspent</source> + <translation>Harcanmamışın kilidini aç</translation> + </message> + <message> + <source>Copy quantity</source> + <translation>Miktarı kopyala</translation> + </message> + <message> + <source>Copy fee</source> + <translation>Ücreti kopyala</translation> + </message> + <message> + <source>Copy after fee</source> + <translation>Ücretten sonrasını kopyala</translation> + </message> + <message> + <source>Copy bytes</source> + <translation>Baytları kopyala</translation> + </message> + <message> + <source>Copy dust</source> + <translation>Tozu kopyala</translation> + </message> + <message> + <source>Copy change</source> + <translation>Para üstünü kopyala</translation> + </message> + <message> + <source>(%1 locked)</source> + <translation>(%1 kilitlendi)</translation> + </message> + <message> + <source>yes</source> + <translation>evet</translation> + </message> + <message> + <source>no</source> + <translation>hayır</translation> + </message> + <message> + <source>This label turns red if any recipient receives an amount smaller than the current dust threshold.</source> + <translation>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.</translation> + </message> + <message> + <source>Can vary +/- %1 satoshi(s) per input.</source> + <translation>Girdi başına +/- %1 satoshi değişebilir.</translation> + </message> + <message> + <source>(no label)</source> + <translation>(etiket yok)</translation> + </message> + <message> + <source>change from %1 (%2)</source> + <translation>%1 ögesinden para üstü (%2)</translation> + </message> + <message> + <source>(change)</source> + <translation>(para üstü)</translation> </message> </context> <context> @@ -486,6 +725,38 @@ <source>&Address</source> <translation>&Adres</translation> </message> + <message> + <source>New receiving address</source> + <translation>Yeni alım adresi</translation> + </message> + <message> + <source>New sending address</source> + <translation>Yeni gönderi adresi</translation> + </message> + <message> + <source>Edit receiving address</source> + <translation>Alım adresini düzenle</translation> + </message> + <message> + <source>Edit sending address</source> + <translation>Gönderi adresini düzenle</translation> + </message> + <message> + <source>The entered address "%1" is not a valid Bitcoin address.</source> + <translation>Girilen "%1" adresi geçerli bir Bitcoin adresi değildir.</translation> + </message> + <message> + <source>The entered address "%1" is already in the address book.</source> + <translation>Girilen "%1" adresi zaten adres defterinde mevcuttur.</translation> + </message> + <message> + <source>Could not unlock wallet.</source> + <translation>Cüzdan kilidi açılamadı.</translation> + </message> + <message> + <source>New key generation failed.</source> + <translation>Yeni anahtar oluşturulması başarısız oldu.</translation> + </message> </context> <context> <name>FreespaceChecker</name> @@ -499,7 +770,7 @@ </message> <message> <source>Directory already exists. Add %1 if you intend to create a new directory here.</source> - <translation>Klasör hâlihazırda mevcuttur. Burada yeni bir klasör oluşturmak istiyorsanız, %1 ilâve ediniz.</translation> + <translation>Klasör zaten mevcuttur. Burada yeni bir klasör oluşturmak istiyorsanız, %1 ekleyiniz.</translation> </message> <message> <source>Path already exists, and is not a directory.</source> @@ -581,7 +852,7 @@ </message> <message> <source>%1 will download and store a copy of the Bitcoin block chain. At least %2GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source> - <translation>%1, Bitcoin blok zincirinin bir kopyasını indirecek ve saklayacaktır. Bu klasörde en az %2GB veri saklanacak ve bu zamanla artacaktır. Cüzdan da bu klasörde saklanacaktır.</translation> + <translation>%1, Bitcoin blok zincirinin bir kopyasını indirecek ve saklayacaktır. Bu klasörde en az %2 GB veri saklanacak ve bu zamanla artacaktır. Cüzdan da bu klasörde saklanacaktır.</translation> </message> <message> <source>Use the default data directory</source> @@ -609,10 +880,61 @@ </message> </context> <context> + <name>ModalOverlay</name> + <message> + <source>Form</source> + <translation>Form</translation> + </message> + <message> + <source>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 bitcoin network, as detailed below.</source> + <translation>Son işlemler henüz görünmeyebilir ve bu nedenle cüzdanınızın bakiyesi yanlış olabilir. Bu bilgiler, aşağıda detaylandırıldığı gibi, cüzdanınız bitcoin ağı ile senkronizasyonunu tamamladığında doğru olacaktır. </translation> + </message> + <message> + <source>Attempting to spend bitcoins that are affected by not-yet-displayed transactions will not be accepted by the network.</source> + <translation>Henüz görüntülenmeyen işlemlerden etkilenen bitcoinleri harcama girişiminde bulunmak ağ tarafından kabul edilmeyecektir.</translation> + </message> + <message> + <source>Number of blocks left</source> + <translation>Kalan blok sayısı</translation> + </message> + <message> + <source>Unknown...</source> + <translation>Bilinmiyor...</translation> + </message> + <message> + <source>Last block time</source> + <translation>Son blok zamanı</translation> + </message> + <message> + <source>Progress</source> + <translation>İlerleme</translation> + </message> + <message> + <source>Progress increase per hour</source> + <translation>Saat başı ilerleme artışı</translation> + </message> + <message> + <source>calculating...</source> + <translation>hesaplanıyor...</translation> + </message> + <message> + <source>Estimated time left until synced</source> + <translation>Senkronize edilene kadar kalan tahmini süre</translation> + </message> + <message> + <source>Hide</source> + <translation>Gizle</translation> + </message> + <message> + <source>Unknown. Syncing Headers (%1)...</source> + <translation>Bilinmeyen. Üstbilgiler Senkronize Ediliyor (%1)...</translation> + </message> +</context> +<context> <name>OpenURIDialog</name> <message> <source>Open URI</source> - <translation>URI aç</translation> + <translation>URI Aç</translation> </message> <message> <source>Open payment request from URI or file</source> @@ -626,6 +948,10 @@ <source>Select payment request file</source> <translation>Ödeme talebi dosyasını seç</translation> </message> + <message> + <source>Select payment request file to open</source> + <translation>Açılacak ödeme talebi dosyasını seç</translation> + </message> </context> <context> <name>OptionsDialog</name> @@ -635,7 +961,7 @@ </message> <message> <source>&Main</source> - <translation>&Esas ayarlar</translation> + <translation>&Genel</translation> </message> <message> <source>Automatically start %1 after logging in to the system.</source> @@ -647,7 +973,7 @@ </message> <message> <source>Size of &database cache</source> - <translation>&Veritabanı tamponunun boyutu</translation> + <translation>&Veritabanı önbelleğinin boyutu</translation> </message> <message> <source>MB</source> @@ -675,15 +1001,15 @@ </message> <message> <source>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 |.</source> - <translation>Muameleler sekmesinde bağlam menüsü unsurları olarak görünen üçüncü taraf bağlantıları (mesela bir blok tarayıcısı). URL'deki %s, muamele hash değeri ile değiştirilecektir. Birden çok bağlantılar düşey çubuklar | ile ayrılacaktır.</translation> + <translation>İşlemler sekmesinde bağlam menüsü unsurları olarak görünen üçüncü taraf bağlantıları (mesela bir blok tarayıcısı). URL'deki %s, işlem hash değeri ile değiştirilecektir. Birden çok bağlantılar düşey çubuklar | ile ayrılacaktır.</translation> </message> <message> <source>Third party transaction URLs</source> - <translation>Üçüncü taraf muamele URL'leri</translation> + <translation>Üçüncü parti işlem URL'leri</translation> </message> <message> <source>Active command-line options that override above options:</source> - <translation>Yukarıdaki seçeneklerin yerine geçen faal komut satırı seçenekleri:</translation> + <translation>Yukarıdaki seçeneklerin yerine geçen etkin komut satırı seçenekleri:</translation> </message> <message> <source>Reset all client options to default.</source> @@ -691,11 +1017,11 @@ </message> <message> <source>&Reset Options</source> - <translation>Seçenekleri Sıfı&rla</translation> + <translation>Seçenekleri &Sıfırla</translation> </message> <message> <source>&Network</source> - <translation>&Şebeke</translation> + <translation>&Ağ</translation> </message> <message> <source>(0 = auto, <0 = leave that many cores free)</source> @@ -715,11 +1041,11 @@ </message> <message> <source>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.</source> - <translation>Teyit edilmemiş para üstünü harcamayı devre dışı bırakırsanız, bir muamelenin para üstü bu muamele için en az bir teyit olana dek harcanamaz. Bu, aynı zamanda bakiyenizin nasıl hesaplandığını da etkiler.</translation> + <translation>Doğrulanmamış para üstünü harcamayı devre dışı bırakırsanız, bir işlemin para üstü bu işlem için en az bir doğrulama olana dek harcanamaz. Bu, aynı zamanda bakiyenizin nasıl hesaplandığını da etkiler.</translation> </message> <message> <source>&Spend unconfirmed change</source> - <translation>Teyit edilmemiş para üstünü &harca</translation> + <translation>Doğrulanmamış para üstünü &harca</translation> </message> <message> <source>Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled.</source> @@ -731,15 +1057,15 @@ </message> <message> <source>Connect to the Bitcoin network through a SOCKS5 proxy.</source> - <translation>Bitcoin şebekesine SOCKS5 vekil sunucusu vasıtasıyla bağlan.</translation> + <translation>Bitcoin ağına bir SOCKS5 vekil sunucusu aracılığıyla bağlan.</translation> </message> <message> <source>&Connect through SOCKS5 proxy (default proxy):</source> - <translation>SOCKS5 vekil sunucusu vasıtasıyla &bağlan (varsayılan vekil sunucusu):</translation> + <translation>SOCKS5 vekil sunucusu aracılığıyla &bağlan (varsayılan vekil sunucusu):</translation> </message> <message> <source>Proxy &IP:</source> - <translation>Vekil &İP:</translation> + <translation>Vekil &IP:</translation> </message> <message> <source>&Port:</source> @@ -751,11 +1077,11 @@ </message> <message> <source>Used for reaching peers via:</source> - <translation>Eşlere ulaşmak için kullanılır, şu yoluyla:</translation> + <translation>Eşlere ulaşmak için kullanılır, şu üzerinden:</translation> </message> <message> <source>Shows, if the supplied default SOCKS5 proxy is used to reach peers via this network type.</source> - <translation>Bu şebeke türü yoluyla eşlere bağlanmak için belirtilen varsayılan SOCKS5 vekil sunucusunun kullanılıp kullanılmadığını gösterir.</translation> + <translation>Bu ağ türü yoluyla eşlere bağlanmak için belirtilen varsayılan SOCKS5 vekil sunucusunun kullanılıp kullanılmadığını gösterir.</translation> </message> <message> <source>IPv4</source> @@ -771,7 +1097,7 @@ </message> <message> <source>Connect to the Bitcoin network through a separate SOCKS5 proxy for Tor hidden services.</source> - <translation>Bitcoin şebekesine gizli Tor servisleri için ayrı bir SOCKS5 vekil sunucusu vasıtasıyla bağlan.</translation> + <translation>Bitcoin ağına gizli Tor servisleri için ayrı bir SOCKS5 vekil sunucusu aracılığıyla bağlan.</translation> </message> <message> <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services:</source> @@ -783,15 +1109,15 @@ </message> <message> <source>&Hide the icon from the system tray.</source> - <translation>İkonu sistem çekmecesinden &sakla</translation> + <translation>Simgeyi görev çubuğundan &gizle</translation> </message> <message> <source>Hide tray icon</source> - <translation>Sistem çekmecesi ikonunu sakla</translation> + <translation>Görev çubuğu simgesini gizle</translation> </message> <message> <source>Show only a tray icon after minimizing the window.</source> - <translation>Küçültüldükten sonra sadece çekmece ikonu göster.</translation> + <translation>Küçültüldükten sonra sadece tepsi simgesi göster.</translation> </message> <message> <source>&Minimize to the tray instead of the taskbar</source> @@ -815,7 +1141,7 @@ </message> <message> <source>&Unit to show amounts in:</source> - <translation>Meblağları göstermek için &birim:</translation> + <translation>Tutarı göstermek için &birim:</translation> </message> <message> <source>Choose the default subdivision unit to show in the interface and when sending coins.</source> @@ -870,7 +1196,7 @@ </message> <message> <source>The displayed information may be out of date. Your wallet automatically synchronizes with the Bitcoin network after a connection is established, but this process has not completed yet.</source> - <translation>Görüntülenen veriler zaman aşımına uğramış olabilir. Bağlantı kurulduğunda cüzdanınız otomatik olarak şebeke ile eşleşir ancak bu işlem henüz tamamlanmamıştır.</translation> + <translation>Görüntülenen bilgiler güncel olmayabilir. Bağlantı kurulduğunda cüzdanınız otomatik olarak Bitcoin ağı ile senkronize olur ancak bu işlem henüz tamamlanmamıştır.</translation> </message> <message> <source>Watch-only:</source> @@ -890,7 +1216,7 @@ </message> <message> <source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source> - <translation>Henüz teyit edilmemiş ve harcanabilir bakiyeye eklenmemiş muamelelerin toplamı</translation> + <translation>Henüz doğrulanmamış ve harcanabilir bakiyeye eklenmemiş işlemlerin toplamı</translation> </message> <message> <source>Immature:</source> @@ -922,11 +1248,11 @@ </message> <message> <source>Recent transactions</source> - <translation>Son muameleler</translation> + <translation>Son işlemler</translation> </message> <message> <source>Unconfirmed transactions to watch-only addresses</source> - <translation>Sadece izlenen adreslere gelen teyit edilmemiş muameleler</translation> + <translation>Sadece izlenen adreslere gelen doğrulanmamış işlemler</translation> </message> <message> <source>Mined balance in watch-only addresses that has not yet matured</source> @@ -938,6 +1264,97 @@ </message> </context> <context> + <name>PaymentServer</name> + <message> + <source>Payment request error</source> + <translation>Ödeme talebi hatası</translation> + </message> + <message> + <source>Cannot start bitcoin: click-to-pay handler</source> + <translation>Bitcoin başlatılamadı: tıkla-ve-öde yöneticisi</translation> + </message> + <message> + <source>URI handling</source> + <translation>URI yönetimi</translation> + </message> + <message> + <source>Payment request fetch URL is invalid: %1</source> + <translation>Ödeme talebini alma URL'i geçersiz: %1</translation> + </message> + <message> + <source>Invalid payment address %1</source> + <translation>%1 ödeme adresi geçersizdir</translation> + </message> + <message> + <source>URI cannot be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters.</source> + <translation>URI ayrıştırılamıyor! Bunun nedeni geçersiz bir Bitcoin adresi veya hatalı biçimlendirilmiş URI değişkenleri olabilir.</translation> + </message> + <message> + <source>Payment request file handling</source> + <translation>Ödeme talebi dosyası yönetimi</translation> + </message> + <message> + <source>Payment request file cannot be read! This can be caused by an invalid payment request file.</source> + <translation>Ödeme talebi dosyası okunamıyor! Bunun nedeni geçersiz bir ödeme talebi dosyası olabilir.</translation> + </message> + <message> + <source>Payment request rejected</source> + <translation>Ödeme talebi reddedildi</translation> + </message> + <message> + <source>Payment request network doesn't match client network.</source> + <translation>Ödeme talebi ağı, istemci ağıyla eşleşmiyor.</translation> + </message> + <message> + <source>Payment request expired.</source> + <translation>Ödeme talebinin geçerlilik süresi bitti.</translation> + </message> + <message> + <source>Payment request is not initialized.</source> + <translation>Ödeme talebi başlatılmadı.</translation> + </message> + <message> + <source>Unverified payment requests to custom payment scripts are unsupported.</source> + <translation>Özel ödeme betiklerine, doğrulanmamış ödeme talepleri desteklenmez.</translation> + </message> + <message> + <source>Invalid payment request.</source> + <translation>Geçersiz ödeme talebi.</translation> + </message> + <message> + <source>Requested payment amount of %1 is too small (considered dust).</source> + <translation>Talep edilen %1 ödeme tutarı çok küçüktür (toz olarak kabul edilir).</translation> + </message> + <message> + <source>Refund from %1</source> + <translation>%1 adresinden geri ödeme</translation> + </message> + <message> + <source>Payment request %1 is too large (%2 bytes, allowed %3 bytes).</source> + <translation>%1 ödeme talebi çok büyük (%2 bayt, üst sınır %3 bayt).</translation> + </message> + <message> + <source>Error communicating with %1: %2</source> + <translation>%1 ile iletişimde hata: %2</translation> + </message> + <message> + <source>Payment request cannot be parsed!</source> + <translation>Ödeme talebi ayrıştırılamaz!</translation> + </message> + <message> + <source>Bad response from server %1</source> + <translation>%1 sunucusundan hatalı yanıt</translation> + </message> + <message> + <source>Network request error</source> + <translation>Ağ talebi hatası</translation> + </message> + <message> + <source>Payment acknowledged</source> + <translation>Ödeme kabul edildi</translation> + </message> +</context> +<context> <name>PeerTableModel</name> <message> <source>User Agent</source> @@ -948,15 +1365,19 @@ <translation>Düğüm/Servis</translation> </message> <message> - <source>Ping Time</source> - <translation>Ping Süresi</translation> + <source>NodeId</source> + <translation>Düğüm ID'si</translation> + </message> + <message> + <source>Ping</source> + <translation>Ping</translation> </message> </context> <context> <name>QObject</name> <message> <source>Amount</source> - <translation>Meblağ</translation> + <translation>Tutar</translation> </message> <message> <source>Enter a Bitcoin address (e.g. %1)</source> @@ -990,6 +1411,72 @@ <source>%1 ms</source> <translation>%1 ms</translation> </message> + <message numerus="yes"> + <source>%n second(s)</source> + <translation><numerusform>%n saniye</numerusform><numerusform>%n saniye</numerusform></translation> + </message> + <message numerus="yes"> + <source>%n minute(s)</source> + <translation><numerusform>%n dakika</numerusform><numerusform>%n dakika</numerusform></translation> + </message> + <message numerus="yes"> + <source>%n hour(s)</source> + <translation><numerusform>%n saat</numerusform><numerusform>%n saat</numerusform></translation> + </message> + <message numerus="yes"> + <source>%n day(s)</source> + <translation><numerusform>%n gün</numerusform><numerusform>%n gün</numerusform></translation> + </message> + <message numerus="yes"> + <source>%n week(s)</source> + <translation><numerusform>%n hafta</numerusform><numerusform>%n hafta</numerusform></translation> + </message> + <message> + <source>%1 and %2</source> + <translation>%1 ve %2</translation> + </message> + <message numerus="yes"> + <source>%n year(s)</source> + <translation><numerusform>%n yıl</numerusform><numerusform>%n yıl</numerusform></translation> + </message> + <message> + <source>%1 didn't yet exit safely...</source> + <translation>%1 henüz güvenli bir şekilde çıkış yapmamıştır...</translation> + </message> +</context> +<context> + <name>QObject::QObject</name> + <message> + <source>Error: Specified data directory "%1" does not exist.</source> + <translation>Hata: Belirtilen "%1" veri klasörü yoktur.</translation> + </message> + <message> + <source>Error: Cannot parse configuration file: %1. Only use key=value syntax.</source> + <translation>Hata: %1 yapılandırma dosyası ayrıştırılamadı. Sadece anahtar=değer dizimini kullanınız.</translation> + </message> + <message> + <source>Error: %1</source> + <translation>Hata: %1</translation> + </message> +</context> +<context> + <name>QRImageWidget</name> + <message> + <source>&Save Image...</source> + <translation>Resmi ka&ydet...</translation> + </message> + <message> + <source>&Copy Image</source> + <translation>Resmi &Kopyala</translation> + </message> + <message> + <source>Save QR Code</source> + <translation>QR Kodu Kaydet</translation> + </message> + <message> + <source>PNG Image (*.png)</source> + <translation>PNG Resim (*.png)</translation> + </message> </context> <context> <name>RPCConsole</name> @@ -1003,7 +1490,7 @@ </message> <message> <source>&Information</source> - <translation>&Malumat</translation> + <translation>&Bilgi</translation> </message> <message> <source>Debug window</source> @@ -1027,7 +1514,7 @@ </message> <message> <source>Network</source> - <translation>Şebeke</translation> + <translation>Ağ</translation> </message> <message> <source>Name</source> @@ -1051,7 +1538,7 @@ </message> <message> <source>Current number of transactions</source> - <translation>Güncel muamele sayısı</translation> + <translation>Güncel işlem sayısı</translation> </message> <message> <source>Memory usage</source> @@ -1095,7 +1582,7 @@ </message> <message> <source>Synced Headers</source> - <translation>Eşleşmiş Başlıklar</translation> + <translation>Eşleşmiş Üstbilgiler</translation> </message> <message> <source>Synced Blocks</source> @@ -1150,6 +1637,10 @@ <translation>Ping Beklemesi</translation> </message> <message> + <source>Min Ping</source> + <translation>En Düşük Ping</translation> + </message> + <message> <source>Time Offset</source> <translation>Saat Farkı</translation> </message> @@ -1167,7 +1658,7 @@ </message> <message> <source>&Network Traffic</source> - <translation>&Şebeke trafiği</translation> + <translation>&Ağ trafiği</translation> </message> <message> <source>&Clear</source> @@ -1194,14 +1685,6 @@ <translation>Konsolu temizle</translation> </message> <message> - <source>&Disconnect Node</source> - <translation>Düğümle Bağlantıyı &Kes</translation> - </message> - <message> - <source>Ban Node for</source> - <translation>Düğümü şu süre için yasakla:</translation> - </message> - <message> <source>1 &hour</source> <translation>1 &saat</translation> </message> @@ -1218,8 +1701,16 @@ <translation>1 &yıl</translation> </message> <message> - <source>&Unban Node</source> - <translation>Düğümün Yasağını Kald&ır</translation> + <source>&Disconnect</source> + <translation>&Bağlantıyı Kes</translation> + </message> + <message> + <source>Ban for</source> + <translation>Yasakla</translation> + </message> + <message> + <source>&Unban</source> + <translation>&Yasaklamayı Kaldır</translation> </message> <message> <source>Welcome to the %1 RPC console.</source> @@ -1227,13 +1718,21 @@ </message> <message> <source>Use up and down arrows to navigate history, and <b>Ctrl-L</b> to clear screen.</source> - <translation>Tarihçede gezinmek için imleç tuşlarını kullanınız, <b>Ctrl-L</b> ile de ekranı temizleyebilirsiniz.</translation> + <translation>Tarihçede gezinmek için aşağı ve yukarı ok tuşlarını kullanınız, <b>Ctrl-L</b> ile de ekranı temizleyebilirsiniz.</translation> </message> <message> <source>Type <b>help</b> for an overview of available commands.</source> <translation>Mevcut komutların listesi için <b>help</b> yazınız.</translation> </message> <message> + <source>WARNING: Scammers have been active, telling users to type commands here, stealing their wallet contents. Do not use this console without fully understanding the ramification of a command.</source> + <translation>UYARI: Bitcoin dolandırıcılarının çok fazla etkin olduğu zamanlarda, dolandırıcılar bazı kullanıcılara buraya komutlar yazmalarını söylerek onların cüzdanlarındaki bitcoinleri çalmışlardır. Bir komutun sonuçlarını tam olarak anlamadan bu konsolu kullanmayın.</translation> + </message> + <message> + <source>Network activity disabled</source> + <translation>Ağ etkinliği devre dışı bırakıldı</translation> + </message> + <message> <source>%1 B</source> <translation>%1 B</translation> </message> @@ -1286,7 +1785,7 @@ <name>ReceiveCoinsDialog</name> <message> <source>&Amount:</source> - <translation>&Meblağ:</translation> + <translation>&Tutar:</translation> </message> <message> <source>&Label:</source> @@ -1294,7 +1793,7 @@ </message> <message> <source>&Message:</source> - <translation>Me&saj:</translation> + <translation>&İleti:</translation> </message> <message> <source>Reuse one of the previously used receiving addresses. Reusing addresses has security and privacy issues. Do not use this unless re-generating a payment request made before.</source> @@ -1306,7 +1805,7 @@ </message> <message> <source>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 Bitcoin network.</source> - <translation>Talep açıldığında gösterilecek, isteğinize dayalı, ödeme talebi ile ilişkilendirilecek bir mesaj. Not: Bu mesaj ödeme ile birlikte Bitcoin şebekesi üzerinden gönderilmeyecektir.</translation> + <translation>Talep açıldığında gösterilecek, isteğinize dayalı, ödeme talebi ile ilişkilendirilecek bir ileti. Not: Bu ileti ödeme ile birlikte Bitcoin ağı üzerinden gönderilmeyecektir.</translation> </message> <message> <source>An optional label to associate with the new receiving address.</source> @@ -1318,7 +1817,7 @@ </message> <message> <source>An optional amount to request. Leave this empty or zero to not request a specific amount.</source> - <translation>Seçiminize dayalı talep edilecek meblağ. Belli bir meblağ talep etmemek için bunu boş bırakın veya sıfır değerini kullanın.</translation> + <translation>Seçiminize dayalı talep edilecek tutar. Belli bir tutar talep etmemek için bunu boş bırakın veya sıfır değerini kullanın.</translation> </message> <message> <source>Clear all fields of the form.</source> @@ -1352,6 +1851,22 @@ <source>Remove</source> <translation>Kaldır</translation> </message> + <message> + <source>Copy URI</source> + <translation>URI'yi kopyala</translation> + </message> + <message> + <source>Copy label</source> + <translation>Etiket kopyala</translation> + </message> + <message> + <source>Copy message</source> + <translation>İletiyi kopyala</translation> + </message> + <message> + <source>Copy amount</source> + <translation>Tutarı kopyala</translation> + </message> </context> <context> <name>ReceiveRequestDialog</name> @@ -1371,6 +1886,73 @@ <source>&Save Image...</source> <translation>Resmi ka&ydet...</translation> </message> + <message> + <source>Request payment to %1</source> + <translation>%1 unsuruna ödeme talep et</translation> + </message> + <message> + <source>Payment information</source> + <translation>Ödeme bilgisi</translation> + </message> + <message> + <source>URI</source> + <translation>URI</translation> + </message> + <message> + <source>Address</source> + <translation>Adres</translation> + </message> + <message> + <source>Amount</source> + <translation>Tutar</translation> + </message> + <message> + <source>Label</source> + <translation>Etiket</translation> + </message> + <message> + <source>Message</source> + <translation>İleti</translation> + </message> + <message> + <source>Resulting URI too long, try to reduce the text for label / message.</source> + <translation>Sonuç URI çok uzun, etiket ya da ileti metnini kısaltmayı deneyiniz.</translation> + </message> + <message> + <source>Error encoding URI into QR Code.</source> + <translation>URI'nin QR koduna kodlanmasında hata oluştu.</translation> + </message> +</context> +<context> + <name>RecentRequestsTableModel</name> + <message> + <source>Date</source> + <translation>Tarih</translation> + </message> + <message> + <source>Label</source> + <translation>Etiket</translation> + </message> + <message> + <source>Message</source> + <translation>İleti</translation> + </message> + <message> + <source>(no label)</source> + <translation>(etiket yok)</translation> + </message> + <message> + <source>(no message)</source> + <translation>(ileti yok)</translation> + </message> + <message> + <source>(no amount requested)</source> + <translation>(tutar talep edilmedi)</translation> + </message> + <message> + <source>Requested</source> + <translation>Talep edilen</translation> + </message> </context> <context> <name>SendCoinsDialog</name> @@ -1404,11 +1986,7 @@ </message> <message> <source>Amount:</source> - <translation>Meblağ:</translation> - </message> - <message> - <source>Priority:</source> - <translation>Öncelik:</translation> + <translation>Tutar:</translation> </message> <message> <source>Fee:</source> @@ -1432,7 +2010,7 @@ </message> <message> <source>Transaction Fee:</source> - <translation>Muamele ücreti:</translation> + <translation>İşlem ücreti:</translation> </message> <message> <source>Choose...</source> @@ -1448,11 +2026,11 @@ </message> <message> <source>If the custom fee is set to 1000 satoshis and the transaction is only 250 bytes, then "per kilobyte" only pays 250 satoshis in fee, while "total at least" pays 1000 satoshis. For transactions bigger than a kilobyte both pay by kilobyte.</source> - <translation>Eğer özel ücret 1000 satoşi olarak ayarlandıysa ve muamele sadece 250 baytsa, "kilobayt başı" ücret olarak sadece 250 satoşi öder ve "toplam asgari" 1000 satoşi öder. Bir kilobayttan yüksek muameleler için ikisi de kilobayt başı ödeme yapar.</translation> + <translation>Eğer özel ücret 1000 satoşi olarak ayarlandıysa ve işlem sadece 250 baytsa, "kilobayt başı" ücret olarak sadece 250 satoşi öder ve "toplam asgari" 1000 satoşi öder. Bir kilobayttan yüksek işlemler için ikisi de kilobayt başı ödeme yapar.</translation> </message> <message> <source>Hide</source> - <translation>Sakla</translation> + <translation>Gizle</translation> </message> <message> <source>total at least</source> @@ -1460,7 +2038,7 @@ </message> <message> <source>Paying only the minimum fee is just fine as long as there is less transaction volume than space in the blocks. But be aware that this can end up in a never confirming transaction once there is more demand for bitcoin transactions than the network can process.</source> - <translation>Asgari ücreti ödemek, bloklarda boşluktan daha az muamele hacmi olduğu sürece bir sorun çıkarmaz. Fakat şebekenin işleyecebileceğinden daha çok bitcoin muameleleri talebi olduğunda bunun asla teyit edilmeyen bir muamele olabileceğinin farkında olmalısınız.</translation> + <translation>Gerekli olan en az ücreti ödemek, bloklarda boşluktan daha az işlem hacmi olduğu sürece bir sorun çıkarmaz. Fakat ağın işleyecebileceğinden daha çok bitcoin işlemi talebi olduğunda bunun asla doğrulanmayan bir işlem olabileceğinin farkında olmalısınız.</translation> </message> <message> <source>(read the tooltip)</source> @@ -1479,10 +2057,6 @@ <translation>(Zeki ücret henüz başlatılmadı. Bu genelde birkaç blok alır...)</translation> </message> <message> - <source>Confirmation time:</source> - <translation>Teyit süresi:</translation> - </message> - <message> <source>normal</source> <translation>normal</translation> </message> @@ -1507,6 +2081,10 @@ <translation>Toz:</translation> </message> <message> + <source>Confirmation time target:</source> + <translation>Doğrulama süresi hedefi:</translation> + </message> + <message> <source>Clear &All</source> <translation>Tümünü &temizle</translation> </message> @@ -1522,12 +2100,128 @@ <source>S&end</source> <translation>G&önder</translation> </message> + <message> + <source>Copy quantity</source> + <translation>Miktarı kopyala</translation> + </message> + <message> + <source>Copy amount</source> + <translation>Tutarı kopyala</translation> + </message> + <message> + <source>Copy fee</source> + <translation>Ücreti kopyala</translation> + </message> + <message> + <source>Copy after fee</source> + <translation>Ücretten sonrasını kopyala</translation> + </message> + <message> + <source>Copy bytes</source> + <translation>Baytları kopyala</translation> + </message> + <message> + <source>Copy dust</source> + <translation>Tozu kopyala</translation> + </message> + <message> + <source>Copy change</source> + <translation>Para üstünü kopyala</translation> + </message> + <message> + <source>%1 to %2</source> + <translation>%1 ögesinden %2 unsuruna</translation> + </message> + <message> + <source>Are you sure you want to send?</source> + <translation>Göndermek istediğinizden emin misiniz?</translation> + </message> + <message> + <source>added as transaction fee</source> + <translation>işlem ücreti olarak eklendi</translation> + </message> + <message> + <source>Total Amount %1</source> + <translation>Toplam Tutar %1</translation> + </message> + <message> + <source>or</source> + <translation>veya</translation> + </message> + <message> + <source>Confirm send coins</source> + <translation>Bitcoin gönderimini onaylayın</translation> + </message> + <message> + <source>The recipient address is not valid. Please recheck.</source> + <translation>Alıcı adresi geçerli değildir. Lütfen tekrar kontrol ediniz.</translation> + </message> + <message> + <source>The amount to pay must be larger than 0.</source> + <translation>Ödeyeceğiniz tutarın 0'dan yüksek olması gerekir.</translation> + </message> + <message> + <source>The amount exceeds your balance.</source> + <translation>Tutar bakiyenizden yüksektir.</translation> + </message> + <message> + <source>The total exceeds your balance when the %1 transaction fee is included.</source> + <translation>Toplam, %1 işlem ücreti eklendiğinde bakiyenizi geçmektedir.</translation> + </message> + <message> + <source>Duplicate address found: addresses should only be used once each.</source> + <translation>Tekrarlayan adres bulundu: adresler sadece bir kez kullanılmalıdır.</translation> + </message> + <message> + <source>Transaction creation failed!</source> + <translation>İşlem oluşturma başarısız!</translation> + </message> + <message> + <source>The transaction was rejected with the following reason: %1</source> + <translation>İşlem şu nedenden dolayı reddedildi: %1</translation> + </message> + <message> + <source>A fee higher than %1 is considered an absurdly high fee.</source> + <translation>%1 tutarından yüksek bir ücret saçma derecede yüksek bir ücret olarak kabul edilir.</translation> + </message> + <message> + <source>Payment request expired.</source> + <translation>Ödeme talebinin geçerlilik süresi bitti.</translation> + </message> + <message numerus="yes"> + <source>%n block(s)</source> + <translation><numerusform>%n blok</numerusform><numerusform>%n blok</numerusform></translation> + </message> + <message> + <source>Pay only the required fee of %1</source> + <translation>Sadece asgari ücret olan %1 tutarını öde</translation> + </message> + <message> + <source>Warning: Invalid Bitcoin address</source> + <translation>Uyarı: geçersiz Bitcoin adresi</translation> + </message> + <message> + <source>Warning: Unknown change address</source> + <translation>Uyarı: Bilinmeyen para üstü adresi</translation> + </message> + <message> + <source>Confirm custom change address</source> + <translation>Özel para üstü adresini onayla</translation> + </message> + <message> + <source>The address you selected for change is not part of this wallet. Any or all funds in your wallet may be sent to this address. Are you sure?</source> + <translation>Para üstü için seçtiğiniz adres bu cüzdanın bir parçası değil. Cüzdanınızdaki bir miktar veya tüm para bu adrese gönderilebilir. Emin misiniz?</translation> + </message> + <message> + <source>(no label)</source> + <translation>(etiket yok)</translation> + </message> </context> <context> <name>SendCoinsEntry</name> <message> <source>A&mount:</source> - <translation>Mebla&ğ:</translation> + <translation>T&utar:</translation> </message> <message> <source>Pay &To:</source> @@ -1563,19 +2257,19 @@ </message> <message> <source>Remove this entry</source> - <translation>Bu unsuru kaldır</translation> + <translation>Bu ögeyi kaldır</translation> </message> <message> <source>The fee will be deducted from the amount being sent. The recipient will receive less bitcoins than you enter in the amount field. If multiple recipients are selected, the fee is split equally.</source> - <translation>Ücret yollanan meblağdan alınacaktır. Alıcı meblağ alanında girdiğinizden daha az bitcoin alacaktır. Eğer birden çok alıcı seçiliyse ücret eşit olarak bölünecektir.</translation> + <translation>Ücret yollanan tutardan alınacaktır. Alıcı tutar alanına girdiğinizden daha az bitcoin alacaktır. Eğer birden çok alıcı seçiliyse ücret eşit olarak bölünecektir.</translation> </message> <message> <source>S&ubtract fee from amount</source> - <translation>Ücreti meblağdan düş</translation> + <translation>Ücreti tutardan düş</translation> </message> <message> <source>Message:</source> - <translation>Mesaj:</translation> + <translation>İleti:</translation> </message> <message> <source>This is an unauthenticated payment request.</source> @@ -1591,7 +2285,7 @@ </message> <message> <source>A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source> - <translation>Bitcoin: URI'siyle ilişkili ve bilginiz için muameleyle saklanacak bir mesaj. Not: Bu mesaj Bitcoin şebekesi üzerinden gönderilmeyecektir.</translation> + <translation>Referans için bitcoin: URI'siyle iliştirilmiş işlemle birlikte depolanacak bir ileti. Not: Bu mesaj Bitcoin ağı üzerinden gönderilmeyecektir.</translation> </message> <message> <source>Pay To:</source> @@ -1601,6 +2295,17 @@ <source>Memo:</source> <translation>Not:</translation> </message> + <message> + <source>Enter a label for this address to add it to your address book</source> + <translation>Adres defterinize eklemek için bu adrese bir etiket giriniz</translation> + </message> +</context> +<context> + <name>SendConfirmationDialog</name> + <message> + <source>Yes</source> + <translation>Evet</translation> + </message> </context> <context> <name>ShutdownWindow</name> @@ -1617,19 +2322,19 @@ <name>SignVerifyMessageDialog</name> <message> <source>Signatures - Sign / Verify a Message</source> - <translation>İmzalar - Mesaj İmzala / Kontrol et</translation> + <translation>İmzalar - İleti İmzala / Kontrol et</translation> </message> <message> <source>&Sign Message</source> - <translation>Mesaj &imzala</translation> + <translation>İleti &imzala</translation> </message> <message> <source>You can sign messages/agreements with your addresses to prove you can receive bitcoins 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.</source> - <translation>Adreslerinize yollanan bitcoinleri alabileceğiniz ispatlamak için adreslerinizle mesaj/anlaşma imzalayabilirsiniz. Oltalama saldırılarının kimliğinizi imzanızla elde etmeyi deneyebilecekleri için belirsiz ya da rastgele hiçbir şey imzalamamaya dikkat ediniz. Sadece ayrıntılı açıklaması olan ve tümüne katıldığınız ifadeleri imzalayınız.</translation> + <translation>Adreslerinize yollanan bitcoinleri alabileceğiniz ispatlamak için adreslerinizle iletiler/anlaşmalar imzalayabilirsiniz. Oltalama saldırılarının kimliğinizi imzanızla elde etmeyi deneyebilecekleri için belirsiz ya da rastgele hiçbir şey imzalamamaya dikkat ediniz. Sadece ayrıntılı açıklaması olan ve tümüne katıldığınız ifadeleri imzalayınız.</translation> </message> <message> <source>The Bitcoin address to sign the message with</source> - <translation>Mesajın imzalanmasında kullanılacak Bitcoin adresi</translation> + <translation>İletinin imzalanmasında kullanılacak Bitcoin adresi</translation> </message> <message> <source>Choose previously used address</source> @@ -1649,7 +2354,7 @@ </message> <message> <source>Enter the message you want to sign here</source> - <translation>İmzalamak istediğiniz mesajı burada giriniz</translation> + <translation>İmzalamak istediğiniz iletiyi burada giriniz</translation> </message> <message> <source>Signature</source> @@ -1661,15 +2366,15 @@ </message> <message> <source>Sign the message to prove you own this Bitcoin address</source> - <translation>Bu Bitcoin adresinin sizin olduğunu ispatlamak için mesajı imzalayın</translation> + <translation>Bu Bitcoin adresinin sizin olduğunu ispatlamak için iletiyi imzalayın</translation> </message> <message> <source>Sign &Message</source> - <translation>&Mesajı imzala</translation> + <translation>&İletiyi imzala</translation> </message> <message> <source>Reset all sign message fields</source> - <translation>Tüm mesaj alanlarını sıfırla</translation> + <translation>Tüm ileti alanlarını sıfırla</translation> </message> <message> <source>Clear &All</source> @@ -1677,27 +2382,79 @@ </message> <message> <source>&Verify Message</source> - <translation>Mesaj &kontrol et</translation> + <translation>İletiyi &kontrol et</translation> </message> <message> <source>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!</source> - <translation>Alıcının adresini, mesajı (satır sonları, boşluklar, sekmeler vs. karakterleri tam olarak kopyaladığınızdan emin olunuz) ve imzayı aşağıda giriniz. Bir ortadaki adam saldırısı tarafından kandırılmaya mâni olmak için imzadan, imzalı mesajın 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 muamelenin gönderi tarafını kanıtlayamayacağını unutmayınız!</translation> + <translation>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!</translation> </message> <message> <source>The Bitcoin address the message was signed with</source> - <translation>Mesajın imzalanmasında kullanılan Bitcoin adresi</translation> + <translation>İletinin imzalanmasında kullanılan Bitcoin adresi</translation> </message> <message> <source>Verify the message to ensure it was signed with the specified Bitcoin address</source> - <translation>Belirtilen Bitcoin adresi ile imzalandığını doğrulamak için mesajı kontrol et</translation> + <translation>Belirtilen Bitcoin adresi ile imzalandığını doğrulamak için iletiyi kontrol et</translation> </message> <message> <source>Verify &Message</source> - <translation>&Mesaj kontrol et</translation> + <translation>&İletiyi kontrol et</translation> </message> <message> <source>Reset all verify message fields</source> - <translation>Tüm mesaj kontrolü alanlarını sıfırla</translation> + <translation>Tüm ileti kontrolü alanlarını sıfırla</translation> + </message> + <message> + <source>Click "Sign Message" to generate signature</source> + <translation>İmzayı oluşturmak için "İletiyi İmzala"ya tıklayın</translation> + </message> + <message> + <source>The entered address is invalid.</source> + <translation>Girilen adres geçersizdir.</translation> + </message> + <message> + <source>Please check the address and try again.</source> + <translation>Lütfen adresi kontrol edip tekrar deneyiniz.</translation> + </message> + <message> + <source>The entered address does not refer to a key.</source> + <translation>Girilen adres herhangi bir anahtara işaret etmemektedir.</translation> + </message> + <message> + <source>Wallet unlock was cancelled.</source> + <translation>Cüzdan kilidinin açılması iptal edildi.</translation> + </message> + <message> + <source>Private key for the entered address is not available.</source> + <translation>Girilen adres için özel anahtar mevcut değildir.</translation> + </message> + <message> + <source>Message signing failed.</source> + <translation>İleti imzalaması başarısız oldu.</translation> + </message> + <message> + <source>Message signed.</source> + <translation>İleti imzalandı.</translation> + </message> + <message> + <source>The signature could not be decoded.</source> + <translation>İmzanın kodu çözülemedi.</translation> + </message> + <message> + <source>Please check the signature and try again.</source> + <translation>Lütfen imzayı kontrol edip tekrar deneyiniz.</translation> + </message> + <message> + <source>The signature did not match the message digest.</source> + <translation>İmza iletinin özeti ile eşleşmedi.</translation> + </message> + <message> + <source>Message verification failed.</source> + <translation>İleti doğrulaması başarısız oldu.</translation> + </message> + <message> + <source>Message verified.</source> + <translation>İleti doğrulandı.</translation> </message> </context> <context> @@ -1715,17 +2472,515 @@ </message> </context> <context> + <name>TransactionDesc</name> + <message numerus="yes"> + <source>Open for %n more block(s)</source> + <translation><numerusform>%n taneden daha fazla blok için açık</numerusform><numerusform>%n taneden daha fazla blok için açık</numerusform></translation> + </message> + <message> + <source>Open until %1</source> + <translation>%1 değerine dek açık</translation> + </message> + <message> + <source>conflicted with a transaction with %1 confirmations</source> + <translation>%1 doğrulamalı bir işlem ile çelişti</translation> + </message> + <message> + <source>%1/offline</source> + <translation>%1/çevrim dışı</translation> + </message> + <message> + <source>0/unconfirmed, %1</source> + <translation>0/doğrulanmamış, %1</translation> + </message> + <message> + <source>in memory pool</source> + <translation>bellek alanında</translation> + </message> + <message> + <source>not in memory pool</source> + <translation>bellek alanında değil</translation> + </message> + <message> + <source>abandoned</source> + <translation>terk edilmiş</translation> + </message> + <message> + <source>%1/unconfirmed</source> + <translation>%1/doğrulanmadı</translation> + </message> + <message> + <source>%1 confirmations</source> + <translation>%1 doğrulama</translation> + </message> + <message> + <source>Status</source> + <translation>Durum</translation> + </message> + <message> + <source>, has not been successfully broadcast yet</source> + <translation>, henüz başarılı bir şekilde yayınlanmadı</translation> + </message> + <message numerus="yes"> + <source>, broadcast through %n node(s)</source> + <translation><numerusform>, %n düğüm aracılığıyla yayınlandı</numerusform><numerusform>, %n düğüm aracılığıyla yayınlandı</numerusform></translation> + </message> + <message> + <source>Date</source> + <translation>Tarih</translation> + </message> + <message> + <source>Source</source> + <translation>Kaynak</translation> + </message> + <message> + <source>Generated</source> + <translation>Oluşturuldu</translation> + </message> + <message> + <source>From</source> + <translation>Gönderen</translation> + </message> + <message> + <source>unknown</source> + <translation>bilinmiyor</translation> + </message> + <message> + <source>To</source> + <translation>Alıcı</translation> + </message> + <message> + <source>own address</source> + <translation>kendi adresiniz</translation> + </message> + <message> + <source>watch-only</source> + <translation>sadece-izlenen</translation> + </message> + <message> + <source>label</source> + <translation>etiket</translation> + </message> + <message> + <source>Credit</source> + <translation>Alınan Tutar</translation> + </message> + <message numerus="yes"> + <source>matures in %n more block(s)</source> + <translation><numerusform>%n ek blok sonrasında olgunlaşacak</numerusform><numerusform>%n ek blok sonrasında olgunlaşacak</numerusform></translation> + </message> + <message> + <source>not accepted</source> + <translation>kabul edilmedi</translation> + </message> + <message> + <source>Debit</source> + <translation>Çekilen Tutar</translation> + </message> + <message> + <source>Total debit</source> + <translation>Toplam çekilen tutar</translation> + </message> + <message> + <source>Total credit</source> + <translation>Toplam alınan tutar</translation> + </message> + <message> + <source>Transaction fee</source> + <translation>İşlem ücreti</translation> + </message> + <message> + <source>Net amount</source> + <translation>Net tutar</translation> + </message> + <message> + <source>Message</source> + <translation>İleti</translation> + </message> + <message> + <source>Comment</source> + <translation>Yorum</translation> + </message> + <message> + <source>Transaction ID</source> + <translation>İşlem ID'si</translation> + </message> + <message> + <source>Transaction total size</source> + <translation>İşlemin toplam boyutu</translation> + </message> + <message> + <source>Output index</source> + <translation>Çıktı indeksi</translation> + </message> + <message> + <source>Merchant</source> + <translation>Tüccar</translation> + </message> + <message> + <source>Generated coins must mature %1 blocks before they can be spent. When you generated this block, it was broadcast to the network to be added to the block chain. If it fails to get into the chain, its state will change to "not accepted" and it won't be spendable. This may occasionally happen if another node generates a block within a few seconds of yours.</source> + <translation>Oluşturulan bitcoin'lerin harcanabilmelerinden önce %1 blok beklemeleri gerekmektedir. Bu blok, oluşturduğunuzda, blok zincirine eklenmesi için ağda yayınlandı. Zincire eklenmesi başarısız olursa, durumu "kabul edilmedi" olarak değiştirilecek ve harcanamayacaktır. Bu, bazen başka bir düğüm sizden birkaç saniye önce ya da sonra blok oluşturursa meydana gelebilir.</translation> + </message> + <message> + <source>Debug information</source> + <translation>Hata ayıklama bilgisi</translation> + </message> + <message> + <source>Transaction</source> + <translation>İşlem</translation> + </message> + <message> + <source>Inputs</source> + <translation>Girdiler</translation> + </message> + <message> + <source>Amount</source> + <translation>Tutar</translation> + </message> + <message> + <source>true</source> + <translation>doğru</translation> + </message> + <message> + <source>false</source> + <translation>yanlış</translation> + </message> +</context> +<context> <name>TransactionDescDialog</name> <message> <source>This pane shows a detailed description of the transaction</source> - <translation>Bu pano muamelenin ayrıntılı açıklamasını gösterir</translation> + <translation>Bu pano işlemin ayrıntılı açıklamasını gösterir</translation> + </message> + <message> + <source>Details for %1</source> + <translation>%1 için ayrıntılar</translation> + </message> +</context> +<context> + <name>TransactionTableModel</name> + <message> + <source>Date</source> + <translation>Tarih</translation> + </message> + <message> + <source>Type</source> + <translation>Tür</translation> + </message> + <message> + <source>Label</source> + <translation>Etiket</translation> + </message> + <message numerus="yes"> + <source>Open for %n more block(s)</source> + <translation><numerusform>%n taneden daha fazla blok için açık</numerusform><numerusform>%n taneden daha fazla blok için açık</numerusform></translation> + </message> + <message> + <source>Open until %1</source> + <translation>%1 değerine dek açık</translation> + </message> + <message> + <source>Offline</source> + <translation>Çevrim dışı</translation> + </message> + <message> + <source>Unconfirmed</source> + <translation>Doğrulanmamış</translation> + </message> + <message> + <source>Abandoned</source> + <translation>Terk edilmiş</translation> + </message> + <message> + <source>Confirming (%1 of %2 recommended confirmations)</source> + <translation>Doğrulanıyor (%1 kere doğrulandı, önerilen doğrulama sayısı %2)</translation> + </message> + <message> + <source>Confirmed (%1 confirmations)</source> + <translation>Doğrulandı (%1 doğrulama)</translation> + </message> + <message> + <source>Conflicted</source> + <translation>Uyuşmadı</translation> + </message> + <message> + <source>Immature (%1 confirmations, will be available after %2)</source> + <translation>Olgunlaşmamış (%1 doğrulama, %2 doğrulama sonra kullanılabilir olacaktır)</translation> + </message> + <message> + <source>This block was not received by any other nodes and will probably not be accepted!</source> + <translation>Bu blok başka hiçbir düğüm tarafından alınmamıştır ve muhtemelen kabul edilmeyecektir!</translation> + </message> + <message> + <source>Generated but not accepted</source> + <translation>Oluşturuldu ama kabul edilmedi</translation> + </message> + <message> + <source>Received with</source> + <translation>Şununla alındı</translation> + </message> + <message> + <source>Received from</source> + <translation>Alındığı kişi</translation> + </message> + <message> + <source>Sent to</source> + <translation>Gönderildiği adres</translation> + </message> + <message> + <source>Payment to yourself</source> + <translation>Kendinize ödeme</translation> + </message> + <message> + <source>Mined</source> + <translation>Madenden çıkarılan</translation> + </message> + <message> + <source>watch-only</source> + <translation>sadece-izlenen</translation> + </message> + <message> + <source>(n/a)</source> + <translation>(mevcut değil)</translation> + </message> + <message> + <source>(no label)</source> + <translation>(etiket yok)</translation> + </message> + <message> + <source>Transaction status. Hover over this field to show number of confirmations.</source> + <translation>İşlem durumu. Doğrulama sayısını görüntülemek için fare imlecini bu alanın üzerinde tutunuz.</translation> + </message> + <message> + <source>Date and time that the transaction was received.</source> + <translation>İşlemin alındığı tarih ve zaman.</translation> + </message> + <message> + <source>Type of transaction.</source> + <translation>İşlemin türü.</translation> + </message> + <message> + <source>Whether or not a watch-only address is involved in this transaction.</source> + <translation>Bu işleme sadece-izlenen bir adresin dahil edilip, edilmediği.</translation> + </message> + <message> + <source>User-defined intent/purpose of the transaction.</source> + <translation>İşlemin kullanıcı tanımlı amacı.</translation> + </message> + <message> + <source>Amount removed from or added to balance.</source> + <translation>Bakiyeden kaldırılan ya da bakiyeye eklenen tutar.</translation> + </message> +</context> +<context> + <name>TransactionView</name> + <message> + <source>All</source> + <translation>Hepsi</translation> + </message> + <message> + <source>Today</source> + <translation>Bugün</translation> + </message> + <message> + <source>This week</source> + <translation>Bu hafta</translation> + </message> + <message> + <source>This month</source> + <translation>Bu ay</translation> + </message> + <message> + <source>Last month</source> + <translation>Geçen ay</translation> + </message> + <message> + <source>This year</source> + <translation>Bu yıl</translation> + </message> + <message> + <source>Range...</source> + <translation>Tarih Aralığı</translation> + </message> + <message> + <source>Received with</source> + <translation>Şununla alındı</translation> + </message> + <message> + <source>Sent to</source> + <translation>Gönderildiği adres</translation> + </message> + <message> + <source>To yourself</source> + <translation>Kendinize</translation> + </message> + <message> + <source>Mined</source> + <translation>Madenden çıkarılan</translation> + </message> + <message> + <source>Other</source> + <translation>Diğer</translation> + </message> + <message> + <source>Enter address or label to search</source> + <translation>Aranacak adres ya da etiket giriniz</translation> + </message> + <message> + <source>Min amount</source> + <translation>En düşük tutar</translation> + </message> + <message> + <source>Abandon transaction</source> + <translation>İşlemden vazgeç</translation> + </message> + <message> + <source>Copy address</source> + <translation>Adres kopyala</translation> + </message> + <message> + <source>Copy label</source> + <translation>Etiket kopyala</translation> + </message> + <message> + <source>Copy amount</source> + <translation>Tutarı kopyala</translation> + </message> + <message> + <source>Copy transaction ID</source> + <translation>İşlem ID'sini kopyala</translation> + </message> + <message> + <source>Copy raw transaction</source> + <translation>Ham işlemi kopyala</translation> + </message> + <message> + <source>Copy full transaction details</source> + <translation>Tüm işlem ayrıntılarını kopyala</translation> + </message> + <message> + <source>Edit label</source> + <translation>Etiketi düzenle</translation> + </message> + <message> + <source>Show transaction details</source> + <translation>İşlem ayrıntılarını göster</translation> + </message> + <message> + <source>Export Transaction History</source> + <translation>İşlem Tarihçesini Dışarı Aktar</translation> + </message> + <message> + <source>Comma separated file (*.csv)</source> + <translation>Virgülle ayrılmış değerler dosyası (*.csv)</translation> + </message> + <message> + <source>Confirmed</source> + <translation>Doğrulandı</translation> + </message> + <message> + <source>Watch-only</source> + <translation>Sadece izlenen</translation> + </message> + <message> + <source>Date</source> + <translation>Tarih</translation> + </message> + <message> + <source>Type</source> + <translation>Tür</translation> + </message> + <message> + <source>Label</source> + <translation>Etiket</translation> + </message> + <message> + <source>Address</source> + <translation>Adres</translation> + </message> + <message> + <source>ID</source> + <translation>ID</translation> + </message> + <message> + <source>Exporting Failed</source> + <translation>Dışarı aktarmada hata</translation> + </message> + <message> + <source>There was an error trying to save the transaction history to %1.</source> + <translation>İşlem tarihçesinin %1 konumuna kaydedilmeye çalışıldığı sırada bir hata meydana geldi.</translation> + </message> + <message> + <source>Exporting Successful</source> + <translation>Dışarı Aktarma Başarılı</translation> + </message> + <message> + <source>The transaction history was successfully saved to %1.</source> + <translation>İşlem tarihçesi %1 konumuna başarıyla kaydedildi.</translation> + </message> + <message> + <source>Range:</source> + <translation>Tarih Aralığı:</translation> + </message> + <message> + <source>to</source> + <translation>Alıcı</translation> </message> </context> <context> <name>UnitDisplayStatusBarControl</name> <message> <source>Unit to show amounts in. Click to select another unit.</source> - <translation>Meblağları göstermek için birim. Başka bir birim seçmek için tıklayınız.</translation> + <translation>Tutarı göstermek için birim. Başka bir birim seçmek için tıklayınız.</translation> + </message> +</context> +<context> + <name>WalletFrame</name> + <message> + <source>No wallet has been loaded.</source> + <translation>Hiçbir cüzdan yüklenmedi.</translation> + </message> +</context> +<context> + <name>WalletModel</name> + <message> + <source>Send Coins</source> + <translation>Bitcoini Gönder</translation> + </message> +</context> +<context> + <name>WalletView</name> + <message> + <source>&Export</source> + <translation>&Dışarı aktar</translation> + </message> + <message> + <source>Export the data in the current tab to a file</source> + <translation>Mevcut sekmedeki verileri bir dosyaya aktar</translation> + </message> + <message> + <source>Backup Wallet</source> + <translation>Cüzdanı Yedekle</translation> + </message> + <message> + <source>Wallet Data (*.dat)</source> + <translation>Cüzdan Verileri (*.dat)</translation> + </message> + <message> + <source>Backup Failed</source> + <translation>Yedekleme Başarısız Oldu</translation> + </message> + <message> + <source>There was an error trying to save the wallet data to %1.</source> + <translation>Cüzdan verilerinin %1 konumuna kaydedilmesi sırasında bir hata meydana geldi.</translation> + </message> + <message> + <source>Backup Successful</source> + <translation>Yedekleme Başarılı</translation> + </message> + <message> + <source>The wallet data was successfully saved to %1.</source> + <translation>Cüzdan verileri %1 konumuna başarıyla kaydedildi.</translation> </message> </context> <context> @@ -1751,22 +3006,30 @@ <translation>Komut satırı ve JSON-RPC komutlarını kabul et</translation> </message> <message> + <source>Accept connections from outside (default: 1 if no -proxy or -connect/-noconnect)</source> + <translation>Dışarıdan gelen bağlantıları kabul et (varsayılan: 1 eğer -proxy veya -connect/-noconnect yoksa)</translation> + </message> + <message> + <source>Connect only to the specified node(s); -noconnect or -connect=0 alone to disable automatic connections</source> + <translation>-noconnect ile yalnızca belirtilen düğümleri bağlayın veya yalnız otomatik bağlantıları devre dışı bırakmak için -connect=0 kullanın.</translation> + </message> + <message> + <source>Distributed under the MIT software license, see the accompanying file %s or %s</source> + <translation>MIT yazılım lisansı altında dağıtılmıştır, beraberindeki %s ya da %s dosyasına bakınız.</translation> + </message> + <message> <source>If <category> is not supplied or if <category> = 1, output all debugging information.</source> - <translation>Eğer <kategori> belirtilmemişse ya da <kategori> = 1 ise, tüm hata ayıklama verilerini dök.</translation> + <translation>Eğer <kategori> belirtilmemişse ya da <kategori> = 1 ise, tüm hata ayıklama verilerini çıktı al.</translation> </message> <message> <source>Prune configured below the minimum of %d MiB. Please use a higher number.</source> - <translation>Budama, asgari değer olan %d MiB'den düşük olarak ayarlanmıştır. Lütfen daha yüksek bir sayı kullanınız.</translation> + <translation>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.</translation> </message> <message> <source>Prune: last wallet synchronisation goes beyond pruned data. You need to -reindex (download the whole blockchain again in case of pruned node)</source> <translation>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.)</translation> </message> <message> - <source>Reduce storage requirements by pruning (deleting) old blocks. This mode is incompatible with -txindex and -rescan. Warning: Reverting this setting requires re-downloading the entire blockchain. (default: 0 = disable pruning blocks, >%u = target size in MiB to use for block files)</source> - <translation>Depolama gerekliliğini eski blokları budayarak (silerek) düşür. Bu kip -txindex ve -rescan ile uyumsuzdur. İkaz: Bu ayarı geri almak tüm blok zincirini yeniden indirmeyi gerektirir. (varsayılan: 0 = blokları silmeyi devre dışı bırak, >%u = MiB olarak blok dosyaları için kullanılacak hedef boyut)</translation> - </message> - <message> <source>Rescans are not possible in pruned mode. You will need to use -reindex which will download the whole blockchain again.</source> <translation>Tekrar taramalar budanmış kipte mümkün değildir. Tüm blok zincirini tekrar indirecek olan -reindex seçeneğini kullanmanız gerekecektir.</translation> </message> @@ -1776,7 +3039,7 @@ </message> <message> <source>Fee (in %s/kB) to add to transactions you send (default: %s)</source> - <translation>Yolladığınız muamelelere eklenecek ücret (%s/kB olarak) (varsayılan: %s)</translation> + <translation>Yolladığınız işlemlere eklenecek ücret (%s/kB olarak) (varsayılan: %s)</translation> </message> <message> <source>Pruning blockstore...</source> @@ -1791,10 +3054,6 @@ <translation>HTTP sunucusu başlatılamadı. Ayrıntılar için debug.log dosyasına bakınız.</translation> </message> <message> - <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> - <translation>Dışarıdan gelen bağlantıları kabul et (varsayılan: -proxy veya -connect yoksa 1)</translation> - </message> - <message> <source>Bitcoin Core</source> <translation>Bitcoin Çekirdeği</translation> </message> @@ -1803,16 +3062,12 @@ <translation>%s geliştiricileri</translation> </message> <message> - <source>-fallbackfee is set very high! This is the transaction fee you may pay when fee estimates are not available.</source> - <translation>-fallbackfee çok yüksek bir değere ayarlanmış! Ücret tahminleri mevcut değilken ödeyebileceğiniz muamele ücretidir bu.</translation> - </message> - <message> <source>A fee rate (in %s/kB) that will be used when fee estimation has insufficient data (default: %s)</source> <translation>Ücret tahmini için yetersiz veri bulunduğunda kullanılacak ücret oranı (%s/kB olarak) (varsayılan: %s)</translation> </message> <message> <source>Accept relayed transactions received from whitelisted peers even when not relaying transactions (default: %d)</source> - <translation>Muameleler aktarılmadığında dahi beyaz listedeki eşlerden aktarılan muameleleri kabul et (varsayılan: %d)</translation> + <translation>İşlemler aktarılmadığında dahi beyaz listedeki eşlerden aktarılan işlemleri kabul et (varsayılan: %d)</translation> </message> <message> <source>Bind to given address and always listen on it. Use [host]:port notation for IPv6</source> @@ -1824,11 +3079,7 @@ </message> <message> <source>Delete all wallet transactions and only recover those parts of the blockchain through -rescan on startup</source> - <translation>Tüm cüzdan muamelelerini sil ve başlangıçta -rescan ile sadece blok zincirinin parçası olanları geri getir</translation> - </message> - <message> - <source>Distributed under the MIT software license, see the accompanying file COPYING or <http://www.opensource.org/licenses/mit-license.php>.</source> - <translation>MIT yazılım lisansı kapsamında yayınlanmıştır, ekteki COPYING dosyasına ya da <http://www.opensource.org/licenses/mit-license.php> adresine bakınız.</translation> + <translation>Tüm cüzdan işlemlerini sil ve başlangıçta -rescan ile sadece blok zincirinin parçası olanları geri getir</translation> </message> <message> <source>Error loading %s: You can't enable HD on a already existing non-HD wallet</source> @@ -1836,23 +3087,27 @@ </message> <message> <source>Error reading %s! All keys read correctly, but transaction data or address book entries might be missing or incorrect.</source> - <translation>%s dosyasının okunması sırasında bir hata meydana geldi! Tüm anahtarlar doğru bir şekilde okundu, ancak muamele verileri ya da adres defteri unsurları hatalı veya eksik olabilir.</translation> + <translation>%s dosyasının okunması sırasında bir hata meydana geldi! Tüm anahtarlar doğru bir şekilde okundu, ancak işlem verileri ya da adres defteri ögeleri hatalı veya eksik olabilir.</translation> </message> <message> <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source> - <translation>Bir cüzdan muamelesi değiştiğinde komutu çalıştır (komuttaki %s muamele kimliği ile değiştirilecektir)</translation> + <translation>Bir cüzdan işlemi değiştiğinde komutu çalıştır (komuttaki %s işlem kimliği ile değiştirilecektir)</translation> </message> <message> - <source>Force relay of transactions from whitelisted peers even they violate local relay policy (default: %d)</source> - <translation>Yerel aktarma politikasını ihlal ettiklerinde bile beyaz listedeki eşlerden gelen muamelelerin aktarılmasını zorla (varsayılan: %d)</translation> + <source>Extra transactions to keep in memory for compact block reconstructions (default: %u)</source> + <translation>Daha küçük boyutlu blok yeniden yapılandırması için fazladan işlemleri bellekte tut. (varsayılan: %u)</translation> + </message> + <message> + <source>If this block is in the chain assume that it and its ancestors are valid and potentially skip their script verification (0 to verify all, default: %s, testnet: %s)</source> + <translation>Eğer bu blok zincirde yer alıyorsa onun ve atalarının geçerli olduğunu varsay ve potansiyel olarak onların betik doğrulamasını atla. (Tümünü doğrulamak için 0, varsayılan %s, testnet: %s)</translation> </message> <message> <source>Maximum allowed median peer time offset adjustment. Local perspective of time may be influenced by peers forward or backward by this amount. (default: %u seconds)</source> - <translation>Müsaade edilen azami medyan eş zamanı değişiklik sınırının ayarlaması. Zamanın yerel perspektifi bu miktar kadar ileri ya da geri eşler tarafından etkilenebilir. (Varsayılan %u saniye)</translation> + <translation>İzin verilen edilen en yüksek medyan eş zamanı değişiklik sınırının ayarlaması. Zamanın yerel perspektifi bu miktar kadar ileri ya da geri eşler tarafından etkilenebilir. (Varsayılan %u saniye)</translation> </message> <message> <source>Maximum total fees (in %s) to use in a single wallet transaction or raw transaction; setting this too low may abort large transactions (default: %s)</source> - <translation>Tek cüzdan muamelesinde ya da ham muamelede kullanılacak azami toplam ücret (%s olarak); bunu çok düşük olarak ayarlamak büyük muameleleri iptal edebilir (varsayılan: %s)</translation> + <translation>Tek bir cüzdan işleminde ya da ham işlemde kullanılacak en yüksek toplam ücret (%s olarak); bunu çok düşük olarak ayarlamak büyük işlemleri iptal edebilir (varsayılan: %s)</translation> </message> <message> <source>Please check that your computer's date and time are correct! If your clock is wrong, %s will not work properly.</source> @@ -1863,6 +3118,14 @@ <translation>%s programını faydalı buluyorsanız lütfen katkıda bulununuz. Yazılım hakkında daha fazla bilgi için %s adresini ziyaret ediniz.</translation> </message> <message> + <source>Reduce storage requirements by enabling pruning (deleting) of old blocks. This allows the pruneblockchain RPC to be called to delete specific blocks, and enables automatic pruning of old blocks if a target size in MiB is provided. This mode is incompatible with -txindex and -rescan. Warning: Reverting this setting requires re-downloading the entire blockchain. (default: 0 = disable pruning blocks, 1 = allow manual pruning via RPC, >%u = automatically prune block files to stay under the specified target size in MiB)</source> + <translation>Eski blokları budamayı (silme) etkinleştirerek depolama gereksinimlerini azaltın. Bu belirli blokları silmek için pruneblockchain uzak yordam çağrısına (RPC) izin verir. Eğer bloklar hedef mebibyte boyutuna ulaşırsa eski blokların otomatik olarak budanmasını sağlar. Bu kip, -txindex ve -rescan ile uyumsuzdur. Uyarı: Bu ayarı geri almak, blok zincirinin tamamını yeniden yüklemeyi gerektirir. (varsayılan: 0 = blok budaması devre dışı, 1 = RPC üzerinden manuel budamaya izin verir, >%u = mebibyte olarak belirtilen hedef boyutun altında kalması için blok dosyalarını otomatik olarak budar)</translation> + </message> + <message> + <source>Set lowest fee rate (in %s/kB) for transactions to be included in block creation. (default: %s)</source> + <translation>Blok oluşturmaya dahil olan işlemler için en düşük ücret oranını (%s/kB olarak) ayarla. (varsayılan: %s)</translation> + </message> + <message> <source>Set the number of script verification threads (%u to %d, 0 = auto, <0 = leave that many cores free, default: %d)</source> <translation>Betik kontrolü iş parçacıklarının sayısını belirler (%u ilâ %d, 0 = otomatik, <0 = bu sayıda çekirdeği kullanma, varsayılan: %d)</translation> </message> @@ -1872,7 +3135,7 @@ </message> <message> <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source> - <translation>Bu yayın öncesi bir deneme sürümüdür - tüm riski siz üstlenmiş olursunuz - bitcoin oluşturmak ya da ticari uygulamalar için kullanmayınız</translation> + <translation>Bu kararlı sürümden önceki bir deneme sürümüdür. - risklerini bilerek kullanma sorumluluğu sizdedir - bitcoin oluşturmak ya da ticari uygulamalar için kullanmayınız</translation> </message> <message> <source>Unable to rewind the database to a pre-fork state. You will need to redownload the blockchain</source> @@ -1883,16 +3146,20 @@ <translation>Dinlenecek portu haritalamak için UPnP kullan (varsayılan: dinlenildiğinde ve -proxy olmadığında 1)</translation> </message> <message> - <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source> - <translation>Uyarı: şebeke tamamen mutabık değil gibi görünüyor! Bazı madenciler sorun yaşıyor gibi görünüyor.</translation> + <source>Username and hashed password for JSON-RPC connections. The field <userpw> comes in the format: <USERNAME>:<SALT>$<HASH>. A canonical python script is included in share/rpcuser. The client then connects normally using the rpcuser=<USERNAME>/rpcpassword=<PASSWORD> pair of arguments. This option can be specified multiple times</source> + <translation>JSON-RPC bağlantıları için kullanıcı adı ve karmalanmış parola. <userpw> alanı şu biçimdedir: <KULLANICI ADI>:<SALT>$<HASH>. Kanonik bir Python betiği share/rpcuser klasöründe bulunabilir. Ardından istemci normal şekilde rpcuser=<KULLANICI ADI>/rpcpassword=<PAROLA> argüman çiftini kullanarak bağlanabilir. Bu seçenek birden çok kez belirtilebilir.</translation> </message> <message> - <source>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</source> - <translation>Uyarı: eşlerimizle tamamen mutabık değiliz gibi görünüyor! Güncelleme yapmanız gerekebilir ya da diğer düğümlerin güncelleme yapmaları gerekebilir.</translation> + <source>Wallet will not create transactions that violate mempool chain limits (default: %u)</source> + <translation>Cüzdan, zincir bellek alanı limitlerini ihlal eden işlem oluşturmayacak. (varsayılan: %u)</translation> + </message> + <message> + <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source> + <translation>Uyarı: Ağ üyeleri aralarında tamamen anlaşmış gibi gözükmüyor! Bazı madenciler sorun yaşıyor gibi görünmektedir.</translation> </message> <message> - <source>Whitelist peers connecting from the given netmask or IP address. Can be specified multiple times.</source> - <translation>Belirtilen ağ maskesi ya da IP adresinden bağlanan eşleri beyaz listeye al. Birden fazla kez belirtilebilir.</translation> + <source>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</source> + <translation>Uyarı: Ağ eşlerimizle tamamen anlaşamamışız gibi görünüyor! Güncelleme yapmanız gerekebilir ya da diğer düğümlerin güncelleme yapmaları gerekebilir.</translation> </message> <message> <source>You need to rebuild the database using -reindex-chainstate to change -txindex</source> @@ -1904,7 +3171,7 @@ </message> <message> <source>-maxmempool must be at least %d MB</source> - <translation>-maxmempool asgari %d MB olmalıdır</translation> + <translation>-maxmempool en az %d MB olmalıdır</translation> </message> <message> <source><category> can be:</source> @@ -1927,12 +3194,12 @@ <translation>Çözümlenemedi - %s adres: '%s'</translation> </message> <message> - <source>Change index out of range</source> - <translation>Aralık dışında değişiklik endeksi</translation> + <source>Chain selection options:</source> + <translation>Blok zinciri seçim ayarları:</translation> </message> <message> - <source>Connect only to the specified node(s)</source> - <translation>Sadece belirtilen düğüme veya düğümlere bağlan</translation> + <source>Change index out of range</source> + <translation>Aralık dışında değişiklik indeksi</translation> </message> <message> <source>Connection options:</source> @@ -1964,7 +3231,7 @@ </message> <message> <source>Enable publish hash transaction in <address></source> - <translation>Karma değer muamelesinin <adres>te yayınlanmasını etkinleştir</translation> + <translation>Karma değer işleminin <adres>te yayınlanmasını etkinleştir</translation> </message> <message> <source>Enable publish raw block in <address></source> @@ -1972,11 +3239,11 @@ </message> <message> <source>Enable publish raw transaction in <address></source> - <translation>Ham muamelenin <adres>te yayınlanmasını etkinleştir</translation> + <translation>Ham işlemin <adres>te yayınlanmasını etkinleştir</translation> </message> <message> <source>Enable transaction replacement in the memory pool (default: %u)</source> - <translation>Bellek alanında muamele değiştirmeyi etkinleştir (varsayılan: %u)</translation> + <translation>Bellek alanında işlem değiştirmeyi etkinleştir (varsayılan: %u)</translation> </message> <message> <source>Error initializing block database</source> @@ -2024,7 +3291,7 @@ </message> <message> <source>Incorrect or no genesis block found. Wrong datadir for network?</source> - <translation>Yanlış ya da bulunamamış doğuş bloku. Şebeke için yanlış veri klasörü mü?</translation> + <translation>Yanlış ya da bulunamamış doğuş bloğu. Ağ için yanlış veri klasörü mü?</translation> </message> <message> <source>Initialization sanity check failed. %s is shutting down.</source> @@ -2036,15 +3303,15 @@ </message> <message> <source>Invalid amount for -%s=<amount>: '%s'</source> - <translation>-%s=<meblağ> için geçersiz meblağ: '%s'</translation> + <translation>-%s=<tutar> için geçersiz tutar: '%s'</translation> </message> <message> <source>Invalid amount for -fallbackfee=<amount>: '%s'</source> - <translation> -fallbackfee=<meblağ> için geçersiz meblağ: '%s'</translation> + <translation> -fallbackfee=<tutar> için geçersiz tutar: '%s'</translation> </message> <message> <source>Keep the transaction memory pool below <n> megabytes (default: %u)</source> - <translation>Muamele bellek alanını <n> megabayttan düşük tut (varsayılan: %u)</translation> + <translation>İşlem bellek alanını <n> megabayttan düşük tut (varsayılan: %u)</translation> </message> <message> <source>Loading banlist...</source> @@ -2055,16 +3322,12 @@ <translation>auth çerezinin konumu (varsayılan: veri klasörü)</translation> </message> <message> - <source>Minimum bytes per sigop in transactions we relay and mine (default: %u)</source> - <translation>Aktardığımız ve oluşturduğumuz muamelelerdeki sigop başına asgari bayt (varsayılan: %u)</translation> - </message> - <message> <source>Not enough file descriptors available.</source> <translation>Kafi derecede dosya tanımlayıcıları mevcut değil.</translation> </message> <message> <source>Only connect to nodes in network <net> (ipv4, ipv6 or onion)</source> - <translation>Sadece <net> şebekesindeki düğümlere bağlan (ipv4, ipv6 veya onion)</translation> + <translation>Sadece <net> ağındaki düğümlere bağlan (ipv4, ipv6 veya onion)</translation> </message> <message> <source>Print this help message and exit</source> @@ -2084,11 +3347,11 @@ </message> <message> <source>Rebuild chain state and block index from the blk*.dat files on disk</source> - <translation>Zincir durumu ve blok endeksini diskteki blk*.dat dosyalarından yeniden derle</translation> + <translation>Zincir durumu ve blok indeksini diskteki blk*.dat dosyalarından yeniden derle</translation> </message> <message> <source>Rebuild chain state from the currently indexed blocks</source> - <translation>Zincir durumunu güncel olarak endekslenen bloklardan yeniden derle</translation> + <translation>Zincir durumunu güncel olarak indekslenen bloklardan yeniden derle</translation> </message> <message> <source>Rewinding blocks...</source> @@ -2099,12 +3362,8 @@ <translation>Veritabanı önbellek boyutunu megabayt olarak belirt (%d ilâ %d, varsayılan: %d)</translation> </message> <message> - <source>Set maximum block cost (default: %d)</source> - <translation>Azami blok maliyetini ayarla (varsayılan: %d)</translation> - </message> - <message> <source>Set maximum block size in bytes (default: %d)</source> - <translation>Azami blok boyutunu bayt olarak ayarla (varsayılan: %d)</translation> + <translation>En yüksek blok boyutunu bayt olarak ayarla (varsayılan: %d)</translation> </message> <message> <source>Specify wallet file (within data directory)</source> @@ -2135,6 +3394,10 @@ <translation>Dinleme portunu haritalamak için UPnP kullan (varsayılan: %u)</translation> </message> <message> + <source>Use the test chain</source> + <translation>Test blok zincirini kullan</translation> + </message> + <message> <source>User Agent comment (%s) contains unsafe characters.</source> <translation>Kullanıcı Aracı açıklaması (%s) güvensiz karakterler içermektedir.</translation> </message> @@ -2164,7 +3427,7 @@ </message> <message> <source>Allow JSON-RPC connections from specified source. Valid for <ip> are a single IP (e.g. 1.2.3.4), a network/netmask (e.g. 1.2.3.4/255.255.255.0) or a network/CIDR (e.g. 1.2.3.4/24). This option can be specified multiple times</source> - <translation>Belirtilen kaynaktan JSON-RPC bağlantılarını kabul et. Bir <ip> için geçerli olanlar şunlardır: salt IP adresi (mesela 1.2.3.4), bir şebeke/ağ maskesi (örneğin 1.2.3.4/255.255.255.0) ya da bir şebeke/CIDR (mesela 1.2.3.4/24). Bu seçenek birden fazla kez belirtilebilir</translation> + <translation>Belirtilen kaynaktan JSON-RPC bağlantılarını kabul et. Bir <ip> için geçerli olanlar şunlardır: IP adresi (mesela 1.2.3.4), bir ağ/ağ maskesi (örneğin 1.2.3.4/255.255.255.0) ya da bir ağ/CIDR (mesela 1.2.3.4/24). Bu seçenek birden fazla kez belirtilebilir</translation> </message> <message> <source>Bind to given address and whitelist peers connecting to it. Use [host]:port notation for IPv6</source> @@ -2192,23 +3455,19 @@ </message> <message> <source>Fees (in %s/kB) smaller than this are considered zero fee for relaying, mining and transaction creation (default: %s)</source> - <translation>Bundan düşük ücretler (%s/kB olarak) aktarma, oluşturma ve muamele yaratma için sıfır değerinde ücret olarak kabul edilir (varsayılan: %s)</translation> + <translation>Bundan düşük ücretler (%s/kB olarak) aktarma, oluşturma ve işlem yaratma için sıfır değerinde ücret olarak kabul edilir (varsayılan: %s)</translation> </message> <message> <source>If paytxfee is not set, include enough fee so transactions begin confirmation on average within n blocks (default: %u)</source> - <translation>Eğer paytxfee ayarlanmadıysa kafi derecede ücret ekleyin ki muameleler teyite vasati n blok içinde başlasın (varsayılan: %u)</translation> + <translation>Eğer paytxfee ayarlanmadıysa kafi derecede ücret ekleyin ki işlemler teyite vasati n blok içinde başlasın (varsayılan: %u)</translation> </message> <message> <source>Invalid amount for -maxtxfee=<amount>: '%s' (must be at least the minrelay fee of %s to prevent stuck transactions)</source> - <translation>-maxtxfee=<tutar> için geçersiz tutar: '%s' (Sıkışmış muameleleri önlemek için en az %s değerinde asgari aktarım ücretine eşit olmalıdır)</translation> + <translation>-maxtxfee=<tutar> için geçersiz tutar: '%s' (Sıkışmış işlemleri önlemek için en az %s değerinde en düşük aktarım ücretine eşit olmalıdır)</translation> </message> <message> <source>Maximum size of data in data carrier transactions we relay and mine (default: %u)</source> - <translation>Aktardığımız ve oluşturduğumuz veri taşıyıcı muamelelerindeki azami veri boyutu (varsayılan: %u)</translation> - </message> - <message> - <source>Query for peer addresses via DNS lookup, if low on addresses (default: 1 unless -connect)</source> - <translation>Adres sayısı azaldıysa DNS sorgulamasıyla eş adresleri ara (varsayılan: 1 -connect kullanılmadıysa)</translation> + <translation>Aktardığımız ve oluşturduğumuz veri taşıyıcı işlemlerindeki en yüksek veri boyutu (varsayılan: %u)</translation> </message> <message> <source>Randomize credentials for every proxy connection. This enables Tor stream isolation (default: %u)</source> @@ -2216,15 +3475,11 @@ </message> <message> <source>Set maximum size of high-priority/low-fee transactions in bytes (default: %d)</source> - <translation>Yüksek öncelikli/düşük ücretli muamelelerin azami boyutunu bayt olarak ayarla (varsayılan: %d)</translation> + <translation>Yüksek öncelikli/düşük ücretli işlemlerin en yüksek boyutunu bayt olarak ayarla (varsayılan: %d)</translation> </message> <message> <source>The transaction amount is too small to send after the fee has been deducted</source> - <translation>Bu muamele, ücret düşüldükten sonra göndermek için çok düşük</translation> - </message> - <message> - <source>This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit <https://www.openssl.org/> and cryptographic software written by Eric Young and UPnP software written by Thomas Bernard.</source> - <translation>Bu ürün OpenSSL projesi tarafından OpenSSL araç takımı (http://www.openssl.org/) için geliştirilen yazılımlar, Eric Young (eay@cryptsoft.com) tarafından hazırlanmış şifreleme yazılımları ve Thomas Bernard tarafından programlanmış UPnP yazılımı içerir.</translation> + <translation>Bu işlem, tutar düşüldükten sonra göndermek için çok düşük</translation> </message> <message> <source>Use hierarchical deterministic key generation (HD) after BIP32. Only has effect during wallet creation/first start</source> @@ -2232,7 +3487,7 @@ </message> <message> <source>Whitelisted peers cannot be DoS banned and their transactions are always relayed, even if they are already in the mempool, useful e.g. for a gateway</source> - <translation>Beyaz listeye alınan eşler DoS yasaklamasına uğramazlar ve muameleleri zaten mempool'da olsalar da daima aktarılır, bu mesela bir geçit için kullanışlıdır</translation> + <translation>Beyaz listeye alınan eşler DoS yasaklamasına uğramazlar ve işlemleri zaten mempool'da olsalar da daima aktarılır, bu mesela bir geçit için kullanışlıdır</translation> </message> <message> <source>You need to rebuild the database using -reindex to go back to unpruned mode. This will redownload the entire blockchain</source> @@ -2276,7 +3531,7 @@ </message> <message> <source>Keep at most <n> unconnectable transactions in memory (default: %u)</source> - <translation>Hafızada en çok <n> bağlanılamaz muamele tut (varsayılan: %u)</translation> + <translation>Hafızada en çok <n> bağlanılamaz işlem tut (varsayılan: %u)</translation> </message> <message> <source>Need to specify a port with -whitebind: '%s'</source> @@ -2284,7 +3539,7 @@ </message> <message> <source>Node relay options:</source> - <translation>Düğüm röle seçenekleri:</translation> + <translation>Düğüm aktarma seçenekleri:</translation> </message> <message> <source>RPC server options:</source> @@ -2296,15 +3551,15 @@ </message> <message> <source>Rescan the block chain for missing wallet transactions on startup</source> - <translation>Başlangıçta blok zincirini eksik cüzdan muameleleri için tekrar tara</translation> + <translation>Başlangıçta blok zincirini eksik cüzdan işlemleri için tekrar tara</translation> </message> <message> <source>Send trace/debug info to console instead of debug.log file</source> - <translation>Trace/hata ayıklama verilerini debug.log dosyası yerine konsola gönder</translation> + <translation>İzleme/hata ayıklama verilerini debug.log dosyası yerine konsola gönder</translation> </message> <message> <source>Send transactions as zero-fee transactions if possible (default: %u)</source> - <translation>Muameleleri mümkünse ücretsiz olarak gönder (varsayılan: %u)</translation> + <translation>İşlemleri mümkünse ücretsiz olarak gönder (varsayılan: %u)</translation> </message> <message> <source>Show all debugging options (usage: --help -help-debug)</source> @@ -2316,11 +3571,11 @@ </message> <message> <source>Signing transaction failed</source> - <translation>Muamelenin imzalanması başarısız oldu</translation> + <translation>İşlemin imzalanması başarısız oldu</translation> </message> <message> <source>The transaction amount is too small to pay the fee</source> - <translation>Muamele meblağı ücreti ödemek için çok düşük</translation> + <translation>İşlemdeki bitcoin tutarı ücreti ödemek için çok düşük</translation> </message> <message> <source>This is experimental software.</source> @@ -2332,27 +3587,23 @@ </message> <message> <source>Tor control port to use if onion listening enabled (default: %s)</source> - <translation>Eğer onion dinlenmesi etkinse kullanılacak Tor kontrol portu (varsayılan: %s)</translation> + <translation>Eğer onion dinlemesi etkinse kullanılacak Tor kontrol portu (varsayılan: %s)</translation> </message> <message> <source>Transaction amount too small</source> - <translation>Muamele meblağı çok düşük</translation> - </message> - <message> - <source>Transaction amounts must be positive</source> - <translation>Muamele tutarının pozitif olması lazımdır</translation> + <translation>İşlem tutarı çok düşük</translation> </message> <message> <source>Transaction too large for fee policy</source> - <translation>Ücret politikası için çok büyük muamele</translation> + <translation>Ücret politikası için işlem çok büyük</translation> </message> <message> <source>Transaction too large</source> - <translation>Muamele çok büyük</translation> + <translation>İşlem çok büyük</translation> </message> <message> <source>Unable to bind to %s on this computer (bind returned error %s)</source> - <translation>Bu bilgisayarda %s unsuruna bağlanılamadı (bağlanma %s hatasını verdi)</translation> + <translation>Bu bilgisayarda %s ögesine bağlanılamadı (bağlanma %s hatasını verdi)</translation> </message> <message> <source>Upgrade wallet to latest format on startup</source> @@ -2368,15 +3619,15 @@ </message> <message> <source>Warning: unknown new rules activated (versionbit %i)</source> - <translation>İkaz: bilinmeyen yeni kurallar etkinleştirilmiştir (versionbit %i)</translation> + <translation>Uyarı: bilinmeyen yeni kurallar etkinleştirilmiştir (versionbit %i)</translation> </message> <message> <source>Whether to operate in a blocks only mode (default: %u)</source> - <translation>Salt blok kipinde çalışılıp çalışılmayacağı (varsayılan: %u)</translation> + <translation>Sadece blok kipinde çalışılıp çalışılmayacağı (varsayılan: %u)</translation> </message> <message> <source>Zapping all transactions from wallet...</source> - <translation>Cüzdandaki tüm muameleler kaldırılıyor...</translation> + <translation>Cüzdandaki tüm işlemler kaldırılıyor...</translation> </message> <message> <source>ZeroMQ notification options:</source> @@ -2404,19 +3655,23 @@ </message> <message> <source>-maxtxfee is set very high! Fees this large could be paid on a single transaction.</source> - <translation>-maxtxfee çok yüksek bir değere ayarlanmış! Bu denli yüksek ücretler tek bir muamelede ödenebilir.</translation> + <translation>-maxtxfee çok yüksek bir değere ayarlanmış! Bu denli yüksek ücretler tek bir işlemde ödenebilir.</translation> </message> <message> - <source>-paytxfee is set very high! This is the transaction fee you will pay if you send a transaction.</source> - <translation>-paytxfee çok yüksek bir değere ayarlanmış! Bu, muamele gönderirseniz ödeyeceğiniz muamele ücretidir.</translation> + <source>Do not keep transactions in the mempool longer than <n> hours (default: %u)</source> + <translation>İşlemleri bellek alanında <n> saatten fazla tutma (varsayılan: %u)</translation> </message> <message> - <source>Do not keep transactions in the mempool longer than <n> hours (default: %u)</source> - <translation>Muameleleri bellek alanında <n> saatten fazla tutma (varsayılan: %u)</translation> + <source>Equivalent bytes per sigop in transactions for relay and mining (default: %u)</source> + <translation>Oluşturma ve aktarma işlemlerinde sigop başına eşdeğer bayt (varsayılan: %u)</translation> </message> <message> <source>Fees (in %s/kB) smaller than this are considered zero fee for transaction creation (default: %s)</source> - <translation>Bundan düşük ücretler (%s/kB olarak) muamele oluşturulması için sıfır değerinde ücret olarak kabul edilir (varsayılan: %s)</translation> + <translation>Bundan düşük ücretler (%s/kB olarak) işlem oluşturulması için sıfır değerinde ücret olarak kabul edilir (varsayılan: %s)</translation> + </message> + <message> + <source>Force relay of transactions from whitelisted peers even if they violate local relay policy (default: %d)</source> + <translation>Yerel aktarma politikasını ihlal etseler bile beyaz listedeki eşlerden gelen işlemlerin aktarılmasını zorla (varsayılan: %d)</translation> </message> <message> <source>How thorough the block verification of -checkblocks is (0-4, default: %u)</source> @@ -2424,7 +3679,7 @@ </message> <message> <source>Maintain a full transaction index, used by the getrawtransaction rpc call (default: %u)</source> - <translation>Muamelelerin tamamının indeksini tut, getrawtransaction rpc çağrısı tarafından kullanılır (varsayılan: %u)</translation> + <translation>İşlemlerin tamamının indeksini tut, getrawtransaction rpc çağrısı tarafından kullanılır (varsayılan: %u)</translation> </message> <message> <source>Number of seconds to keep misbehaving peers from reconnecting (default: %u)</source> @@ -2432,15 +3687,31 @@ </message> <message> <source>Output debugging information (default: %u, supplying <category> is optional)</source> - <translation>Hata ayıklama bilgisi dök (varsayılan: %u, <kategori> sağlanması seçime dayalıdır)</translation> + <translation>Hata ayıklama bilgisini dök (varsayılan: %u, <kategori> sağlanması seçime dayalıdır)</translation> + </message> + <message> + <source>Query for peer addresses via DNS lookup, if low on addresses (default: 1 unless -connect/-noconnect)</source> + <translation>Adres sayısı azaldıysa DNS sorgulamasıyla eş adresleri ara (varsayılan: 1 -connect/-noconnect kullanılmadıysa)</translation> + </message> + <message> + <source>Sets the serialization of raw transaction or block hex returned in non-verbose mode, non-segwit(0) or segwit(1) (default: %d)</source> + <translation>Ham işlemin serileştirilmesini ayarlar veya blok non-verbose, non-segwit(0) veya segwit(1) kipinde onaltılık değeri döndürür (default: %d)</translation> </message> <message> <source>Support filtering of blocks and transaction with bloom filters (default: %u)</source> - <translation>Blokların ve muamelelerin bloom filtreleri ile süzülmesini destekle (varsayılan: %u)</translation> + <translation>Blokların ve işlemlerin bloom filtreleri ile süzülmesini destekle (varsayılan: %u)</translation> + </message> + <message> + <source>This is the transaction fee you may pay when fee estimates are not available.</source> + <translation>İşlem ücret tahminleri mevcut olmadığında ödeyebileceğiniz işlem ücreti budur.</translation> + </message> + <message> + <source>This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit %s and cryptographic software written by Eric Young and UPnP software written by Thomas Bernard.</source> + <translation>Bu ürün OpenSSL Projesi tarafından geliştirilen OpenSSL araç takımınında kullanılmak üzere yazılan yazılımları %s Eric Young tarafından yazılmış şifreleme yazılımını ve Thomas Bernard tarafından yazılmış UPnP yazılımını içerir.</translation> </message> <message> <source>Total length of network version string (%i) exceeds maximum length (%i). Reduce the number or size of uacomments.</source> - <translation>Şebeke sürümü zincirinin toplam boyutu (%i) azami boyutu geçmektedir (%i). Kullanıcı aracı açıklamasının sayısı veya boyutunu azaltınız.</translation> + <translation>Ağ sürümü zincirinin toplam boyutu (%i) en yüksek boyutu geçmektedir (%i). Kullanıcı aracı açıklamasının sayısı veya boyutunu azaltınız.</translation> </message> <message> <source>Tries to keep outbound traffic under the given target (in MiB per 24h), 0 = no limit (default: %d)</source> @@ -2459,16 +3730,20 @@ <translation>Eşlere gizli Tor servisleri ile ulaşmak için ayrı SOCKS5 vekil sunucusu kullan (varsayılan: %s)</translation> </message> <message> - <source>Username and hashed password for JSON-RPC connections. The field <userpw> comes in the format: <USERNAME>:<SALT>$<HASH>. A canonical python script is included in share/rpcuser. This option can be specified multiple times</source> - <translation>JSON-RPC bağlantıları için kullanıcı ismi ve karmalanmış parola. <userpw> alanı şu biçimdedir: <USERNAME>:<SALT>$<HASH>. Kanonik bir Python betiği share/rpcuser klasöründe bulunabilir. Bu seçenek birden çok kez belirtilebilir.</translation> - </message> - <message> <source>Warning: Unknown block versions being mined! It's possible unknown rules are in effect</source> - <translation>İkaz: bilinmeyen blok sürümü oluşturulmaya çalışılıyor. Bilinmeyen kuralların işlemesi mümkündür.</translation> + <translation>Uyarı: Bilinmeyen blok sürümü oluşturulmaya çalışılıyor. Bilinmeyen kuralların işlemesi mümkündür.</translation> </message> <message> <source>Warning: Wallet file corrupt, data salvaged! Original %s saved as %s in %s; if your balance or transactions are incorrect you should restore from a backup.</source> - <translation>Uyarı: wallet.dat bozuk, veriler geri kazanıldı! Özgün %s, %s olarak %s klasörüne kaydedildi; bakiyeniz ya da muameleleriniz yanlışsa bir yedeklemeden tekrar yüklemeniz gerekir.</translation> + <translation>Uyarı: wallet.dat bozuk, veriler geri kazanıldı! Özgün %s, %s olarak %s klasörüne kaydedildi; bakiyeniz ya da işlemleriniz yanlışsa bir yedeklemeden tekrar yüklemeniz gerekir.</translation> + </message> + <message> + <source>Whitelist peers connecting from the given IP address (e.g. 1.2.3.4) or CIDR notated network (e.g. 1.2.3.0/24). Can be specified multiple times.</source> + <translation>Beyaz listeye eklenen eşler verilen IP adresinden (ör. 1.2.3.4) veya CIDR ağından (ör. 1.2.3.0/24) bağlanabilir. Değerler birden çok kez kullanılabilir.</translation> + </message> + <message> + <source>%s is set very high!</source> + <translation>%s çok yüksek ayarlanmış!</translation> </message> <message> <source>(default: %s)</source> @@ -2491,6 +3766,10 @@ <translation>Geçersiz -proxy adresi: '%s'</translation> </message> <message> + <source>Keypool ran out, please call keypoolrefill first</source> + <translation>Keypool tükendi, lütfen önce keypoolrefill'i çağırın</translation> + </message> + <message> <source>Listen for JSON-RPC connections on <port> (default: %u or testnet: %u)</source> <translation>JSON-RPC bağlantılarını <port> üzerinde dinle (varsayılan: %u veya tesnet: %u)</translation> </message> @@ -2504,15 +3783,15 @@ </message> <message> <source>Make the wallet broadcast transactions</source> - <translation>Cüzdanın muameleleri yayınlamasını sağla</translation> + <translation>Cüzdanın işlemleri yayınlamasını sağla</translation> </message> <message> <source>Maximum per-connection receive buffer, <n>*1000 bytes (default: %u)</source> - <translation>Her bağlantı için azami alım tamponu, <n>*1000 bayt (varsayılan: %u)</translation> + <translation>Her bağlantı için en yüksek alım tamponu, <n>*1000 bayt (varsayılan: %u)</translation> </message> <message> <source>Maximum per-connection send buffer, <n>*1000 bytes (default: %u)</source> - <translation>Her bağlantı için azami yollama tamponu, <n>*1000 bayt (varsayılan: %u)</translation> + <translation>Her bağlantı için çok gönderme tamponu, <n>*1000 bayt (varsayılan: %u)</translation> </message> <message> <source>Prepend debug output with timestamp (default: %u)</source> @@ -2520,19 +3799,23 @@ </message> <message> <source>Relay and mine data carrier transactions (default: %u)</source> - <translation>Veri taşıyıcı muameleleri oluştur ve aktar (varsayılan: %u)</translation> + <translation>Veri taşıyıcı işlemleri oluştur ve aktar (varsayılan: %u)</translation> </message> <message> <source>Relay non-P2SH multisig (default: %u)</source> <translation>P2SH olmayan çoklu imzaları aktar (varsayılan: %u)</translation> </message> <message> + <source>Send transactions with full-RBF opt-in enabled (default: %u)</source> + <translation>İşlemleri full-RBF opt-in ile gönder etkinleştirildi (default: %u)</translation> + </message> + <message> <source>Set key pool size to <n> (default: %u)</source> <translation>Anahtar alan boyutunu <n> değerine ayarla (varsayılan: %u)</translation> </message> <message> - <source>Set minimum block size in bytes (default: %u)</source> - <translation>Bayt olarak asgari blok boyutunu tanımla (varsayılan: %u)</translation> + <source>Set maximum BIP141 block weight (default: %d)</source> + <translation>En yüksek BIP141 blok ağırlığını ayarla (varsayılan: %d)</translation> </message> <message> <source>Set the number of threads to service RPC calls (default: %d)</source> @@ -2544,7 +3827,7 @@ </message> <message> <source>Specify connection timeout in milliseconds (minimum: 1, default: %d)</source> - <translation>Bağlantı zaman aşım süresini milisaniye olarak belirt (asgari: 1, varsayılan: %d)</translation> + <translation>Bağlantı zaman aşım süresini milisaniye olarak belirt (en düşüki: 1, varsayılan: %d)</translation> </message> <message> <source>Specify pid file (default: %s)</source> @@ -2552,15 +3835,43 @@ </message> <message> <source>Spend unconfirmed change when sending transactions (default: %u)</source> - <translation>Gönderme muamelelerinde teyit edilmemiş para üstünü harca (varsayılan: %u)</translation> + <translation>Gönderme işlemlerinde doğrulanmamış para üstünü harca (varsayılan: %u)</translation> + </message> + <message> + <source>Starting network threads...</source> + <translation>Ağ iş parçacıkları başlatılıyor...</translation> + </message> + <message> + <source>The wallet will avoid paying less than the minimum relay fee.</source> + <translation>Cüzdan en az aktarma ücretinden daha az ödeme yapmaktan sakınacaktır.</translation> + </message> + <message> + <source>This is the minimum transaction fee you pay on every transaction.</source> + <translation>Bu her işlemde ödeceğiniz en düşük işlem ücretidir.</translation> + </message> + <message> + <source>This is the transaction fee you will pay if you send a transaction.</source> + <translation>Eğer bir gönderme işlemi yaparsanız bu ödeyeceğiniz işlem ücretidir.</translation> </message> <message> <source>Threshold for disconnecting misbehaving peers (default: %u)</source> <translation>Aksaklık gösteren eşlerle bağlantıyı kesme sınırı (varsayılan: %u)</translation> </message> <message> + <source>Transaction amounts must not be negative</source> + <translation>İşlem tutarı negatif olmamalıdır</translation> + </message> + <message> + <source>Transaction has too long of a mempool chain</source> + <translation>İşlem çok uzun bir mempool zincirine sahip</translation> + </message> + <message> + <source>Transaction must have at least one recipient</source> + <translation>İşlemin en az bir alıcısı olması gerekir</translation> + </message> + <message> <source>Unknown network specified in -onlynet: '%s'</source> - <translation>-onlynet için bilinmeyen bir şebeke belirtildi: '%s'</translation> + <translation>-onlynet için bilinmeyen bir ağ belirtildi: '%s'</translation> </message> <message> <source>Insufficient funds</source> @@ -2572,7 +3883,7 @@ </message> <message> <source>Add a node to connect to and attempt to keep the connection open</source> - <translation>Bağlanılacak düğüm ekle ve bağlantıyı zinde tutmaya çalış</translation> + <translation>Bağlanılacak düğüm ekle ve bağlantıyı sürekli açık tutmaya çalış</translation> </message> <message> <source>Loading wallet...</source> @@ -2588,7 +3899,7 @@ </message> <message> <source>Rescanning...</source> - <translation>Yeniden tarama...</translation> + <translation>Yeniden taranıyor...</translation> </message> <message> <source>Done loading</source> diff --git a/src/qt/locale/bitcoin_tr_TR.ts b/src/qt/locale/bitcoin_tr_TR.ts index 344309c25f..c4e4d2983e 100644 --- a/src/qt/locale/bitcoin_tr_TR.ts +++ b/src/qt/locale/bitcoin_tr_TR.ts @@ -41,7 +41,10 @@ <source>&Delete</source> <translation>&Sil</translation> </message> -</context> + </context> +<context> + <name>AddressTableModel</name> + </context> <context> <name>AskPassphraseDialog</name> </context> @@ -68,7 +71,7 @@ <source>&Address</source> <translation>Adres</translation> </message> -</context> + </context> <context> <name>FreespaceChecker</name> </context> @@ -79,6 +82,9 @@ <name>Intro</name> </context> <context> + <name>ModalOverlay</name> + </context> +<context> <name>OpenURIDialog</name> </context> <context> @@ -88,12 +94,21 @@ <name>OverviewPage</name> </context> <context> + <name>PaymentServer</name> + </context> +<context> <name>PeerTableModel</name> </context> <context> <name>QObject</name> </context> <context> + <name>QObject::QObject</name> + </context> +<context> + <name>QRImageWidget</name> + </context> +<context> <name>RPCConsole</name> </context> <context> @@ -107,12 +122,18 @@ </message> </context> <context> + <name>RecentRequestsTableModel</name> + </context> +<context> <name>SendCoinsDialog</name> </context> <context> <name>SendCoinsEntry</name> </context> <context> + <name>SendConfirmationDialog</name> + </context> +<context> <name>ShutdownWindow</name> </context> <context> @@ -125,12 +146,30 @@ <name>TrafficGraphWidget</name> </context> <context> + <name>TransactionDesc</name> + </context> +<context> <name>TransactionDescDialog</name> </context> <context> + <name>TransactionTableModel</name> + </context> +<context> + <name>TransactionView</name> + </context> +<context> <name>UnitDisplayStatusBarControl</name> </context> <context> + <name>WalletFrame</name> + </context> +<context> + <name>WalletModel</name> + </context> +<context> + <name>WalletView</name> + </context> +<context> <name>bitcoin-core</name> </context> </TS>
\ No newline at end of file diff --git a/src/qt/locale/bitcoin_uk.ts b/src/qt/locale/bitcoin_uk.ts index a06cc9e092..2c017fc52e 100644 --- a/src/qt/locale/bitcoin_uk.ts +++ b/src/qt/locale/bitcoin_uk.ts @@ -41,7 +41,10 @@ <source>&Delete</source> <translation>&Видалити</translation> </message> -</context> + </context> +<context> + <name>AddressTableModel</name> + </context> <context> <name>AskPassphraseDialog</name> <message> @@ -60,7 +63,7 @@ <source>Repeat new passphrase</source> <translation>Повторіть пароль</translation> </message> -</context> + </context> <context> <name>BanTableModel</name> <message> @@ -254,34 +257,10 @@ <source>%n active connection(s) to Bitcoin network</source> <translation><numerusform>%n активне з'єднання з мережею Bitcoin</numerusform><numerusform>%n активні з'єднання з мережею Bitcoin</numerusform><numerusform>%n активних з'єднань з мережею Bitcoin</numerusform></translation> </message> - <message> - <source>No block source available...</source> - <translation>Недоступно жодного джерела блоків...</translation> - </message> <message numerus="yes"> <source>Processed %n block(s) of transaction history.</source> <translation><numerusform>Оброблено %n блок історії транзакцій.</numerusform><numerusform>Оброблено %n блоки історії транзакцій.</numerusform><numerusform>Оброблено %n блоків історії транзакцій.</numerusform></translation> </message> - <message numerus="yes"> - <source>%n hour(s)</source> - <translation><numerusform>%n година</numerusform><numerusform>%n години</numerusform><numerusform>%n годин</numerusform></translation> - </message> - <message numerus="yes"> - <source>%n day(s)</source> - <translation><numerusform>%n день</numerusform><numerusform>%n дні</numerusform><numerusform>%n днів</numerusform></translation> - </message> - <message numerus="yes"> - <source>%n week(s)</source> - <translation><numerusform>%n тиждень</numerusform><numerusform>%n тижня</numerusform><numerusform>%n тижнів</numerusform></translation> - </message> - <message> - <source>%1 and %2</source> - <translation>%1 та %2</translation> - </message> - <message numerus="yes"> - <source>%n year(s)</source> - <translation><numerusform>%n рік</numerusform><numerusform>%n роки</numerusform><numerusform>%n років</numerusform></translation> - </message> <message> <source>%1 behind</source> <translation>%1 тому</translation> @@ -360,7 +339,7 @@ <source>Wallet is <b>encrypted</b> and currently <b>locked</b></source> <translation><b>Зашифрований</b> гаманець <b>заблоковано</b></translation> </message> -</context> + </context> <context> <name>CoinControlDialog</name> <message> @@ -380,10 +359,6 @@ <translation>Сума:</translation> </message> <message> - <source>Priority:</source> - <translation>Пріорітет:</translation> - </message> - <message> <source>Fee:</source> <translation>Комісія:</translation> </message> @@ -435,11 +410,7 @@ <source>Confirmed</source> <translation>Підтверджені</translation> </message> - <message> - <source>Priority</source> - <translation>Пріоритет</translation> - </message> -</context> + </context> <context> <name>EditAddressDialog</name> <message> @@ -462,7 +433,7 @@ <source>&Address</source> <translation>&Адреса</translation> </message> -</context> + </context> <context> <name>FreespaceChecker</name> <message> @@ -565,6 +536,21 @@ </message> </context> <context> + <name>ModalOverlay</name> + <message> + <source>Form</source> + <translation>Форма</translation> + </message> + <message> + <source>Last block time</source> + <translation>Час останнього блоку</translation> + </message> + <message> + <source>Hide</source> + <translation>Приховати</translation> + </message> + </context> +<context> <name>OpenURIDialog</name> <message> <source>Open URI</source> @@ -582,7 +568,7 @@ <source>Select payment request file</source> <translation>Виберіть файл запиту платежу</translation> </message> -</context> + </context> <context> <name>OptionsDialog</name> <message> @@ -874,6 +860,9 @@ </message> </context> <context> + <name>PaymentServer</name> + </context> +<context> <name>PeerTableModel</name> <message> <source>User Agent</source> @@ -883,11 +872,7 @@ <source>Node/Service</source> <translation>Вузол/Сервіс</translation> </message> - <message> - <source>Ping Time</source> - <translation>Затримка</translation> - </message> -</context> + </context> <context> <name>QObject</name> <message> @@ -926,7 +911,17 @@ <source>%1 ms</source> <translation>%1 мс</translation> </message> -</context> + <message> + <source>%1 and %2</source> + <translation>%1 та %2</translation> + </message> + </context> +<context> + <name>QObject::QObject</name> + </context> +<context> + <name>QRImageWidget</name> + </context> <context> <name>RPCConsole</name> <message> @@ -1114,14 +1109,6 @@ <translation>Очистити консоль</translation> </message> <message> - <source>&Disconnect Node</source> - <translation>&Від'єднати Вузол</translation> - </message> - <message> - <source>Ban Node for</source> - <translation>Заблокувати Вузол на</translation> - </message> - <message> <source>1 &hour</source> <translation>1 &годину</translation> </message> @@ -1138,10 +1125,6 @@ <translation>1 &рік</translation> </message> <message> - <source>&Unban Node</source> - <translation>&Розблокувати Вузол</translation> - </message> - <message> <source>Use up and down arrows to navigate history, and <b>Ctrl-L</b> to clear screen.</source> <translation>Використовуйте стрілки вгору вниз для навігації по історії, і <b>Ctrl-L</b> для очищення екрана.</translation> </message> @@ -1268,7 +1251,7 @@ <source>Remove</source> <translation>Вилучити</translation> </message> -</context> + </context> <context> <name>ReceiveRequestDialog</name> <message> @@ -1287,7 +1270,10 @@ <source>&Save Image...</source> <translation>&Зберегти зображення...</translation> </message> -</context> + </context> +<context> + <name>RecentRequestsTableModel</name> + </context> <context> <name>SendCoinsDialog</name> <message> @@ -1323,10 +1309,6 @@ <translation>Сума:</translation> </message> <message> - <source>Priority:</source> - <translation>Пріорітет:</translation> - </message> - <message> <source>Fee:</source> <translation>Комісія:</translation> </message> @@ -1395,10 +1377,6 @@ <translation>(Розумну оплату ще не ініціалізовано. Це, зазвичай, триває кілька блоків...)</translation> </message> <message> - <source>Confirmation time:</source> - <translation>Час підтвердження:</translation> - </message> - <message> <source>normal</source> <translation>звичайний</translation> </message> @@ -1438,7 +1416,7 @@ <source>S&end</source> <translation>&Відправити</translation> </message> -</context> + </context> <context> <name>SendCoinsEntry</name> <message> @@ -1517,7 +1495,10 @@ <source>Memo:</source> <translation>Нотатка:</translation> </message> -</context> + </context> +<context> + <name>SendConfirmationDialog</name> + </context> <context> <name>ShutdownWindow</name> <message> @@ -1611,7 +1592,7 @@ <source>Reset all verify message fields</source> <translation>Скинути всі поля перевірки повідомлення</translation> </message> -</context> + </context> <context> <name>SplashScreen</name> <message> @@ -1627,12 +1608,21 @@ </message> </context> <context> + <name>TransactionDesc</name> + </context> +<context> <name>TransactionDescDialog</name> <message> <source>This pane shows a detailed description of the transaction</source> <translation>Даний діалог показує детальну статистику по вибраній транзакції</translation> </message> -</context> + </context> +<context> + <name>TransactionTableModel</name> + </context> +<context> + <name>TransactionView</name> + </context> <context> <name>UnitDisplayStatusBarControl</name> <message> @@ -1641,6 +1631,15 @@ </message> </context> <context> + <name>WalletFrame</name> + </context> +<context> + <name>WalletModel</name> + </context> +<context> + <name>WalletView</name> + </context> +<context> <name>bitcoin-core</name> <message> <source>Options:</source> @@ -1675,10 +1674,6 @@ <translation>Операція відсікання: остання синхронізація вмісту гаманцю не обмежується діями над скороченими данними. Вам необхідно зробити переіндексацію -reindex (заново завантажити веcь ланцюжок блоків в разі появи скороченого ланцюга)</translation> </message> <message> - <source>Reduce storage requirements by pruning (deleting) old blocks. This mode is incompatible with -txindex and -rescan. Warning: Reverting this setting requires re-downloading the entire blockchain. (default: 0 = disable pruning blocks, >%u = target size in MiB to use for block files)</source> - <translation>Зменшити вимоги до наявного простору на носії даних за допомогою скорочення ланцюжка (видалення старих блоків). Цей режим несумісний з параметрами -txindex та -rescan. Увага: при поверненні до типового значення видалені частини ланцюжка буде повторно завантажено. (типово: 0 = вимкнути скорочення ланцюжка, >%u = очікуваний розмір файлів блоків в МіБ)</translation> - </message> - <message> <source>Rescans are not possible in pruned mode. You will need to use -reindex which will download the whole blockchain again.</source> <translation>Неможливо провести повторне сканування зі скороченим ланцюжком. Вам необхідно використати -reindex для завантаження повного ланцюжка блоків.</translation> </message> @@ -1703,10 +1698,6 @@ <translation>Неможливо запустити HTTP-сервер. Детальніший опис наведено в журналі зневадження.</translation> </message> <message> - <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> - <translation>Приймати підключення ззовні (типово: 1 за відсутності -proxy чи -connect)</translation> - </message> - <message> <source>Bitcoin Core</source> <translation>Bitcoin Core</translation> </message> @@ -1719,10 +1710,6 @@ <translation>Видалити всі транзакції гаманця та відновити ті, що будуть знайдені під час запуску за допомогою -rescan</translation> </message> <message> - <source>Distributed under the MIT software license, see the accompanying file COPYING or <http://www.opensource.org/licenses/mit-license.php>.</source> - <translation>Поширюється за ліцензією MIT, додаткова інформація міститься у файлі COPYING та за адресою <http://www.opensource.org/licenses/mit-license.php>.</translation> - </message> - <message> <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source> <translation>Виконати команду, коли транзакція гаманця зміниться (замість %s в команді буде підставлено ідентифікатор транзакції)</translation> </message> @@ -1735,26 +1722,10 @@ <translation>Схоже, що база даних блоків містить блок з майбутнього. Це може статися із-за некоректно встановленої дати та/або часу. Перебудовуйте базу даних блоків лише тоді, коли ви переконані, що встановлено правильну дату і час</translation> </message> <message> - <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source> - <translation>Це тестова збірка пре-релізної версії - використовуйте на свій страх і ризик - не застосовувати для добування монет або торгівлі</translation> - </message> - <message> <source>Use UPnP to map the listening port (default: 1 when listening and no -proxy)</source> <translation>Використовувати UPnP для відображення порту, що прослуховується (типово: 1 при прослуховуванні та за відсутності -proxy)</translation> </message> <message> - <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source> - <translation>Увага: Частина мережі використовує інший головний ланцюжок! Деякі добувачі, можливо, зазнають проблем.</translation> - </message> - <message> - <source>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</source> - <translation>Увага: Наш ланцюжок блоків відрізняється від ланцюжків підключених учасників! Можливо, вам, або іншим вузлам, необхідно оновитися.</translation> - </message> - <message> - <source>Whitelist peers connecting from the given netmask or IP address. Can be specified multiple times.</source> - <translation>Додати учасників, що під'єднуються з заданої підмережі чи IP-адреси, в білий список. Можна вказувати декілька разів.</translation> - </message> - <message> <source>-maxmempool must be at least %d MB</source> <translation>-maxmempool має бути не менше %d МБ</translation> </message> @@ -1767,10 +1738,6 @@ <translation>Опції створення блоку:</translation> </message> <message> - <source>Connect only to the specified node(s)</source> - <translation>Підключитись лише до вказаного вузла/вузлів</translation> - </message> - <message> <source>Connection options:</source> <translation>Параметри з'єднання:</translation> </message> @@ -1959,10 +1926,6 @@ <translation>Максимальний розмір даних в транзакціях носіїв даних, що ми передаємо і добуваємо (за замовчуванням: %u)</translation> </message> <message> - <source>Query for peer addresses via DNS lookup, if low on addresses (default: 1 unless -connect)</source> - <translation>Дізнаватися адреси учасників через DNS при замалій кількості відомих адрес (типово: 1 за відсутності -connect)</translation> - </message> - <message> <source>Randomize credentials for every proxy connection. This enables Tor stream isolation (default: %u)</source> <translation>Надавати випадкові дані доступу для кожного проксі-з'єднання. Це дозволяє ввімкнути ізоляцію потоків Tor'у (типово: %u)</translation> </message> @@ -1975,10 +1938,6 @@ <translation>Залишок від суми транзакції зі сплатою комісії занадто малий </translation> </message> <message> - <source>This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit <https://www.openssl.org/> and cryptographic software written by Eric Young and UPnP software written by Thomas Bernard.</source> - <translation>Цей продукт включає в себе програмне забезпечення, розроблене в рамках проекту OpenSSL <https://www.openssl.org/>, криптографічне програмне забезпечення, написане Еріком Янгом, та функції для роботи з UPnP, написані Томасом Бернардом.</translation> - </message> - <message> <source>Whitelisted peers cannot be DoS banned and their transactions are always relayed, even if they are already in the mempool, useful e.g. for a gateway</source> <translation>Учасники, що знаходяться в білому списку, не можуть бути заблоковані за DoS та їхні транзакції завжди ретранслюватимуться (навіть якщо вони є в пам'яті), що може бути корисним, наприклад, для шлюзу</translation> </message> @@ -2087,10 +2046,6 @@ <translation>Сума транзакції занадто мала</translation> </message> <message> - <source>Transaction amounts must be positive</source> - <translation>Суми монет у транзакції мають бути позитивними</translation> - </message> - <message> <source>Transaction too large for fee policy</source> <translation>Транзакція занадто велика для правил комісії</translation> </message> @@ -2151,10 +2106,6 @@ <translation>Встановлено дуже велике значення -maxtxfee! Такі великі комісії можуть бути сплачені окремою транзакцією.</translation> </message> <message> - <source>-paytxfee is set very high! This is the transaction fee you will pay if you send a transaction.</source> - <translation>Встановлено дуже велике значення -paytxfee! Цю комісію буде сплачено для проведення транзакції.</translation> - </message> - <message> <source>Do not keep transactions in the mempool longer than <n> hours (default: %u)</source> <translation>Не тримати транзакції в пам'яті довше <n> годин (типово: %u)</translation> </message> @@ -2199,10 +2150,6 @@ <translation>Використовувати окремий SOCKS5-проксі для з'єднання з учасниками через приховані сервіси Tor (типово: %s)</translation> </message> <message> - <source>Username and hashed password for JSON-RPC connections. The field <userpw> comes in the format: <USERNAME>:<SALT>$<HASH>. A canonical python script is included in share/rpcuser. This option can be specified multiple times</source> - <translation>Логін та хешований пароль для зв'язків JSON-RPC. Поле <userpw> має формат: <USERNAME>:<SALT>$<HASH>. Класичний Python script додано до share/rpcuser. Цей параметр може бути застосований декілька разів.</translation> - </message> - <message> <source>(default: %s)</source> <translation>(типово: %s)</translation> </message> @@ -2263,10 +2210,6 @@ <translation>Встановити розмір пулу ключів <n> (типово: %u)</translation> </message> <message> - <source>Set minimum block size in bytes (default: %u)</source> - <translation>Встановити мінімальний розмір блоку в байтах (типово: %u)</translation> - </message> - <message> <source>Set the number of threads to service RPC calls (default: %d)</source> <translation>Встановити число потоків для обслуговування викликів RPC (типово: %d)</translation> </message> diff --git a/src/qt/locale/bitcoin_ur_PK.ts b/src/qt/locale/bitcoin_ur_PK.ts index 6b43bf63e5..923198c91a 100644 --- a/src/qt/locale/bitcoin_ur_PK.ts +++ b/src/qt/locale/bitcoin_ur_PK.ts @@ -41,7 +41,10 @@ <source>&Delete</source> <translation>مٹا</translation> </message> -</context> + </context> +<context> + <name>AddressTableModel</name> + </context> <context> <name>AskPassphraseDialog</name> <message> @@ -56,7 +59,7 @@ <source>Repeat new passphrase</source> <translation>نیا پاس فریز دہرائیں</translation> </message> -</context> + </context> <context> <name>BanTableModel</name> </context> @@ -92,7 +95,7 @@ <source>&Address</source> <translation> پتہ</translation> </message> -</context> + </context> <context> <name>FreespaceChecker</name> </context> @@ -107,6 +110,9 @@ </message> </context> <context> + <name>ModalOverlay</name> + </context> +<context> <name>OpenURIDialog</name> </context> <context> @@ -116,6 +122,9 @@ <name>OverviewPage</name> </context> <context> + <name>PaymentServer</name> + </context> +<context> <name>PeerTableModel</name> </context> <context> @@ -126,6 +135,12 @@ </message> </context> <context> + <name>QObject::QObject</name> + </context> +<context> + <name>QRImageWidget</name> + </context> +<context> <name>RPCConsole</name> </context> <context> @@ -139,6 +154,9 @@ </message> </context> <context> + <name>RecentRequestsTableModel</name> + </context> +<context> <name>SendCoinsDialog</name> <message> <source>Insufficient funds!</source> @@ -157,6 +175,9 @@ <name>SendCoinsEntry</name> </context> <context> + <name>SendConfirmationDialog</name> + </context> +<context> <name>ShutdownWindow</name> </context> <context> @@ -169,12 +190,30 @@ <name>TrafficGraphWidget</name> </context> <context> + <name>TransactionDesc</name> + </context> +<context> <name>TransactionDescDialog</name> </context> <context> + <name>TransactionTableModel</name> + </context> +<context> + <name>TransactionView</name> + </context> +<context> <name>UnitDisplayStatusBarControl</name> </context> <context> + <name>WalletFrame</name> + </context> +<context> + <name>WalletModel</name> + </context> +<context> + <name>WalletView</name> + </context> +<context> <name>bitcoin-core</name> <message> <source>Insufficient funds</source> diff --git a/src/qt/locale/bitcoin_uz@Cyrl.ts b/src/qt/locale/bitcoin_uz@Cyrl.ts index 0062abfc1d..3898c441af 100644 --- a/src/qt/locale/bitcoin_uz@Cyrl.ts +++ b/src/qt/locale/bitcoin_uz@Cyrl.ts @@ -41,7 +41,10 @@ <source>&Delete</source> <translation>&Ўчириш</translation> </message> -</context> + </context> +<context> + <name>AddressTableModel</name> + </context> <context> <name>AskPassphraseDialog</name> <message> @@ -60,7 +63,7 @@ <source>Repeat new passphrase</source> <translation>Янги махфий сузни такрорланг</translation> </message> -</context> + </context> <context> <name>BanTableModel</name> </context> @@ -243,30 +246,6 @@ <translation><numerusform>%n та Bitcoin тармоғига фаол уланиш мавжуд</numerusform></translation> </message> <message> - <source>No block source available...</source> - <translation>Блок манбалари мавжуд эмас...</translation> - </message> - <message numerus="yes"> - <source>%n hour(s)</source> - <translation><numerusform>%n соат</numerusform></translation> - </message> - <message numerus="yes"> - <source>%n day(s)</source> - <translation><numerusform>%n кун</numerusform></translation> - </message> - <message numerus="yes"> - <source>%n week(s)</source> - <translation><numerusform>%n ҳафта</numerusform></translation> - </message> - <message> - <source>%1 and %2</source> - <translation>%1 ва %2</translation> - </message> - <message numerus="yes"> - <source>%n year(s)</source> - <translation><numerusform>%n йил</numerusform></translation> - </message> - <message> <source>%1 behind</source> <translation>%1 орқада</translation> </message> @@ -314,7 +293,7 @@ <source>Wallet is <b>encrypted</b> and currently <b>locked</b></source> <translation>Ҳамён <b>кодланган</b> ва вақтинча <b>қулфланган</b></translation> </message> -</context> + </context> <context> <name>CoinControlDialog</name> <message> @@ -330,10 +309,6 @@ <translation>Миқдори:</translation> </message> <message> - <source>Priority:</source> - <translation>Муҳимлиги:</translation> - </message> - <message> <source>Fee:</source> <translation>Солиқ:</translation> </message> @@ -377,11 +352,7 @@ <source>Confirmed</source> <translation>Тасдиқланди</translation> </message> - <message> - <source>Priority</source> - <translation>Муҳимлиги</translation> - </message> -</context> + </context> <context> <name>EditAddressDialog</name> <message> @@ -404,7 +375,7 @@ <source>&Address</source> <translation>&Манзил</translation> </message> -</context> + </context> <context> <name>FreespaceChecker</name> <message> @@ -475,6 +446,17 @@ </message> </context> <context> + <name>ModalOverlay</name> + <message> + <source>Form</source> + <translation>Шакл</translation> + </message> + <message> + <source>Last block time</source> + <translation>Сўнгги блок вақти</translation> + </message> + </context> +<context> <name>OpenURIDialog</name> <message> <source>Open URI</source> @@ -492,7 +474,7 @@ <source>Select payment request file</source> <translation>Тўлов сўрови файлини танлаш</translation> </message> -</context> + </context> <context> <name>OptionsDialog</name> <message> @@ -684,16 +666,15 @@ </message> </context> <context> + <name>PaymentServer</name> + </context> +<context> <name>PeerTableModel</name> <message> <source>User Agent</source> <translation>Фойдаланувчи вакил</translation> </message> - <message> - <source>Ping Time</source> - <translation>Ping вақти</translation> - </message> -</context> + </context> <context> <name>QObject</name> <message> @@ -724,7 +705,17 @@ <source>%1 ms</source> <translation>%1 мс</translation> </message> -</context> + <message> + <source>%1 and %2</source> + <translation>%1 ва %2</translation> + </message> + </context> +<context> + <name>QObject::QObject</name> + </context> +<context> + <name>QRImageWidget</name> + </context> <context> <name>RPCConsole</name> <message> @@ -962,7 +953,7 @@ <source>Remove</source> <translation>Ўчириш</translation> </message> -</context> + </context> <context> <name>ReceiveRequestDialog</name> <message> @@ -977,7 +968,10 @@ <source>&Save Image...</source> <translation>Расмни &сақлаш</translation> </message> -</context> + </context> +<context> + <name>RecentRequestsTableModel</name> + </context> <context> <name>SendCoinsDialog</name> <message> @@ -1009,10 +1003,6 @@ <translation>Миқдори:</translation> </message> <message> - <source>Priority:</source> - <translation>Муҳимлиги:</translation> - </message> - <message> <source>Fee:</source> <translation>Солиқ:</translation> </message> @@ -1049,10 +1039,6 @@ <translation>Тавсия этилган</translation> </message> <message> - <source>Confirmation time:</source> - <translation>Тасдиқ вақти</translation> - </message> - <message> <source>normal</source> <translation>Нормал</translation> </message> @@ -1088,7 +1074,7 @@ <source>S&end</source> <translation>Жў&натиш</translation> </message> -</context> + </context> <context> <name>SendCoinsEntry</name> <message> @@ -1133,6 +1119,9 @@ </message> </context> <context> + <name>SendConfirmationDialog</name> + </context> +<context> <name>ShutdownWindow</name> </context> <context> @@ -1173,16 +1162,34 @@ <name>TrafficGraphWidget</name> </context> <context> + <name>TransactionDesc</name> + </context> +<context> <name>TransactionDescDialog</name> <message> <source>This pane shows a detailed description of the transaction</source> <translation>Ушбу ойна операциянинг батафсил таърифини кўрсатади</translation> </message> -</context> + </context> +<context> + <name>TransactionTableModel</name> + </context> +<context> + <name>TransactionView</name> + </context> <context> <name>UnitDisplayStatusBarControl</name> </context> <context> + <name>WalletFrame</name> + </context> +<context> + <name>WalletModel</name> + </context> +<context> + <name>WalletView</name> + </context> +<context> <name>bitcoin-core</name> <message> <source>Options:</source> diff --git a/src/qt/locale/bitcoin_vi.ts b/src/qt/locale/bitcoin_vi.ts index e8bf01ab1b..e6775bf205 100644 --- a/src/qt/locale/bitcoin_vi.ts +++ b/src/qt/locale/bitcoin_vi.ts @@ -21,7 +21,10 @@ <source>&Delete</source> <translation>&Xóa</translation> </message> -</context> + </context> +<context> + <name>AddressTableModel</name> + </context> <context> <name>AskPassphraseDialog</name> </context> @@ -52,7 +55,7 @@ <source>&Address</source> <translation>Địa chỉ</translation> </message> -</context> + </context> <context> <name>FreespaceChecker</name> </context> @@ -63,6 +66,9 @@ <name>Intro</name> </context> <context> + <name>ModalOverlay</name> + </context> +<context> <name>OpenURIDialog</name> </context> <context> @@ -72,6 +78,9 @@ <name>OverviewPage</name> </context> <context> + <name>PaymentServer</name> + </context> +<context> <name>PeerTableModel</name> </context> <context> @@ -82,6 +91,12 @@ </message> </context> <context> + <name>QObject::QObject</name> + </context> +<context> + <name>QRImageWidget</name> + </context> +<context> <name>RPCConsole</name> </context> <context> @@ -95,6 +110,9 @@ </message> </context> <context> + <name>RecentRequestsTableModel</name> + </context> +<context> <name>SendCoinsDialog</name> <message> <source>Amount:</source> @@ -105,6 +123,9 @@ <name>SendCoinsEntry</name> </context> <context> + <name>SendConfirmationDialog</name> + </context> +<context> <name>ShutdownWindow</name> </context> <context> @@ -117,12 +138,30 @@ <name>TrafficGraphWidget</name> </context> <context> + <name>TransactionDesc</name> + </context> +<context> <name>TransactionDescDialog</name> </context> <context> + <name>TransactionTableModel</name> + </context> +<context> + <name>TransactionView</name> + </context> +<context> <name>UnitDisplayStatusBarControl</name> </context> <context> + <name>WalletFrame</name> + </context> +<context> + <name>WalletModel</name> + </context> +<context> + <name>WalletView</name> + </context> +<context> <name>bitcoin-core</name> </context> </TS>
\ No newline at end of file diff --git a/src/qt/locale/bitcoin_vi_VN.ts b/src/qt/locale/bitcoin_vi_VN.ts index a4e1588c93..c27111a52a 100644 --- a/src/qt/locale/bitcoin_vi_VN.ts +++ b/src/qt/locale/bitcoin_vi_VN.ts @@ -41,7 +41,10 @@ <source>&Delete</source> <translation>&Xó&a</translation> </message> -</context> + </context> +<context> + <name>AddressTableModel</name> + </context> <context> <name>AskPassphraseDialog</name> <message> @@ -60,13 +63,29 @@ <source>Repeat new passphrase</source> <translation>Điền lại passphrase</translation> </message> -</context> + </context> <context> <name>BanTableModel</name> - </context> + <message> + <source>IP/Netmask</source> + <translation>IP/Netmask</translation> + </message> + <message> + <source>Banned Until</source> + <translation>Bị cấm đến</translation> + </message> +</context> <context> <name>BitcoinGUI</name> <message> + <source>Sign &message...</source> + <translation>Chứ ký & Tin nhắn...</translation> + </message> + <message> + <source>Synchronizing with network...</source> + <translation>Đồng bộ hóa với mạng</translation> + </message> + <message> <source>&Overview</source> <translation>&Tổng quan</translation> </message> @@ -75,6 +94,18 @@ <translation>Node</translation> </message> <message> + <source>Show general overview of wallet</source> + <translation>Hiện thỉ thông tin sơ lược chung về Ví</translation> + </message> + <message> + <source>&Transactions</source> + <translation>&Giao dịch</translation> + </message> + <message> + <source>Browse transaction history</source> + <translation>Duyệt tìm lịch sử giao dịch</translation> + </message> + <message> <source>E&xit</source> <translation>T&hoát</translation> </message> @@ -83,6 +114,14 @@ <translation>Thoát chương trình</translation> </message> <message> + <source>&About %1</source> + <translation>&Thông tin về %1</translation> + </message> + <message> + <source>Show information about %1</source> + <translation>Hiện thông tin về %1</translation> + </message> + <message> <source>About &Qt</source> <translation>Về &Qt</translation> </message> @@ -91,6 +130,30 @@ <translation>Xem thông tin về Qt</translation> </message> <message> + <source>&Options...</source> + <translation>&Tùy chọn...</translation> + </message> + <message> + <source>Modify configuration options for %1</source> + <translation>Chỉnh sửa thiết đặt tùy chọn cho %1</translation> + </message> + <message> + <source>&Encrypt Wallet...</source> + <translation>&Mã hóa ví tiền</translation> + </message> + <message> + <source>&Backup Wallet...</source> + <translation>&Sao lưu ví tiền...</translation> + </message> + <message> + <source>&Change Passphrase...</source> + <translation>&Thay đổi mật khẩu...</translation> + </message> + <message> + <source>&Sending addresses...</source> + <translation>&Địa chỉ gửi</translation> + </message> + <message> <source>&Receiving addresses...</source> <translation>Địa chỉ nhận</translation> </message> @@ -99,6 +162,30 @@ <translation>Mở &URI...</translation> </message> <message> + <source>Reindexing blocks on disk...</source> + <translation>Đánh chỉ số (indexing) lại các khối (blocks) trên ổ đĩa ...</translation> + </message> + <message> + <source>Send coins to a Bitcoin address</source> + <translation>Gửi coins đến tài khoản Bitcoin</translation> + </message> + <message> + <source>Backup wallet to another location</source> + <translation>Sao lưu ví tiền ở vị trí khác</translation> + </message> + <message> + <source>Change the passphrase used for wallet encryption</source> + <translation>Thay đổi cụm mật mã dùng cho mã hoá Ví</translation> + </message> + <message> + <source>&Debug window</source> + <translation>&Cửa sổ xử lý lỗi (debug)</translation> + </message> + <message> + <source>&Verify message...</source> + <translation>&Tin nhắn xác thực</translation> + </message> + <message> <source>Bitcoin</source> <translation>Bitcoin</translation> </message> @@ -123,6 +210,18 @@ <translation>Hiện hoặc ẩn cửa sổ chính</translation> </message> <message> + <source>Encrypt the private keys that belong to your wallet</source> + <translation>Mã hoá các khoá bí mật trong Ví của bạn.</translation> + </message> + <message> + <source>Sign messages with your Bitcoin addresses to prove you own them</source> + <translation>Dùng địa chỉ Bitcoin của bạn ký các tin nhắn để xác minh những nội dung tin nhắn đó là của bạn.</translation> + </message> + <message> + <source>Verify messages to ensure they were signed with specified Bitcoin addresses</source> + <translation>Kiểm tra các tin nhắn để chắc chắn rằng chúng được ký bằng các địa chỉ Bitcoin xác định.</translation> + </message> + <message> <source>&File</source> <translation>&File</translation> </message> @@ -134,25 +233,41 @@ <source>&Help</source> <translation>Trợ &giúp</translation> </message> - <message numerus="yes"> - <source>%n hour(s)</source> - <translation><numerusform>%n giờ</numerusform></translation> + <message> + <source>Tabs toolbar</source> + <translation>Thanh công cụ (toolbar)</translation> </message> - <message numerus="yes"> - <source>%n day(s)</source> - <translation><numerusform>%n ngày</numerusform></translation> + <message> + <source>Request payments (generates QR codes and bitcoin: URIs)</source> + <translation>Yêu cầu thanh toán(tạo mã QR và địa chỉ Bitcoin: URLs)</translation> </message> - <message numerus="yes"> - <source>%n week(s)</source> - <translation><numerusform>%n tuần</numerusform></translation> + <message> + <source>Show the list of used sending addresses and labels</source> + <translation>Hiện thỉ danh sách các địa chỉ và nhãn đã dùng để gửi.</translation> </message> <message> - <source>%1 and %2</source> - <translation>%1 và %2</translation> + <source>Show the list of used receiving addresses and labels</source> + <translation>Hiện thỉ danh sách các địa chỉ và nhãn đã dùng để nhận.</translation> + </message> + <message> + <source>Open a bitcoin: URI or payment request</source> + <translation>Mở bitcoin:URL hoặc yêu cầu thanh toán</translation> + </message> + <message> + <source>&Command-line options</source> + <translation>7Tùy chọn dòng lệnh</translation> </message> - <message numerus="yes"> - <source>%n year(s)</source> - <translation><numerusform>%n năm</numerusform></translation> + <message> + <source>%1 behind</source> + <translation>%1 chậm trễ</translation> + </message> + <message> + <source>Last received block was generated %1 ago.</source> + <translation>Khối (block) cuối cùng nhận được cách đây %1</translation> + </message> + <message> + <source>Transactions after this will not yet be visible.</source> + <translation>Những giao dịch sau đó sẽ không hiện thị.</translation> </message> <message> <source>Error</source> @@ -171,6 +286,40 @@ <translation>Đã cập nhật</translation> </message> <message> + <source>Catching up...</source> + <translation>Bắt kịp...</translation> + </message> + <message> + <source>Date: %1 +</source> + <translation>Ngày: %1 +</translation> + </message> + <message> + <source>Amount: %1 +</source> + <translation>Số lượng: %1 +</translation> + </message> + <message> + <source>Type: %1 +</source> + <translation>Loại: %1 +</translation> + </message> + <message> + <source>Label: %1 +</source> + <translation>Nhãn hiệu: %1 +</translation> + </message> + <message> + <source>Address: %1 +</source> + <translation>Địa chỉ: %1 +</translation> + </message> + <message> <source>Sent transaction</source> <translation>Giao dịch đã gửi</translation> </message> @@ -178,6 +327,14 @@ <source>Incoming transaction</source> <translation>Giao dịch đang tới</translation> </message> + <message> + <source>Wallet is <b>encrypted</b> and currently <b>unlocked</b></source> + <translation>Ví tiền <b> đã được mã hóa</b>và hiện <b>đang mở</b></translation> + </message> + <message> + <source>Wallet is <b>encrypted</b> and currently <b>locked</b></source> + <translation>Ví tiền <b> đã được mã hóa</b>và hiện <b>đang khóa</b></translation> + </message> </context> <context> <name>CoinControlDialog</name> @@ -194,18 +351,30 @@ <translation>Lượng:</translation> </message> <message> - <source>Priority:</source> - <translation>Tầm quan trọng:</translation> - </message> - <message> <source>Fee:</source> <translation>Phí:</translation> </message> <message> + <source>After Fee:</source> + <translation>Sau thuế, phí:</translation> + </message> + <message> <source>Change:</source> <translation>Thay đổi:</translation> </message> <message> + <source>(un)select all</source> + <translation>(bỏ)chọn tất cả</translation> + </message> + <message> + <source>Tree mode</source> + <translation>Chế độ cây</translation> + </message> + <message> + <source>List mode</source> + <translation>Chế độ danh sách</translation> + </message> + <message> <source>Amount</source> <translation>Lượng</translation> </message> @@ -221,14 +390,14 @@ <source>Confirmed</source> <translation>Đã xác nhận</translation> </message> - <message> - <source>Priority</source> - <translation>Tầm quan trọng</translation> - </message> -</context> + </context> <context> <name>EditAddressDialog</name> <message> + <source>Edit Address</source> + <translation>Thay đổi địa chỉ</translation> + </message> + <message> <source>&Label</source> <translation>Nhãn</translation> </message> @@ -236,7 +405,7 @@ <source>&Address</source> <translation>Địa chỉ</translation> </message> -</context> + </context> <context> <name>FreespaceChecker</name> <message> @@ -250,6 +419,30 @@ <source>version</source> <translation>version</translation> </message> + <message> + <source>(%1-bit)</source> + <translation>(%1-bit)</translation> + </message> + <message> + <source>Command-line options</source> + <translation>&Tùy chọn dòng lệnh</translation> + </message> + <message> + <source>Usage:</source> + <translation>Mức sử dụng</translation> + </message> + <message> + <source>command-line options</source> + <translation>tùy chọn dòng lệnh</translation> + </message> + <message> + <source>Set language, for example "de_DE" (default: system locale)</source> + <translation>Chọn ngôn ngữ, ví dụ "de_DE" (mặc định: Vị trí hệ thống)</translation> + </message> + <message> + <source>Set SSL root certificates for payment request (default: -system-)</source> + <translation>Đặt chứng nhận SSL gốc cho yêu cầu giao dịch (mặc định: -hệ thống-)</translation> + </message> </context> <context> <name>Intro</name> @@ -258,11 +451,26 @@ <translation>Chào mừng</translation> </message> <message> + <source>Use the default data directory</source> + <translation>Sử dụng vị trí dữ liệu mặc định</translation> + </message> + <message> <source>Error</source> <translation>Lỗi</translation> </message> </context> <context> + <name>ModalOverlay</name> + <message> + <source>Form</source> + <translation>Form</translation> + </message> + <message> + <source>Hide</source> + <translation>Ẩn</translation> + </message> + </context> +<context> <name>OpenURIDialog</name> <message> <source>Open URI</source> @@ -288,14 +496,58 @@ <translation>MB</translation> </message> <message> + <source>Accept connections from outside</source> + <translation>Chấp nhận các kết nối từ bên ngoài</translation> + </message> + <message> + <source>Allow incoming connections</source> + <translation>Cho phép nhận kết nối</translation> + </message> + <message> + <source>IP address of the proxy (e.g. IPv4: 127.0.0.1 / IPv6: ::1)</source> + <translation>Địa chỉ IP của proxy (ví dụ IPv4: 127.0.0.1 / IPv6: ::1)</translation> + </message> + <message> + <source>Third party transaction URLs</source> + <translation>Phần mềm giao dịch bên thứ ba URLs</translation> + </message> + <message> <source>W&allet</source> <translation>Ví</translation> </message> <message> + <source>Connect to the Bitcoin network through a SOCKS5 proxy.</source> + <translation>Kết nối đến máy chủ Bitcoin thông qua SOCKS5 proxy.</translation> + </message> + <message> + <source>Proxy &IP:</source> + <translation>Proxy &IP:</translation> + </message> + <message> + <source>&Port:</source> + <translation>&Cổng:</translation> + </message> + <message> + <source>Port of the proxy (e.g. 9050)</source> + <translation>Cổng proxy (e.g. 9050) </translation> + </message> + <message> + <source>IPv4</source> + <translation>IPv4</translation> + </message> + <message> + <source>IPv6</source> + <translation>IPv6</translation> + </message> + <message> <source>&Display</source> <translation>&Hiển thị</translation> </message> <message> + <source>User Interface &language:</source> + <translation>Giao diện người dùng & ngôn ngữ</translation> + </message> + <message> <source>&OK</source> <translation>&OK</translation> </message> @@ -307,6 +559,10 @@ <source>default</source> <translation>mặc định</translation> </message> + <message> + <source>none</source> + <translation>Trống</translation> + </message> </context> <context> <name>OverviewPage</name> @@ -315,11 +571,22 @@ <translation>Form</translation> </message> <message> + <source>Available:</source> + <translation>Khả dụng</translation> + </message> + <message> + <source>Pending:</source> + <translation>Đang chờ</translation> + </message> + <message> <source>Total:</source> <translation>Tổng:</translation> </message> </context> <context> + <name>PaymentServer</name> + </context> +<context> <name>PeerTableModel</name> <message> <source>User Agent</source> @@ -332,6 +599,20 @@ <source>Amount</source> <translation>Lượng</translation> </message> + <message> + <source>%1 and %2</source> + <translation>%1 và %2</translation> + </message> + </context> +<context> + <name>QObject::QObject</name> + </context> +<context> + <name>QRImageWidget</name> + <message> + <source>&Save Image...</source> + <translation>$Lưu hình ảnh...</translation> + </message> </context> <context> <name>RPCConsole</name> @@ -359,6 +640,58 @@ <source>User Agent</source> <translation>User Agent</translation> </message> + <message> + <source>1 &hour</source> + <translation>1&giờ</translation> + </message> + <message> + <source>1 &day</source> + <translation>1&ngày</translation> + </message> + <message> + <source>1 &week</source> + <translation>1&tuần</translation> + </message> + <message> + <source>1 &year</source> + <translation>1&năm</translation> + </message> + <message> + <source>Use up and down arrows to navigate history, and <b>Ctrl-L</b> to clear screen.</source> + <translation>Sử dụng phím lên và xuống để di chuyển lịch sử, và <b>Ctrl-L</b> để xóa màn hình</translation> + </message> + <message> + <source>Type <b>help</b> for an overview of available commands.</source> + <translation>Gõ <b>help</b> để xem nhưng câu lệnh có sẵn</translation> + </message> + <message> + <source>%1 B</source> + <translation>%1 B</translation> + </message> + <message> + <source>%1 KB</source> + <translation>%1 KB</translation> + </message> + <message> + <source>%1 MB</source> + <translation>%1 MB</translation> + </message> + <message> + <source>%1 GB</source> + <translation>%1 GB</translation> + </message> + <message> + <source>never</source> + <translation>không bao giờ</translation> + </message> + <message> + <source>Yes</source> + <translation>Đồng ý</translation> + </message> + <message> + <source>No</source> + <translation>Không</translation> + </message> </context> <context> <name>ReceiveCoinsDialog</name> @@ -366,17 +699,124 @@ <source>&Amount:</source> <translation>Lượng:</translation> </message> + <message> + <source>&Label:</source> + <translation>&Nhãn</translation> + </message> + <message> + <source>&Message:</source> + <translation>&Tin nhắn:</translation> + </message> + <message> + <source>Use this form to request payments. All fields are <b>optional</b>.</source> + <translation>Sử dụng form này để yêu cầu thanh toán. Tất cả các trường <b>không bắt buộc<b></translation> + </message> + <message> + <source>Clear all fields of the form.</source> + <translation>Xóa tất cả các trường trong biểu mẫu</translation> + </message> + <message> + <source>Clear</source> + <translation>Xóa</translation> + </message> + <message> + <source>Requested payments history</source> + <translation>Lịch sử yêu cầu thanh toán</translation> + </message> + <message> + <source>&Request payment</source> + <translation>&Yêu cầu thanh toán</translation> + </message> + <message> + <source>Show</source> + <translation>Hiển thị</translation> + </message> + <message> + <source>Remove the selected entries from the list</source> + <translation>Xóa khỏi danh sách</translation> + </message> + <message> + <source>Remove</source> + <translation>Xóa</translation> + </message> + <message> + <source>Copy message</source> + <translation>Copy tin nhắn</translation> + </message> </context> <context> <name>ReceiveRequestDialog</name> <message> + <source>QR Code</source> + <translation>QR Code</translation> + </message> + <message> + <source>Copy &URI</source> + <translation>Copy &URI</translation> + </message> + <message> <source>Copy &Address</source> <translation>&Copy Địa Chỉ</translation> </message> + <message> + <source>&Save Image...</source> + <translation>$Lưu hình ảnh...</translation> + </message> + <message> + <source>Request payment to %1</source> + <translation>Yêu cầu thanh toán cho %1</translation> + </message> + <message> + <source>Payment information</source> + <translation>Thông tin thanh toán</translation> + </message> + <message> + <source>URI</source> + <translation>URI</translation> + </message> + <message> + <source>Amount</source> + <translation>Lượng</translation> + </message> + <message> + <source>Message</source> + <translation>Tin nhắn</translation> + </message> + <message> + <source>Error encoding URI into QR Code.</source> + <translation>Lỗi khi encode từ URI thành QR Code</translation> + </message> +</context> +<context> + <name>RecentRequestsTableModel</name> + <message> + <source>Message</source> + <translation>Tin nhắn</translation> + </message> + <message> + <source>(no message)</source> + <translation>(không tin nhắn)</translation> + </message> </context> <context> <name>SendCoinsDialog</name> <message> + <source>Send Coins</source> + <translation>Gửi Coins</translation> + </message> + <message> + <source>Coin Control Features</source> + <translation>Tính năng Control Coin</translation> + </message> + <message> + <source>Inputs...</source> + <translation>Nhập...</translation> + </message> + <message> + <source>automatically selected</source> + <translation>Tự động chọn</translation> + </message> + <message> <source>Insufficient funds!</source> <translation>Không đủ tiền</translation> </message> @@ -393,17 +833,93 @@ <translation>Lượng:</translation> </message> <message> - <source>Priority:</source> - <translation>Tầm quan trọng:</translation> - </message> - <message> <source>Fee:</source> <translation>Phí:</translation> </message> <message> + <source>After Fee:</source> + <translation>Sau thuế, phí:</translation> + </message> + <message> <source>Change:</source> <translation>Thay đổi:</translation> </message> + <message> + <source>Transaction Fee:</source> + <translation>Phí giao dịch</translation> + </message> + <message> + <source>Choose...</source> + <translation>Chọn...</translation> + </message> + <message> + <source>collapse fee-settings</source> + <translation>Thu gọn fee-settings</translation> + </message> + <message> + <source>per kilobyte</source> + <translation>trên KB</translation> + </message> + <message> + <source>Hide</source> + <translation>Ẩn</translation> + </message> + <message> + <source>total at least</source> + <translation>Tổng cộng ít nhất</translation> + </message> + <message> + <source>(read the tooltip)</source> + <translation>(Đọc hướng dẫn)</translation> + </message> + <message> + <source>normal</source> + <translation>Bình thường</translation> + </message> + <message> + <source>fast</source> + <translation>Nhanh</translation> + </message> + <message> + <source>Send to multiple recipients at once</source> + <translation>Gửi đến nhiều người nhận trong một lần</translation> + </message> + <message> + <source>Add &Recipient</source> + <translation>Thêm &Người nhận</translation> + </message> + <message> + <source>Clear all fields of the form.</source> + <translation>Xóa tất cả các trường trong biểu mẫu</translation> + </message> + <message> + <source>Clear &All</source> + <translation>Xóa &Tất cả</translation> + </message> + <message> + <source>Balance:</source> + <translation>Tài khoản</translation> + </message> + <message> + <source>Confirm the send action</source> + <translation>Xác nhận sự gửi</translation> + </message> + <message> + <source>%1 to %2</source> + <translation>%1 đến %2</translation> + </message> + <message> + <source>Total Amount %1</source> + <translation>Tổng cộng %1</translation> + </message> + <message> + <source>or</source> + <translation>hoặc</translation> + </message> + <message> + <source>Confirm send coins</source> + <translation>Xác nhận gửi coins</translation> + </message> </context> <context> <name>SendCoinsEntry</name> @@ -411,12 +927,27 @@ <source>A&mount:</source> <translation>Lượng:</translation> </message> + <message> + <source>&Label:</source> + <translation>&Nhãn</translation> + </message> </context> <context> + <name>SendConfirmationDialog</name> + <message> + <source>Yes</source> + <translation>Đồng ý</translation> + </message> +</context> +<context> <name>ShutdownWindow</name> </context> <context> <name>SignVerifyMessageDialog</name> + <message> + <source>Clear &All</source> + <translation>Xóa &Tất cả</translation> + </message> </context> <context> <name>SplashScreen</name> @@ -425,12 +956,42 @@ <name>TrafficGraphWidget</name> </context> <context> + <name>TransactionDesc</name> + <message> + <source>Message</source> + <translation>Tin nhắn</translation> + </message> + <message> + <source>Amount</source> + <translation>Lượng</translation> + </message> + </context> +<context> <name>TransactionDescDialog</name> </context> <context> + <name>TransactionTableModel</name> + </context> +<context> + <name>TransactionView</name> + </context> +<context> <name>UnitDisplayStatusBarControl</name> </context> <context> + <name>WalletFrame</name> + </context> +<context> + <name>WalletModel</name> + <message> + <source>Send Coins</source> + <translation>Gửi Coins</translation> + </message> +</context> +<context> + <name>WalletView</name> + </context> +<context> <name>bitcoin-core</name> <message> <source>Options:</source> diff --git a/src/qt/locale/bitcoin_zh.ts b/src/qt/locale/bitcoin_zh.ts index bceba9dfdd..99d723deff 100644 --- a/src/qt/locale/bitcoin_zh.ts +++ b/src/qt/locale/bitcoin_zh.ts @@ -3,6 +3,9 @@ <name>AddressBookPage</name> </context> <context> + <name>AddressTableModel</name> + </context> +<context> <name>AskPassphraseDialog</name> </context> <context> @@ -43,6 +46,9 @@ </message> </context> <context> + <name>ModalOverlay</name> + </context> +<context> <name>OpenURIDialog</name> </context> <context> @@ -52,12 +58,21 @@ <name>OverviewPage</name> </context> <context> + <name>PaymentServer</name> + </context> +<context> <name>PeerTableModel</name> </context> <context> <name>QObject</name> </context> <context> + <name>QObject::QObject</name> + </context> +<context> + <name>QRImageWidget</name> + </context> +<context> <name>RPCConsole</name> </context> <context> @@ -67,6 +82,13 @@ <name>ReceiveRequestDialog</name> </context> <context> + <name>RecentRequestsTableModel</name> + <message> + <source>Date</source> + <translation>日期</translation> + </message> + </context> +<context> <name>SendCoinsDialog</name> <message> <source>Insufficient funds!</source> @@ -76,11 +98,26 @@ <source>Choose...</source> <translation>选择...</translation> </message> + <message> + <source>The recipient address is not valid. Please recheck.</source> + <translation>收款人地址无效，请再次确认。</translation> + </message> + <message> + <source>Pay only the required fee of %1</source> + <translation>仅支付全额的%1</translation> + </message> + <message> + <source>Warning: Invalid Bitcoin address</source> + <translation>警告：比特币地址无效</translation> + </message> </context> <context> <name>SendCoinsEntry</name> </context> <context> + <name>SendConfirmationDialog</name> + </context> +<context> <name>ShutdownWindow</name> </context> <context> @@ -93,17 +130,43 @@ <name>TrafficGraphWidget</name> </context> <context> + <name>TransactionDesc</name> + <message> + <source>Date</source> + <translation>日期</translation> + </message> + </context> +<context> <name>TransactionDescDialog</name> </context> <context> - <name>UnitDisplayStatusBarControl</name> + <name>TransactionTableModel</name> + <message> + <source>Date</source> + <translation>日期</translation> + </message> </context> <context> - <name>bitcoin-core</name> + <name>TransactionView</name> <message> - <source>Transaction amounts must be positive</source> - <translation>转账额度须为正数</translation> + <source>Date</source> + <translation>日期</translation> </message> + </context> +<context> + <name>UnitDisplayStatusBarControl</name> + </context> +<context> + <name>WalletFrame</name> + </context> +<context> + <name>WalletModel</name> + </context> +<context> + <name>WalletView</name> + </context> +<context> + <name>bitcoin-core</name> <message> <source>Transaction too large for fee policy</source> <translation>根据费率标准，本次转账超额</translation> diff --git a/src/qt/locale/bitcoin_zh_CN.ts b/src/qt/locale/bitcoin_zh_CN.ts index 92a7006d30..20875c2327 100644 --- a/src/qt/locale/bitcoin_zh_CN.ts +++ b/src/qt/locale/bitcoin_zh_CN.ts @@ -41,6 +41,77 @@ <source>&Delete</source> <translation>删除(&D)</translation> </message> + <message> + <source>Choose the address to send coins to</source> + <translation>选择要付钱过去的地址</translation> + </message> + <message> + <source>Choose the address to receive coins with</source> + <translation>选择要收钱进来的地址</translation> + </message> + <message> + <source>C&hoose</source> + <translation>选择</translation> + </message> + <message> + <source>Sending addresses</source> + <translation>付款地址</translation> + </message> + <message> + <source>Receiving addresses</source> + <translation>收款地址</translation> + </message> + <message> + <source>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source> + <translation>这些是你要付款过去的比特币地址。在付钱之前，务必要检查金额和收款地址是否正确。</translation> + </message> + <message> + <source>These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction.</source> + <translation>这些是你用来收款的比特币地址。建议在每次交易时，都使用一个新的收款地址。</translation> + </message> + <message> + <source>&Copy Address</source> + <translation>复制地址</translation> + </message> + <message> + <source>Copy &Label</source> + <translation>复制标签</translation> + </message> + <message> + <source>&Edit</source> + <translation>编辑</translation> + </message> + <message> + <source>Export Address List</source> + <translation>导出地址列表</translation> + </message> + <message> + <source>Comma separated file (*.csv)</source> + <translation>逗号分隔文件 (*.csv)</translation> + </message> + <message> + <source>Exporting Failed</source> + <translation>导出失败</translation> + </message> + <message> + <source>There was an error trying to save the address list to %1. Please try again.</source> + <translation>存储地址列表到 %1 时发生错误。请再试一次。</translation> + </message> +</context> +<context> + <name>AddressTableModel</name> + <message> + <source>Label</source> + <translation>标签</translation> + </message> + <message> + <source>Address</source> + <translation>地址</translation> + </message> + <message> + <source>(no label)</source> + <translation>(无标签)</translation> + </message> </context> <context> <name>AskPassphraseDialog</name> @@ -60,6 +131,94 @@ <source>Repeat new passphrase</source> <translation>重复新密码</translation> </message> + <message> + <source>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>.</source> + <translation>输入钱包的新密码。<br/>密码请用<b>10 个以上的随机字符</b>，或是<b>8 个以上的字词</b>。</translation> + </message> + <message> + <source>Encrypt wallet</source> + <translation>加密钱包</translation> + </message> + <message> + <source>This operation needs your wallet passphrase to unlock the wallet.</source> + <translation>这个操作需要你的钱包密码来解锁钱包。</translation> + </message> + <message> + <source>Unlock wallet</source> + <translation>解锁钱包</translation> + </message> + <message> + <source>This operation needs your wallet passphrase to decrypt the wallet.</source> + <translation>这个操作需要你的钱包密码来把钱包解密。</translation> + </message> + <message> + <source>Decrypt wallet</source> + <translation>解密钱包</translation> + </message> + <message> + <source>Change passphrase</source> + <translation>修改密码</translation> + </message> + <message> + <source>Enter the old passphrase and new passphrase to the wallet.</source> + <translation>请输入钱包的旧密码和新密码。</translation> + </message> + <message> + <source>Confirm wallet encryption</source> + <translation>确认钱包加密</translation> + </message> + <message> + <source>Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR BITCOINS</b>!</source> + <translation>警告: 如果把钱包加密后又忘记密码，你就会从此<b>失去其中所有的比特币了</b>！</translation> + </message> + <message> + <source>Are you sure you wish to encrypt your wallet?</source> + <translation>你确定要把钱包加密吗？</translation> + </message> + <message> + <source>Wallet encrypted</source> + <translation>钱包已加密</translation> + </message> + <message> + <source>%1 will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your bitcoins from being stolen by malware infecting your computer.</source> + <translation>%1 现在要关闭，以完成加密过程。请注意，加密钱包不能完全防止入侵你的电脑的恶意程序偷取钱币。</translation> + </message> + <message> + <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source> + <translation>重要: 请改用新产生的有加密的钱包文件，来取代旧钱包文件的备份。为了安全性，当你开始使用新的有加密的钱包后，旧钱包文件的备份就不能再使用了。</translation> + </message> + <message> + <source>Wallet encryption failed</source> + <translation>钱包加密失败</translation> + </message> + <message> + <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source> + <translation>因为内部错误导致钱包加密失败。你的钱包还是没加密。</translation> + </message> + <message> + <source>The supplied passphrases do not match.</source> + <translation>提供的密码不yi'zhi。</translation> + </message> + <message> + <source>Wallet unlock failed</source> + <translation>钱包解锁失败</translation> + </message> + <message> + <source>The passphrase entered for the wallet decryption was incorrect.</source> + <translation>输入用来解密钱包的密码不正确。</translation> + </message> + <message> + <source>Wallet decryption failed</source> + <translation>钱包解密失败</translation> + </message> + <message> + <source>Wallet passphrase was successfully changed.</source> + <translation>钱包密码修改成功。</translation> + </message> + <message> + <source>Warning: The Caps Lock key is on!</source> + <translation>警告: 大写字母锁定已开启！</translation> + </message> </context> <context> <name>BanTableModel</name> @@ -112,7 +271,11 @@ </message> <message> <source>&About %1</source> - <translation>&关于 %1</translation> + <translation>关于 %1</translation> + </message> + <message> + <source>Show information about %1</source> + <translation>显示 %1 相关信息</translation> </message> <message> <source>About &Qt</source> @@ -127,6 +290,10 @@ <translation>选项(&O)...</translation> </message> <message> + <source>Modify configuration options for %1</source> + <translation>修改%1配置选项</translation> + </message> + <message> <source>&Encrypt Wallet...</source> <translation>加密钱包(&E)...</translation> </message> @@ -151,6 +318,18 @@ <translation>打开 &URI...</translation> </message> <message> + <source>Click to disable network activity.</source> + <translation>点击禁用网络活动。</translation> + </message> + <message> + <source>Network activity disabled.</source> + <translation>网络活动已禁用。</translation> + </message> + <message> + <source>Click to enable network activity again.</source> + <translation>点击重新开启网络活动。</translation> + </message> + <message> <source>Reindexing blocks on disk...</source> <translation>正在为数据块重建索引...</translation> </message> @@ -232,7 +411,7 @@ </message> <message> <source>Request payments (generates QR codes and bitcoin: URIs)</source> - <translation>请求支付（生成二维码和 bitcoin: URI）</translation> + <translation>请求支付 (生成二维码和 bitcoin: URI)</translation> </message> <message> <source>Show the list of used sending addresses and labels</source> @@ -244,7 +423,7 @@ </message> <message> <source>Open a bitcoin: URI or payment request</source> - <translation>打开一个比特币：URI 或支付请求</translation> + <translation>打开一个 bitcoin: URI 或支付请求</translation> </message> <message> <source>&Command-line options</source> @@ -255,32 +434,16 @@ <translation><numerusform>%n 个到比特币网络的活动连接</numerusform></translation> </message> <message> - <source>No block source available...</source> - <translation>沒有可用的区块来源...</translation> - </message> - <message numerus="yes"> - <source>Processed %n block(s) of transaction history.</source> - <translation><numerusform>已处理 %n 个交易历史数据块。</numerusform></translation> - </message> - <message numerus="yes"> - <source>%n hour(s)</source> - <translation><numerusform>%n 小时</numerusform></translation> - </message> - <message numerus="yes"> - <source>%n day(s)</source> - <translation><numerusform>%n 天</numerusform></translation> - </message> - <message numerus="yes"> - <source>%n week(s)</source> - <translation><numerusform>%n 周</numerusform></translation> + <source>Indexing blocks on disk...</source> + <translation>正在为数据块建立索引...</translation> </message> <message> - <source>%1 and %2</source> - <translation>%1 和 %2</translation> + <source>Processing blocks on disk...</source> + <translation>正在处理数据块...</translation> </message> <message numerus="yes"> - <source>%n year(s)</source> - <translation><numerusform>%n 年</numerusform></translation> + <source>Processed %n block(s) of transaction history.</source> + <translation><numerusform>已处理 %n 个交易历史数据块。</numerusform></translation> </message> <message> <source>%1 behind</source> @@ -311,6 +474,18 @@ <translation>已是最新</translation> </message> <message> + <source>Show the %1 help message to get a list with possible Bitcoin command-line options</source> + <translation>显示 %1 帮助信息，获取可用命令行选项列表</translation> + </message> + <message> + <source>%1 client</source> + <translation>%1 客戶</translation> + </message> + <message> + <source>Connecting to peers...</source> + <translation>正在连接到节点……</translation> + </message> + <message> <source>Catching up...</source> <translation>更新中...</translation> </message> @@ -360,12 +535,16 @@ <source>Wallet is <b>encrypted</b> and currently <b>locked</b></source> <translation>钱包已被<b>加密</b>，当前为<b>锁定</b>状态</translation> </message> + <message> + <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> + <translation>发生严重错误。客户端无法安全地继续运行，即将退出。</translation> + </message> </context> <context> <name>CoinControlDialog</name> <message> <source>Coin Selection</source> - <translation>币源选择(Coin Selection)</translation> + <translation>选择钱币</translation> </message> <message> <source>Quantity:</source> @@ -380,10 +559,6 @@ <translation>金额：</translation> </message> <message> - <source>Priority:</source> - <translation>优先级：</translation> - </message> - <message> <source>Fee:</source> <translation>费用：</translation> </message> @@ -436,8 +611,84 @@ <translation>已确认</translation> </message> <message> - <source>Priority</source> - <translation>优先级</translation> + <source>Copy address</source> + <translation>复制地址</translation> + </message> + <message> + <source>Copy label</source> + <translation>复制标签</translation> + </message> + <message> + <source>Copy amount</source> + <translation>复制金额</translation> + </message> + <message> + <source>Copy transaction ID</source> + <translation>复制交易识别码</translation> + </message> + <message> + <source>Lock unspent</source> + <translation>锁定未花费</translation> + </message> + <message> + <source>Unlock unspent</source> + <translation>解锁未花费</translation> + </message> + <message> + <source>Copy quantity</source> + <translation>复制数目</translation> + </message> + <message> + <source>Copy fee</source> + <translation>复制手续费</translation> + </message> + <message> + <source>Copy after fee</source> + <translation>复制计费后金额</translation> + </message> + <message> + <source>Copy bytes</source> + <translation>复制字节数</translation> + </message> + <message> + <source>Copy dust</source> + <translation>复制零散金额</translation> + </message> + <message> + <source>Copy change</source> + <translation>复制找零金额</translation> + </message> + <message> + <source>(%1 locked)</source> + <translation>(锁定 %1 枚)</translation> + </message> + <message> + <source>yes</source> + <translation>是</translation> + </message> + <message> + <source>no</source> + <translation>否</translation> + </message> + <message> + <source>This label turns red if any recipient receives an amount smaller than the current dust threshold.</source> + <translation>当任何一个收款金额小于目前的零散金额上限时，文字会变红色。</translation> + </message> + <message> + <source>Can vary +/- %1 satoshi(s) per input.</source> + <translation>每组输入可能有 +/- %1 个 satoshi 的误差。</translation> + </message> + <message> + <source>(no label)</source> + <translation>(无标签)</translation> + </message> + <message> + <source>change from %1 (%2)</source> + <translation>找零前是 %1 (%2)</translation> + </message> + <message> + <source>(change)</source> + <translation>(找零)</translation> </message> </context> <context> @@ -462,6 +713,38 @@ <source>&Address</source> <translation>地址(&A)</translation> </message> + <message> + <source>New receiving address</source> + <translation>新建收款地址</translation> + </message> + <message> + <source>New sending address</source> + <translation>新建付款地址</translation> + </message> + <message> + <source>Edit receiving address</source> + <translation>编辑收款地址</translation> + </message> + <message> + <source>Edit sending address</source> + <translation>编辑付款地址</translation> + </message> + <message> + <source>The entered address "%1" is not a valid Bitcoin address.</source> + <translation>输入的地址 %1 并不是有效的比特币地址。</translation> + </message> + <message> + <source>The entered address "%1" is already in the address book.</source> + <translation>输入的地址 %1 已经存在地址簿。</translation> + </message> + <message> + <source>Could not unlock wallet.</source> + <translation>无法将钱包解锁。</translation> + </message> + <message> + <source>New key generation failed.</source> + <translation>产生新的密钥失败了。</translation> + </message> </context> <context> <name>FreespaceChecker</name> @@ -497,6 +780,10 @@ <translation>(%1 位)</translation> </message> <message> + <source>About %1</source> + <translation>關於 %1</translation> + </message> + <message> <source>Command-line options</source> <translation>命令行选项</translation> </message> @@ -532,7 +819,11 @@ <source>Show splash screen on startup (default: %u)</source> <translation>显示启动画面（默认：%u）</translation> </message> - </context> + <message> + <source>Reset all settings changed in the GUI</source> + <translation>重置图形界面所有的变更设置</translation> + </message> +</context> <context> <name>Intro</name> <message> @@ -540,6 +831,19 @@ <translation>欢迎</translation> </message> <message> + <source>Welcome to %1.</source> + <translation> +歡迎來到 %1</translation> + </message> + <message> + <source>As this is the first time the program is launched, you can choose where %1 will store its data.</source> + <translation>由于这是第一次启动此程序，您可以选择%1的数据所存储的位置</translation> + </message> + <message> + <source>%1 will download and store a copy of the Bitcoin block chain. At least %2GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source> + <translation>%1 会下载并存储一份比特币区块链的副本。至少有 %2GB 的数据会存储到这个目录中，并且还会持续增长。另外钱包资料也会储存在这个目录。</translation> + </message> + <message> <source>Use the default data directory</source> <translation>使用默认的数据目录</translation> </message> @@ -565,6 +869,53 @@ </message> </context> <context> + <name>ModalOverlay</name> + <message> + <source>Form</source> + <translation>表单</translation> + </message> + <message> + <source>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 bitcoin network, as detailed below.</source> + <translation>近期交易可能尚未显示，因此当前余额可能不准确。以上信息将在与比特币网络完全同步后更正。详情如下</translation> + </message> + <message> + <source>Attempting to spend bitcoins that are affected by not-yet-displayed transactions will not be accepted by the network.</source> + <translation>尝试使用受未可见交易影响的余额将不被网络接受。</translation> + </message> + <message> + <source>Number of blocks left</source> + <translation>剩余区块数量</translation> + </message> + <message> + <source>Unknown...</source> + <translation>未知</translation> + </message> + <message> + <source>Last block time</source> + <translation>上一数据块时间</translation> + </message> + <message> + <source>Progress</source> + <translation>进度</translation> + </message> + <message> + <source>Progress increase per hour</source> + <translation>每小时进度增加</translation> + </message> + <message> + <source>calculating...</source> + <translation>正在计算</translation> + </message> + <message> + <source>Estimated time left until synced</source> + <translation>预计剩余同步时间</translation> + </message> + <message> + <source>Hide</source> + <translation>隐藏</translation> + </message> + </context> +<context> <name>OpenURIDialog</name> <message> <source>Open URI</source> @@ -582,6 +933,10 @@ <source>Select payment request file</source> <translation>选择付款请求文件 </translation> </message> + <message> + <source>Select payment request file to open</source> + <translation>选择要打开的付款请求文件</translation> + </message> </context> <context> <name>OptionsDialog</name> @@ -594,6 +949,14 @@ <translation>主要(&M)</translation> </message> <message> + <source>Automatically start %1 after logging in to the system.</source> + <translation>在登入系统后自动启动 %1</translation> + </message> + <message> + <source>&Start %1 on system login</source> + <translation>系统登入时启动 %1</translation> + </message> + <message> <source>Size of &database cache</source> <translation>数据库缓存大小(&D)</translation> </message> @@ -719,7 +1082,7 @@ </message> <message> <source>Connect to the Bitcoin network through a separate SOCKS5 proxy for Tor hidden services.</source> - <translation>在Tor匿名网络下通过不同的SOCKS5代理连接比特币网络</translation> + <translation>在 Tor 匿名网络下通过不同的 SOCKS5 代理连接比特币网络</translation> </message> <message> <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services:</source> @@ -730,6 +1093,14 @@ <translation>窗口(&W)</translation> </message> <message> + <source>&Hide the icon from the system tray.</source> + <translation>不在通知区显示图标</translation> + </message> + <message> + <source>Hide tray icon</source> + <translation>不显示通知区图标</translation> + </message> + <message> <source>Show only a tray icon after minimizing the window.</source> <translation>最小化窗口后仅显示托盘图标</translation> </message> @@ -750,6 +1121,10 @@ <translation>用户界面语言(&L)：</translation> </message> <message> + <source>The user interface language can be set here. This setting will take effect after restarting %1.</source> + <translation>可以在这里设定用户界面的语言。这个设定在重启 %1 后才会生效。</translation> + </message> + <message> <source>&Unit to show amounts in:</source> <translation>比特币金额单位(&U)：</translation> </message> @@ -806,7 +1181,7 @@ </message> <message> <source>The displayed information may be out of date. Your wallet automatically synchronizes with the Bitcoin network after a connection is established, but this process has not completed yet.</source> - <translation>现在显示的消息可能是过期的. 在连接上比特币网络节点后，您的钱包将自动与网络同步，但是这个过程还没有完成。</translation> + <translation>现在显示的消息可能是过期的。在连接上比特币网络节点后，您的钱包将自动与网络同步，但是这个过程还没有完成。</translation> </message> <message> <source>Watch-only:</source> @@ -874,6 +1249,98 @@ </message> </context> <context> + <name>PaymentServer</name> + <message> + <source>Payment request error</source> + <translation>要求付款时发生错误</translation> + </message> + <message> + <source>Cannot start bitcoin: click-to-pay handler</source> + <translation>无法启动 bitcoin 协议的“ +一键支付”处理器</translation> + </message> + <message> + <source>URI handling</source> + <translation>URI 处理</translation> + </message> + <message> + <source>Payment request fetch URL is invalid: %1</source> + <translation>取得付款请求的 URL 无效: %1</translation> + </message> + <message> + <source>Invalid payment address %1</source> + <translation>无效的付款地址 %1</translation> + </message> + <message> + <source>URI cannot be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters.</source> + <translation>无法解析 URI 地址！可能是因为比特币地址无效，或是 URI 参数格式错误。</translation> + </message> + <message> + <source>Payment request file handling</source> + <translation>处理付款请求文件</translation> + </message> + <message> + <source>Payment request file cannot be read! This can be caused by an invalid payment request file.</source> + <translation>无法读取付款请求文件！可能是文件无效造成的。</translation> + </message> + <message> + <source>Payment request rejected</source> + <translation>付款请求已被拒绝</translation> + </message> + <message> + <source>Payment request network doesn't match client network.</source> + <translation>付款请求的网络类型跟客户端不符。</translation> + </message> + <message> + <source>Payment request expired.</source> + <translation>付款请求已过期。</translation> + </message> + <message> + <source>Payment request is not initialized.</source> + <translation>支付请求未成形。</translation> + </message> + <message> + <source>Unverified payment requests to custom payment scripts are unsupported.</source> + <translation>不支持到自定义付款脚本的未验证付款请求。</translation> + </message> + <message> + <source>Invalid payment request.</source> + <translation>无效的支付请求。</translation> + </message> + <message> + <source>Requested payment amount of %1 is too small (considered dust).</source> + <translation>请求支付的金额 %1 太小（就像尘埃）。</translation> + </message> + <message> + <source>Refund from %1</source> + <translation>退款来自 %1</translation> + </message> + <message> + <source>Payment request %1 is too large (%2 bytes, allowed %3 bytes).</source> + <translation>支付请求 %1 太大 (%2 字节。只允许 %3 字节)。</translation> + </message> + <message> + <source>Error communicating with %1: %2</source> + <translation>%1: %2 通讯出错</translation> + </message> + <message> + <source>Payment request cannot be parsed!</source> + <translation>无法解析 付款请求！</translation> + </message> + <message> + <source>Bad response from server %1</source> + <translation>来自 %1 服务器的错误响应</translation> + </message> + <message> + <source>Network request error</source> + <translation>网络请求出错</translation> + </message> + <message> + <source>Payment acknowledged</source> + <translation>付款已确认</translation> + </message> +</context> +<context> <name>PeerTableModel</name> <message> <source>User Agent</source> @@ -884,8 +1351,12 @@ <translation>节点/服务</translation> </message> <message> - <source>Ping Time</source> - <translation>Ping 时间</translation> + <source>NodeId</source> + <translation>节点ID</translation> + </message> + <message> + <source>Ping</source> + <translation> </translation> </message> </context> <context> @@ -926,6 +1397,72 @@ <source>%1 ms</source> <translation>%1 毫秒</translation> </message> + <message numerus="yes"> + <source>%n second(s)</source> + <translation><numerusform>%n 秒</numerusform></translation> + </message> + <message numerus="yes"> + <source>%n minute(s)</source> + <translation><numerusform>%n 分钟</numerusform></translation> + </message> + <message numerus="yes"> + <source>%n hour(s)</source> + <translation><numerusform>%n 小时</numerusform></translation> + </message> + <message numerus="yes"> + <source>%n day(s)</source> + <translation><numerusform>%n 天</numerusform></translation> + </message> + <message numerus="yes"> + <source>%n week(s)</source> + <translation><numerusform>%n 周</numerusform></translation> + </message> + <message> + <source>%1 and %2</source> + <translation>%1 和 %2</translation> + </message> + <message numerus="yes"> + <source>%n year(s)</source> + <translation><numerusform>%n 年</numerusform></translation> + </message> + <message> + <source>%1 didn't yet exit safely...</source> + <translation>%1 尚未安全退出</translation> + </message> +</context> +<context> + <name>QObject::QObject</name> + <message> + <source>Error: Specified data directory "%1" does not exist.</source> + <translation>错误：指定的数据目录“%1”不存在。</translation> + </message> + <message> + <source>Error: Cannot parse configuration file: %1. Only use key=value syntax.</source> + <translation>错误：无法解析配置文件：%1。只接受 key=value语法。</translation> + </message> + <message> + <source>Error: %1</source> + <translation>错误：%1</translation> + </message> +</context> +<context> + <name>QRImageWidget</name> + <message> + <source>&Save Image...</source> + <translation>保存图片(&S)...</translation> + </message> + <message> + <source>&Copy Image</source> + <translation>复制图片</translation> + </message> + <message> + <source>Save QR Code</source> + <translation>保存二维码</translation> + </message> + <message> + <source>PNG Image (*.png)</source> + <translation>PNG 图像(*.png)</translation> + </message> </context> <context> <name>RPCConsole</name> @@ -954,6 +1491,10 @@ <translation>使用的 BerkeleyDB 版本</translation> </message> <message> + <source>Datadir</source> + <translation>数据目录</translation> + </message> + <message> <source>Startup time</source> <translation>启动时间</translation> </message> @@ -1038,6 +1579,14 @@ <translation>用户代理</translation> </message> <message> + <source>Decrease font size</source> + <translation>缩小文字</translation> + </message> + <message> + <source>Increase font size</source> + <translation>放大文字</translation> + </message> + <message> <source>Services</source> <translation>服务</translation> </message> @@ -1062,10 +1611,18 @@ <translation>Ping 时间</translation> </message> <message> + <source>The duration of a currently outstanding ping.</source> + <translation>目前这一次 ping 已经过去的时间。</translation> + </message> + <message> <source>Ping Wait</source> <translation>Ping等待</translation> </message> <message> + <source>Min Ping</source> + <translation>最小Ping值</translation> + </message> + <message> <source>Time Offset</source> <translation>时间偏移</translation> </message> @@ -1095,7 +1652,7 @@ </message> <message> <source>In:</source> - <translation>输入：</translation> + <translation>输入:</translation> </message> <message> <source>Out:</source> @@ -1110,14 +1667,6 @@ <translation>清空控制台</translation> </message> <message> - <source>&Disconnect Node</source> - <translation>(&D)断开节点连接</translation> - </message> - <message> - <source>Ban Node for</source> - <translation>禁止节点连接时长：</translation> - </message> - <message> <source>1 &hour</source> <translation>1 小时(&H)</translation> </message> @@ -1134,8 +1683,20 @@ <translation>1 年(&Y)</translation> </message> <message> - <source>&Unban Node</source> - <translation>(&U)允许节点连接</translation> + <source>&Disconnect</source> + <translation>(&D)断开</translation> + </message> + <message> + <source>Ban for</source> + <translation>禁止</translation> + </message> + <message> + <source>&Unban</source> + <translation>重新允许</translation> + </message> + <message> + <source>Welcome to the %1 RPC console.</source> + <translation>欢迎使用 %1 的 RPC 控制台。</translation> </message> <message> <source>Use up and down arrows to navigate history, and <b>Ctrl-L</b> to clear screen.</source> @@ -1146,6 +1707,14 @@ <translation>使用 <b>help</b> 命令显示帮助信息。</translation> </message> <message> + <source>WARNING: Scammers have been active, telling users to type commands here, stealing their wallet contents. Do not use this console without fully understanding the ramification of a command.</source> + <translation>警告： 已有骗子通过要求用户在此输入指令以盗取钱包。不要在没有完全理解命令规范时使用控制台。</translation> + </message> + <message> + <source>Network activity disabled</source> + <translation>网络活动已禁用</translation> + </message> + <message> <source>%1 B</source> <translation>%1 字节</translation> </message> @@ -1264,6 +1833,22 @@ <source>Remove</source> <translation>移除</translation> </message> + <message> + <source>Copy URI</source> + <translation>复制URI</translation> + </message> + <message> + <source>Copy label</source> + <translation>复制标签</translation> + </message> + <message> + <source>Copy message</source> + <translation>复制消息</translation> + </message> + <message> + <source>Copy amount</source> + <translation>复制金额</translation> + </message> </context> <context> <name>ReceiveRequestDialog</name> @@ -1283,6 +1868,73 @@ <source>&Save Image...</source> <translation>保存图片(&S)...</translation> </message> + <message> + <source>Request payment to %1</source> + <translation>请求付款到 %1</translation> + </message> + <message> + <source>Payment information</source> + <translation>付款信息</translation> + </message> + <message> + <source>URI</source> + <translation>URI</translation> + </message> + <message> + <source>Address</source> + <translation>地址</translation> + </message> + <message> + <source>Amount</source> + <translation>金额</translation> + </message> + <message> + <source>Label</source> + <translation>标签</translation> + </message> + <message> + <source>Message</source> + <translation>消息</translation> + </message> + <message> + <source>Resulting URI too long, try to reduce the text for label / message.</source> + <translation>URI 太长，请试着精简标签或消息文本。</translation> + </message> + <message> + <source>Error encoding URI into QR Code.</source> + <translation>把 URI 编码成二维码时发生错误。</translation> + </message> +</context> +<context> + <name>RecentRequestsTableModel</name> + <message> + <source>Date</source> + <translation>日期</translation> + </message> + <message> + <source>Label</source> + <translation>标签</translation> + </message> + <message> + <source>Message</source> + <translation>消息</translation> + </message> + <message> + <source>(no label)</source> + <translation>(无标签)</translation> + </message> + <message> + <source>(no message)</source> + <translation>(无消息)</translation> + </message> + <message> + <source>(no amount requested)</source> + <translation>（无请求金额）</translation> + </message> + <message> + <source>Requested</source> + <translation>总额</translation> + </message> </context> <context> <name>SendCoinsDialog</name> @@ -1319,10 +1971,6 @@ <translation>金额：</translation> </message> <message> - <source>Priority:</source> - <translation>优先级：</translation> - </message> - <message> <source>Fee:</source> <translation>费用：</translation> </message> @@ -1391,10 +2039,6 @@ <translation>(智能交易费用 尚未初始化。 需要再下载一些数据块...)</translation> </message> <message> - <source>Confirmation time:</source> - <translation>确认时间：</translation> - </message> - <message> <source>normal</source> <translation>一般</translation> </message> @@ -1434,6 +2078,122 @@ <source>S&end</source> <translation>发送(&E)</translation> </message> + <message> + <source>Copy quantity</source> + <translation>复制数目</translation> + </message> + <message> + <source>Copy amount</source> + <translation>复制金额</translation> + </message> + <message> + <source>Copy fee</source> + <translation>复制手续费</translation> + </message> + <message> + <source>Copy after fee</source> + <translation>复制计费后金额</translation> + </message> + <message> + <source>Copy bytes</source> + <translation>复制字节数</translation> + </message> + <message> + <source>Copy dust</source> + <translation>复制零散金额</translation> + </message> + <message> + <source>Copy change</source> + <translation>复制找零金额</translation> + </message> + <message> + <source>%1 to %2</source> + <translation>%1 到 %2</translation> + </message> + <message> + <source>Are you sure you want to send?</source> + <translation>您确定要发出吗？</translation> + </message> + <message> + <source>added as transaction fee</source> + <translation>已添加交易费</translation> + </message> + <message> + <source>Total Amount %1</source> + <translation>总金额 %1</translation> + </message> + <message> + <source>or</source> + <translation>或</translation> + </message> + <message> + <source>Confirm send coins</source> + <translation>确认发送货币</translation> + </message> + <message> + <source>The recipient address is not valid. Please recheck.</source> + <translation>接收人地址无效。请重新检查。</translation> + </message> + <message> + <source>The amount to pay must be larger than 0.</source> + <translation>支付金额必须大于0。</translation> + </message> + <message> + <source>The amount exceeds your balance.</source> + <translation>金额超出您的账上余额。</translation> + </message> + <message> + <source>The total exceeds your balance when the %1 transaction fee is included.</source> + <translation>计入 %1 交易费后的金额超出您的账上余额。</translation> + </message> + <message> + <source>Duplicate address found: addresses should only be used once each.</source> + <translation>发现重复地址：每个地址应该只使用一次。</translation> + </message> + <message> + <source>Transaction creation failed!</source> + <translation>交易创建失败！</translation> + </message> + <message> + <source>The transaction was rejected with the following reason: %1</source> + <translation>交易因以下原因拒绝：%1</translation> + </message> + <message> + <source>A fee higher than %1 is considered an absurdly high fee.</source> + <translation>超过 %1 的交易费被认为是荒谬的高费率。</translation> + </message> + <message> + <source>Payment request expired.</source> + <translation>付款请求已过期。</translation> + </message> + <message numerus="yes"> + <source>%n block(s)</source> + <translation><numerusform>%n 个区块</numerusform></translation> + </message> + <message> + <source>Pay only the required fee of %1</source> + <translation>只支付必要费用 %1</translation> + </message> + <message numerus="yes"> + <source>Estimated to begin confirmation within %n block(s).</source> + <translation><numerusform>预计 %n 个数据块后被确认。</numerusform></translation> + </message> + <message> + <source>Warning: Invalid Bitcoin address</source> + <translation>警告: 比特币地址无效</translation> + </message> + <message> + <source>Warning: Unknown change address</source> + <translation>警告：未知的更改地址</translation> + </message> + <message> + <source>The address you selected for change is not part of this wallet. Any or all funds in your wallet may be sent to this address. Are you sure?</source> + <translation>你选择的找零地址未被包含在本钱包中，你钱包中的部分或全部金额将被发送至该地址。你确定要这样做吗？</translation> + </message> + <message> + <source>(no label)</source> + <translation>(无标签)</translation> + </message> </context> <context> <name>SendCoinsEntry</name> @@ -1513,10 +2273,25 @@ <source>Memo:</source> <translation>便条：</translation> </message> + <message> + <source>Enter a label for this address to add it to your address book</source> + <translation>为这个地址输入一个标签，以便将它添加到您的地址簿</translation> + </message> +</context> +<context> + <name>SendConfirmationDialog</name> + <message> + <source>Yes</source> + <translation>是</translation> + </message> </context> <context> <name>ShutdownWindow</name> <message> + <source>%1 is shutting down...</source> + <translation>正在关闭 %1 ...</translation> + </message> + <message> <source>Do not shut down the computer until this window disappears.</source> <translation>在此窗口消失前不要关闭计算机。</translation> </message> @@ -1607,6 +2382,58 @@ <source>Reset all verify message fields</source> <translation>清空所有验证消息栏</translation> </message> + <message> + <source>Click "Sign Message" to generate signature</source> + <translation>单击“签名消息“产生签名。</translation> + </message> + <message> + <source>The entered address is invalid.</source> + <translation>输入的地址非法。</translation> + </message> + <message> + <source>Please check the address and try again.</source> + <translation>请检查地址后重试。</translation> + </message> + <message> + <source>The entered address does not refer to a key.</source> + <translation>输入的地址没有关联的公私钥对。</translation> + </message> + <message> + <source>Wallet unlock was cancelled.</source> + <translation>钱包解锁动作取消。</translation> + </message> + <message> + <source>Private key for the entered address is not available.</source> + <translation>找不到输入地址关联的私钥。</translation> + </message> + <message> + <source>Message signing failed.</source> + <translation>消息签名失败。</translation> + </message> + <message> + <source>Message signed.</source> + <translation>消息已签名。</translation> + </message> + <message> + <source>The signature could not be decoded.</source> + <translation>签名无法解码。</translation> + </message> + <message> + <source>Please check the signature and try again.</source> + <translation>请检查签名后重试。</translation> + </message> + <message> + <source>The signature did not match the message digest.</source> + <translation>签名与消息摘要不匹配。</translation> + </message> + <message> + <source>Message verification failed.</source> + <translation>消息验证失败。</translation> + </message> + <message> + <source>Message verified.</source> + <translation>消息验证成功。</translation> + </message> </context> <context> <name>SplashScreen</name> @@ -1623,11 +2450,448 @@ </message> </context> <context> + <name>TransactionDesc</name> + <message numerus="yes"> + <source>Open for %n more block(s)</source> + <translation><numerusform>再打开 %n 个数据块</numerusform></translation> + </message> + <message> + <source>Open until %1</source> + <translation>至 %1 个数据块时开启</translation> + </message> + <message> + <source>conflicted with a transaction with %1 confirmations</source> + <translation>与一个有 %1 个确认的交易冲突</translation> + </message> + <message> + <source>%1/offline</source> + <translation>%1 / 离线</translation> + </message> + <message> + <source>0/unconfirmed, %1</source> + <translation>0/未确认，%1</translation> + </message> + <message> + <source>in memory pool</source> + <translation>在内存池中</translation> + </message> + <message> + <source>not in memory pool</source> + <translation>不在内存池中</translation> + </message> + <message> + <source>abandoned</source> + <translation>已抛弃</translation> + </message> + <message> + <source>%1/unconfirmed</source> + <translation>%1/未确认</translation> + </message> + <message> + <source>%1 confirmations</source> + <translation>%1 已确认</translation> + </message> + <message> + <source>Status</source> + <translation>状态</translation> + </message> + <message> + <source>, has not been successfully broadcast yet</source> + <translation>，未被成功广播</translation> + </message> + <message numerus="yes"> + <source>, broadcast through %n node(s)</source> + <translation><numerusform>, 通过 %n 个节点广播 </numerusform></translation> + </message> + <message> + <source>Date</source> + <translation>日期</translation> + </message> + <message> + <source>Source</source> + <translation>源</translation> + </message> + <message> + <source>Generated</source> + <translation>生成</translation> + </message> + <message> + <source>From</source> + <translation>来自</translation> + </message> + <message> + <source>unknown</source> + <translation>未知</translation> + </message> + <message> + <source>To</source> + <translation>到</translation> + </message> + <message> + <source>own address</source> + <translation>自己的地址</translation> + </message> + <message> + <source>watch-only</source> + <translation>观察地址(watch-only) </translation> + </message> + <message> + <source>label</source> + <translation>标签</translation> + </message> + <message> + <source>Credit</source> + <translation>收入</translation> + </message> + <message numerus="yes"> + <source>matures in %n more block(s)</source> + <translation><numerusform>%n 个数据块后成熟(mature) </numerusform></translation> + </message> + <message> + <source>not accepted</source> + <translation>未被接受</translation> + </message> + <message> + <source>Debit</source> + <translation>支出</translation> + </message> + <message> + <source>Total debit</source> + <translation>总收入</translation> + </message> + <message> + <source>Total credit</source> + <translation>总支出</translation> + </message> + <message> + <source>Transaction fee</source> + <translation>交易费</translation> + </message> + <message> + <source>Net amount</source> + <translation>净额</translation> + </message> + <message> + <source>Message</source> + <translation>消息</translation> + </message> + <message> + <source>Comment</source> + <translation>备注</translation> + </message> + <message> + <source>Transaction ID</source> + <translation>ID</translation> + </message> + <message> + <source>Transaction total size</source> + <translation>交易总大小</translation> + </message> + <message> + <source>Output index</source> + <translation>输出索引</translation> + </message> + <message> + <source>Merchant</source> + <translation>商家</translation> + </message> + <message> + <source>Generated coins must mature %1 blocks before they can be spent. When you generated this block, it was broadcast to the network to be added to the block chain. If it fails to get into the chain, its state will change to "not accepted" and it won't be spendable. This may occasionally happen if another node generates a block within a few seconds of yours.</source> + <translation>生成的比特币在可以使用前必须有 %1 个成熟的区块。当您生成了此区块后，它将被广播到网络中以加入区块链。如果它未成功进入区块链，其状态将变更为“不接受”并且不可使用。这可能偶尔会发生，如果另一个节点比你早几秒钟成功生成一个区块。</translation> + </message> + <message> + <source>Debug information</source> + <translation>调试信息</translation> + </message> + <message> + <source>Transaction</source> + <translation>交易</translation> + </message> + <message> + <source>Inputs</source> + <translation>输入</translation> + </message> + <message> + <source>Amount</source> + <translation>金额</translation> + </message> + <message> + <source>true</source> + <translation>是</translation> + </message> + <message> + <source>false</source> + <translation>否</translation> + </message> +</context> +<context> <name>TransactionDescDialog</name> <message> <source>This pane shows a detailed description of the transaction</source> <translation>当前面板显示了交易的详细信息</translation> </message> + </context> +<context> + <name>TransactionTableModel</name> + <message> + <source>Date</source> + <translation>日期</translation> + </message> + <message> + <source>Type</source> + <translation>种类</translation> + </message> + <message> + <source>Label</source> + <translation>标签</translation> + </message> + <message> + <source>Open until %1</source> + <translation>至 %1 个数据块时开启</translation> + </message> + <message> + <source>Offline</source> + <translation>掉线</translation> + </message> + <message> + <source>Unconfirmed</source> + <translation>未确认的 </translation> + </message> + <message> + <source>Confirming (%1 of %2 recommended confirmations)</source> + <translation>确认中 (推荐 %2个确认，已经有 %1个确认)</translation> + </message> + <message> + <source>Confirmed (%1 confirmations)</source> + <translation>已确认 (%1 条确认信息)</translation> + </message> + <message> + <source>Conflicted</source> + <translation>冲突的</translation> + </message> + <message> + <source>Immature (%1 confirmations, will be available after %2)</source> + <translation>未成熟 (%1 个确认，将在 %2 个后可用)</translation> + </message> + <message> + <source>This block was not received by any other nodes and will probably not be accepted!</source> + <translation>此数据块未被任何其他节点接收，可能不被接受！</translation> + </message> + <message> + <source>Generated but not accepted</source> + <translation>已生成但未被接受</translation> + </message> + <message> + <source>Received with</source> + <translation>收款</translation> + </message> + <message> + <source>Received from</source> + <translation>收款来自</translation> + </message> + <message> + <source>Sent to</source> + <translation>付款</translation> + </message> + <message> + <source>Payment to yourself</source> + <translation>付款给自己</translation> + </message> + <message> + <source>Mined</source> + <translation>挖矿所得</translation> + </message> + <message> + <source>watch-only</source> + <translation>观察地址(watch-only) </translation> + </message> + <message> + <source>(n/a)</source> + <translation>（不可用）</translation> + </message> + <message> + <source>(no label)</source> + <translation>(无标签)</translation> + </message> + <message> + <source>Transaction status. Hover over this field to show number of confirmations.</source> + <translation>交易状态。 鼠标移到此区域可显示确认项数量。</translation> + </message> + <message> + <source>Date and time that the transaction was received.</source> + <translation>接收到交易的时间</translation> + </message> + <message> + <source>Type of transaction.</source> + <translation>交易类别。</translation> + </message> + <message> + <source>Whether or not a watch-only address is involved in this transaction.</source> + <translation>该交易中是否涉及 观察地址(watch-only address)。</translation> + </message> + <message> + <source>User-defined intent/purpose of the transaction.</source> + <translation>用户定义的该交易的意图/目的。</translation> + </message> + <message> + <source>Amount removed from or added to balance.</source> + <translation>从余额添加或移除的金额。</translation> + </message> +</context> +<context> + <name>TransactionView</name> + <message> + <source>All</source> + <translation>全部</translation> + </message> + <message> + <source>Today</source> + <translation>今天</translation> + </message> + <message> + <source>This week</source> + <translation>这星期</translation> + </message> + <message> + <source>This month</source> + <translation>这个月</translation> + </message> + <message> + <source>Last month</source> + <translation>上个月</translation> + </message> + <message> + <source>This year</source> + <translation>今年</translation> + </message> + <message> + <source>Range...</source> + <translation>指定范围...</translation> + </message> + <message> + <source>Received with</source> + <translation>收款</translation> + </message> + <message> + <source>Sent to</source> + <translation>付款</translation> + </message> + <message> + <source>To yourself</source> + <translation>给自己</translation> + </message> + <message> + <source>Mined</source> + <translation>挖矿所得</translation> + </message> + <message> + <source>Other</source> + <translation>其它</translation> + </message> + <message> + <source>Enter address or label to search</source> + <translation>输入地址或标签进行搜索</translation> + </message> + <message> + <source>Min amount</source> + <translation>最小金额</translation> + </message> + <message> + <source>Abandon transaction</source> + <translation>放弃交易</translation> + </message> + <message> + <source>Copy address</source> + <translation>复制地址</translation> + </message> + <message> + <source>Copy label</source> + <translation>复制标签</translation> + </message> + <message> + <source>Copy amount</source> + <translation>复制金额</translation> + </message> + <message> + <source>Copy transaction ID</source> + <translation>复制交易识别码</translation> + </message> + <message> + <source>Copy raw transaction</source> + <translation>复制原始交易</translation> + </message> + <message> + <source>Copy full transaction details</source> + <translation>复制所有交易详情</translation> + </message> + <message> + <source>Edit label</source> + <translation>编辑标签</translation> + </message> + <message> + <source>Show transaction details</source> + <translation>显示交易详情</translation> + </message> + <message> + <source>Export Transaction History</source> + <translation>导出交易历史</translation> + </message> + <message> + <source>Comma separated file (*.csv)</source> + <translation>逗号分隔文件 (*.csv)</translation> + </message> + <message> + <source>Confirmed</source> + <translation>已确认</translation> + </message> + <message> + <source>Watch-only</source> + <translation>观察地址(Watch-only) </translation> + </message> + <message> + <source>Date</source> + <translation>日期</translation> + </message> + <message> + <source>Type</source> + <translation>种类</translation> + </message> + <message> + <source>Label</source> + <translation>标签</translation> + </message> + <message> + <source>Address</source> + <translation>地址</translation> + </message> + <message> + <source>ID</source> + <translation>ID</translation> + </message> + <message> + <source>Exporting Failed</source> + <translation>导出失败</translation> + </message> + <message> + <source>There was an error trying to save the transaction history to %1.</source> + <translation>导出交易历史到 %1 时发生错误。</translation> + </message> + <message> + <source>Exporting Successful</source> + <translation>导出成功</translation> + </message> + <message> + <source>The transaction history was successfully saved to %1.</source> + <translation>交易历史已成功保存到 %1。</translation> + </message> + <message> + <source>Range:</source> + <translation>范围：</translation> + </message> + <message> + <source>to</source> + <translation>到</translation> + </message> </context> <context> <name>UnitDisplayStatusBarControl</name> @@ -1637,6 +2901,55 @@ </message> </context> <context> + <name>WalletFrame</name> + <message> + <source>No wallet has been loaded.</source> + <translation>没有载入钱包。</translation> + </message> +</context> +<context> + <name>WalletModel</name> + <message> + <source>Send Coins</source> + <translation>发送比特币</translation> + </message> +</context> +<context> + <name>WalletView</name> + <message> + <source>&Export</source> + <translation>导出(&E)</translation> + </message> + <message> + <source>Export the data in the current tab to a file</source> + <translation>导出当前分页里的数据到文件</translation> + </message> + <message> + <source>Backup Wallet</source> + <translation>备份钱包</translation> + </message> + <message> + <source>Wallet Data (*.dat)</source> + <translation>钱包文件(*.dat)</translation> + </message> + <message> + <source>Backup Failed</source> + <translation>备份失败</translation> + </message> + <message> + <source>There was an error trying to save the wallet data to %1.</source> + <translation>尝试保存钱包数据至 %1 时发生错误。</translation> + </message> + <message> + <source>Backup Successful</source> + <translation>备份成功</translation> + </message> + <message> + <source>The wallet data was successfully saved to %1.</source> + <translation>钱包数据成功保存至 %1 。</translation> + </message> +</context> +<context> <name>bitcoin-core</name> <message> <source>Options:</source> @@ -1674,10 +2987,6 @@ <translation>修剪：最后的钱包同步超过了修剪的数据。你需要通过 -reindex (重新下载整个区块链以防修剪节点)</translation> </message> <message> - <source>Reduce storage requirements by pruning (deleting) old blocks. This mode is incompatible with -txindex and -rescan. Warning: Reverting this setting requires re-downloading the entire blockchain. (default: 0 = disable pruning blocks, >%u = target size in MiB to use for block files)</source> - <translation>通过修剪(删除)旧数据块减少存储需求。此模式与 -txindex 和 -rescan不兼容。警告：还原此设置需要重新下载整个区块链。(默认: 0 = 禁用修剪数据块， >%u = 数据块文件目标大小，单位 MiB)</translation> - </message> - <message> <source>Rescans are not possible in pruned mode. You will need to use -reindex which will download the whole blockchain again.</source> <translation>无法在开启修剪的状态下重扫描，请使用 -reindex重新下载完整的区块链。</translation> </message> @@ -1704,16 +3013,12 @@ <translation>无法启动HTTP服务，查看日志获取更多信息</translation> </message> <message> - <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> - <translation>接受来自外部的连接 (缺省: 如果不带 -proxy or -connect 参数设置为1)</translation> - </message> - <message> <source>Bitcoin Core</source> - <translation>比特币核心</translation> + <translation>Bitcoin Core</translation> </message> <message> - <source>-fallbackfee is set very high! This is the transaction fee you may pay when fee estimates are not available.</source> - <translation>-fallbackfree 交易费设置得很高！这是在费用估计不可用时你可能会支付的交易费。</translation> + <source>The %s developers</source> + <translation>%s 开发人员</translation> </message> <message> <source>A fee rate (in %s/kB) that will be used when fee estimation has insufficient data (default: %s)</source> @@ -1732,18 +3037,10 @@ <translation>删除钱包的所有交易记录，且只有用 -rescan参数启动客户端才能重新取回交易记录 </translation> </message> <message> - <source>Distributed under the MIT software license, see the accompanying file COPYING or <http://www.opensource.org/licenses/mit-license.php>.</source> - <translation>Distributed under the MIT software license, see the accompanying file COPYING or <http://www.opensource.org/licenses/mit-license.php>.</translation> - </message> - <message> <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source> <translation>当最佳区块变化时执行命令 (命令行中的 %s 会被替换成区块哈希值)</translation> </message> <message> - <source>Force relay of transactions from whitelisted peers even they violate local relay policy (default: %d)</source> - <translation>强制关联来自白名单同行的交易即使他们违反本地关联政策(默认: %d)</translation> - </message> - <message> <source>Set the number of script verification threads (%u to %d, 0 = auto, <0 = leave that many cores free, default: %d)</source> <translation>设置脚本验证的程序 (%u 到 %d, 0 = 自动, <0 = 保留自由的核心, 默认值: %d)</translation> </message> @@ -1752,26 +3049,10 @@ <translation>区块数据库包含未来的交易，这可能是由本机错误的日期时间引起。若确认本机日期时间正确，请重新建立区块数据库。</translation> </message> <message> - <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source> - <translation>这是测试用的预发布版本 - 请谨慎使用 - 不要用来挖矿，或者在正式商用环境下使用</translation> - </message> - <message> <source>Use UPnP to map the listening port (default: 1 when listening and no -proxy)</source> <translation>使用UPnP暴露本机监听端口（默认：1 当正在监听且不使用代理）</translation> </message> <message> - <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source> - <translation>警告：网络似乎并不完全同意！有些矿工似乎遇到了问题。</translation> - </message> - <message> - <source>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</source> - <translation>警告：我们的同行似乎不完全同意！您可能需要升级，或者其他节点可能需要升级。</translation> - </message> - <message> - <source>Whitelist peers connecting from the given netmask or IP address. Can be specified multiple times.</source> - <translation>节点白名单,网络掩码或IP址。可多次指定。</translation> - </message> - <message> <source>-maxmempool must be at least %d MB</source> <translation>-maxmempool 最小为%d MB</translation> </message> @@ -1788,14 +3069,18 @@ <translation>数据块创建选项：</translation> </message> <message> - <source>Connect only to the specified node(s)</source> - <translation>仅连接到指定节点</translation> + <source>Cannot resolve -%s address: '%s'</source> + <translation>无法解析 - %s 地址： '%s'</translation> </message> <message> <source>Connection options:</source> <translation>连接选项：</translation> </message> <message> + <source>Copyright (C) %i-%i</source> + <translation>版权所有 (C) %i-%i</translation> + </message> + <message> <source>Corrupted block database detected</source> <translation>检测发现数据块数据库损坏。请使用 -reindex参数重启客户端。</translation> </message> @@ -1840,6 +3125,10 @@ <translation>Error initializing wallet database environment %s!</translation> </message> <message> + <source>Error loading %s</source> + <translation>载入 %s 时发生错误</translation> + </message> + <message> <source>Error loading block database</source> <translation>导入数据块数据库出错</translation> </message> @@ -1880,10 +3169,6 @@ <translation>认证Cookie的位置 (默认: data目录)</translation> </message> <message> - <source>Minimum bytes per sigop in transactions we relay and mine (default: %u)</source> - <translation>我们关联和挖掘的每sigop的最低交易字节(默认: %u)</translation> - </message> - <message> <source>Not enough file descriptors available.</source> <translation>没有足够的文件描述符可用。</translation> </message> @@ -1916,6 +3201,10 @@ <translation>指定钱包文件（数据目录内）</translation> </message> <message> + <source>The source code is available from %s.</source> + <translation>源代码可以在 %s 获得。</translation> + </message> + <message> <source>Unsupported argument -benchmark ignored, use -debug=bench.</source> <translation>忽略不支持的选项 -benchmark，使用 -debug=bench</translation> </message> @@ -1932,16 +3221,20 @@ <translation>使用UPnp映射监听端口 (默认: %u) </translation> </message> <message> + <source>Use the test chain</source> + <translation>使用测试链</translation> + </message> + <message> <source>User Agent comment (%s) contains unsafe characters.</source> <translation>用户代理评论(%s)包含不安全的字符。</translation> </message> <message> <source>Verifying blocks...</source> - <translation>正在验证数据库的完整性...</translation> + <translation>正在验证区块...</translation> </message> <message> <source>Verifying wallet...</source> - <translation>正在检测钱包的完整性...</translation> + <translation>正在验证钱包...</translation> </message> <message> <source>Wallet %s resides outside data directory %s</source> @@ -1996,10 +3289,6 @@ <translation>Maximum size of data in data carrier transactions we relay and mine (default: %u)</translation> </message> <message> - <source>Query for peer addresses via DNS lookup, if low on addresses (default: 1 unless -connect)</source> - <translation>通过DNS查询每个地址，如果短地址 (默认值: 1 除非 -连接)</translation> - </message> - <message> <source>Randomize credentials for every proxy connection. This enables Tor stream isolation (default: %u)</source> <translation>为每个代理连接随机化凭据。这将启用 Tor 流隔离 (默认: %u)</translation> </message> @@ -2012,10 +3301,6 @@ <translation>在交易费被扣除后发送的交易金额太小</translation> </message> <message> - <source>This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit <https://www.openssl.org/> and cryptographic software written by Eric Young and UPnP software written by Thomas Bernard.</source> - <translation>This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit <https://www.openssl.org/> and cryptographic software written by Eric Young and UPnP software written by Thomas Bernard.</translation> - </message> - <message> <source>Whitelisted peers cannot be DoS banned and their transactions are always relayed, even if they are already in the mempool, useful e.g. for a gateway</source> <translation>白名单节点不能被DoS banned ，且转发所有来自他们的交易(即便这些交易已经存在于mempool中)，常用于网关 </translation> </message> @@ -2044,6 +3329,10 @@ <translation>读取数据库出错，关闭中。</translation> </message> <message> + <source>Imports blocks from external blk000??.dat file on startup</source> + <translation>启动时从其他来源的 blk000??.dat 文件导入区块</translation> + </message> + <message> <source>Information</source> <translation>信息</translation> </message> @@ -2072,6 +3361,10 @@ <translation>RPC 服务器选项：</translation> </message> <message> + <source>Reducing -maxconnections from %d to %d, because of system limitations.</source> + <translation>因为系统的限制，将 -maxconnections 参数从 %d 降到了 %d</translation> + </message> + <message> <source>Rescan the block chain for missing wallet transactions on startup</source> <translation>重新扫描区块链以查找遗漏的钱包交易</translation> </message> @@ -2104,12 +3397,16 @@ <translation>这是实验性的软件。</translation> </message> <message> - <source>Transaction amount too small</source> - <translation>交易量太小</translation> + <source>Tor control port password (default: empty)</source> + <translation>Tor 控制端口密码 (默认值: 空白)</translation> </message> <message> - <source>Transaction amounts must be positive</source> - <translation>交易金额必须是积极的</translation> + <source>Tor control port to use if onion listening enabled (default: %s)</source> + <translation>开启监听 onion 连接时的 Tor 控制端口号 (默认值: %s)</translation> + </message> + <message> + <source>Transaction amount too small</source> + <translation>交易量太小</translation> </message> <message> <source>Transaction too large for fee policy</source> @@ -2136,12 +3433,16 @@ <translation>警告</translation> </message> <message> + <source>Warning: unknown new rules activated (versionbit %i)</source> + <translation>警告: 不明的交易规则被启用了(versionbit %i)</translation> + </message> + <message> <source>Whether to operate in a blocks only mode (default: %u)</source> <translation>是否用块方进行 (%u)</translation> </message> <message> <source>Zapping all transactions from wallet...</source> - <translation>Zapping all transactions from wallet...</translation> + <translation>正在消除錢包中的所有交易...</translation> </message> <message> <source>ZeroMQ notification options:</source> @@ -2169,6 +3470,18 @@ <translation>(1 = 保留 tx meta data , 如 account owner 和 payment request information, 2 = 不保留 tx meta data) </translation> </message> <message> + <source>-maxtxfee is set very high! Fees this large could be paid on a single transaction.</source> + <translation>参数 -maxtxfee 设定了很高的金额！这是你一次交易就有可能付出的最高手续费。</translation> + </message> + <message> + <source>Do not keep transactions in the mempool longer than <n> hours (default: %u)</source> + <translation>不要让交易留在内存池中超过 <n> 个小时 (默认值: %u)</translation> + </message> + <message> + <source>Fees (in %s/kB) smaller than this are considered zero fee for transaction creation (default: %s)</source> + <translation>当产生交易时，如果每千字节 (kB) 的手续费比这个值 (单位是 %s) 低，就视为没支付手续费 (默认值: %s)</translation> + </message> + <message> <source>How thorough the block verification of -checkblocks is (0-4, default: %u)</source> <translation>数据块验证 严密级别 -checkblocks (0-4, 默认: %u) </translation> </message> @@ -2185,10 +3498,22 @@ <translation>输出调试信息 (默认: %u, 提供 <category> 是可选项)</translation> </message> <message> + <source>Support filtering of blocks and transaction with bloom filters (default: %u)</source> + <translation>支持用 Bloom 过滤器来过滤区块和交易(默认值: %u)</translation> + </message> + <message> + <source>Total length of network version string (%i) exceeds maximum length (%i). Reduce the number or size of uacomments.</source> + <translation>网络版本字符串的总长度 (%i) 超过最大长度 (%i) 了。请减少 uacomment 参数的数目或长度。</translation> + </message> + <message> <source>Tries to keep outbound traffic under the given target (in MiB per 24h), 0 = no limit (default: %d)</source> <translation>尝试保持上传带宽低于（MiB/24h），0=无限制（默认：%d）</translation> </message> <message> + <source>Unsupported argument -socks found. Setting SOCKS version isn't possible anymore, only SOCKS5 proxies are supported.</source> + <translation>找到不再支持的 -socks 参数。现在只支持 SOCKS5 协议的代理服务器，因此不可以指定 SOCKS 协议版本。</translation> + </message> + <message> <source>Unsupported argument -whitelistalwaysrelay ignored, use -whitelistrelay and/or -whitelistforcerelay.</source> <translation>一个不被支持的参数 -whitelistalwaysrelay 被忽略了。请使用 -whitelistrelay 或者 -whitelistforcerelay.</translation> </message> @@ -2261,10 +3586,6 @@ <translation>设置私钥池大小为 <n> (默认：%u) </translation> </message> <message> - <source>Set minimum block size in bytes (default: %u)</source> - <translation>设置数据块 最小字节数 (默认: %u) </translation> - </message> - <message> <source>Set the number of threads to service RPC calls (default: %d)</source> <translation>设置RPC服务线程数 (默认: %d) </translation> </message> @@ -2285,6 +3606,10 @@ <translation>付款时允许使用未确认的零钱 (默认: %u) </translation> </message> <message> + <source>Starting network threads...</source> + <translation>正在启动网络线程...</translation> + </message> + <message> <source>Threshold for disconnecting misbehaving peers (default: %u)</source> <translation>断开 非礼节点的阀值 (默认: %u) </translation> </message> @@ -2298,7 +3623,7 @@ </message> <message> <source>Loading block index...</source> - <translation>正在加载数据块索引...</translation> + <translation>正在加载区块索引...</translation> </message> <message> <source>Add a node to connect to and attempt to keep the connection open</source> diff --git a/src/qt/locale/bitcoin_zh_HK.ts b/src/qt/locale/bitcoin_zh_HK.ts index aa014db0bd..2f3a8d1f16 100644 --- a/src/qt/locale/bitcoin_zh_HK.ts +++ b/src/qt/locale/bitcoin_zh_HK.ts @@ -41,7 +41,10 @@ <source>&Delete</source> <translation>刪除 &D</translation> </message> -</context> + </context> +<context> + <name>AddressTableModel</name> + </context> <context> <name>AskPassphraseDialog</name> <message> @@ -60,7 +63,7 @@ <source>Repeat new passphrase</source> <translation>重複新密碼</translation> </message> -</context> + </context> <context> <name>BanTableModel</name> <message> @@ -215,6 +218,9 @@ <name>Intro</name> </context> <context> + <name>ModalOverlay</name> + </context> +<context> <name>OpenURIDialog</name> </context> <context> @@ -224,12 +230,21 @@ <name>OverviewPage</name> </context> <context> + <name>PaymentServer</name> + </context> +<context> <name>PeerTableModel</name> </context> <context> <name>QObject</name> </context> <context> + <name>QObject::QObject</name> + </context> +<context> + <name>QRImageWidget</name> + </context> +<context> <name>RPCConsole</name> </context> <context> @@ -239,12 +254,18 @@ <name>ReceiveRequestDialog</name> </context> <context> + <name>RecentRequestsTableModel</name> + </context> +<context> <name>SendCoinsDialog</name> </context> <context> <name>SendCoinsEntry</name> </context> <context> + <name>SendConfirmationDialog</name> + </context> +<context> <name>ShutdownWindow</name> </context> <context> @@ -257,12 +278,30 @@ <name>TrafficGraphWidget</name> </context> <context> + <name>TransactionDesc</name> + </context> +<context> <name>TransactionDescDialog</name> </context> <context> + <name>TransactionTableModel</name> + </context> +<context> + <name>TransactionView</name> + </context> +<context> <name>UnitDisplayStatusBarControl</name> </context> <context> + <name>WalletFrame</name> + </context> +<context> + <name>WalletModel</name> + </context> +<context> + <name>WalletView</name> + </context> +<context> <name>bitcoin-core</name> </context> </TS>
\ No newline at end of file diff --git a/src/qt/locale/bitcoin_zh_TW.ts b/src/qt/locale/bitcoin_zh_TW.ts index ab56f96795..bd0533a83e 100644 --- a/src/qt/locale/bitcoin_zh_TW.ts +++ b/src/qt/locale/bitcoin_zh_TW.ts @@ -41,6 +41,77 @@ <source>&Delete</source> <translation>刪掉</translation> </message> + <message> + <source>Choose the address to send coins to</source> + <translation>選擇要付錢過去的位址</translation> + </message> + <message> + <source>Choose the address to receive coins with</source> + <translation>選擇要收錢進來的位址</translation> + </message> + <message> + <source>C&hoose</source> + <translation>選取</translation> + </message> + <message> + <source>Sending addresses</source> + <translation>付款位址</translation> + </message> + <message> + <source>Receiving addresses</source> + <translation>收款位址</translation> + </message> + <message> + <source>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source> + <translation>這些是你要付款過去的 Bitcoin 位址。在付錢之前，務必要檢查金額和收款位址是否正確。</translation> + </message> + <message> + <source>These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction.</source> + <translation>這些是你用來收款的 Bitcoin 位址。建議在每次交易時，都使用一個新的收款位址。</translation> + </message> + <message> + <source>&Copy Address</source> + <translation>複製位址</translation> + </message> + <message> + <source>Copy &Label</source> + <translation>複製標記</translation> + </message> + <message> + <source>&Edit</source> + <translation>編輯</translation> + </message> + <message> + <source>Export Address List</source> + <translation>匯出位址清單</translation> + </message> + <message> + <source>Comma separated file (*.csv)</source> + <translation>逗點分隔資料檔(*.csv)</translation> + </message> + <message> + <source>Exporting Failed</source> + <translation>匯出失敗</translation> + </message> + <message> + <source>There was an error trying to save the address list to %1. Please try again.</source> + <translation>儲存位址列表到 %1 時發生錯誤。請重試一次。</translation> + </message> +</context> +<context> + <name>AddressTableModel</name> + <message> + <source>Label</source> + <translation>標記</translation> + </message> + <message> + <source>Address</source> + <translation>位址</translation> + </message> + <message> + <source>(no label)</source> + <translation>(無標記)</translation> + </message> </context> <context> <name>AskPassphraseDialog</name> @@ -60,6 +131,94 @@ <source>Repeat new passphrase</source> <translation>重複新密碼</translation> </message> + <message> + <source>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>.</source> + <translation>輸入錢包的新密碼。<br/>密碼請用<b>10 個以上的隨機字元</b>，或是<b>8 個以上的字詞</b>。</translation> + </message> + <message> + <source>Encrypt wallet</source> + <translation>加密錢包</translation> + </message> + <message> + <source>This operation needs your wallet passphrase to unlock the wallet.</source> + <translation>這個動作需要你的錢包密碼來解鎖錢包。</translation> + </message> + <message> + <source>Unlock wallet</source> + <translation>解鎖錢包</translation> + </message> + <message> + <source>This operation needs your wallet passphrase to decrypt the wallet.</source> + <translation>這個動作需要你的錢包密碼來把錢包解密。</translation> + </message> + <message> + <source>Decrypt wallet</source> + <translation>解密錢包</translation> + </message> + <message> + <source>Change passphrase</source> + <translation>改變密碼</translation> + </message> + <message> + <source>Enter the old passphrase and new passphrase to the wallet.</source> + <translation>請輸入錢包的舊密碼和新密碼。</translation> + </message> + <message> + <source>Confirm wallet encryption</source> + <translation>確認錢包加密</translation> + </message> + <message> + <source>Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR BITCOINS</b>!</source> + <translation>警告: 如果把錢包加密後又忘記密碼，你就會從此<b>失去其中所有的 Bitcoin 了</b>！</translation> + </message> + <message> + <source>Are you sure you wish to encrypt your wallet?</source> + <translation>你確定要把錢包加密嗎？</translation> + </message> + <message> + <source>Wallet encrypted</source> + <translation>錢包已加密</translation> + </message> + <message> + <source>%1 will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your bitcoins from being stolen by malware infecting your computer.</source> + <translation>%1 現在要關閉，好完成加密程序。請注意，加密錢包不能完全防止入侵你的電腦的惡意程式偷取錢幣。</translation> + </message> + <message> + <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source> + <translation>重要: 請改用新產生有加密的錢包檔，來取代舊錢包檔的備份。為了安全性的理由，當你開始使用新的有加密的錢包後，舊錢包檔的備份就不能再使用了。</translation> + </message> + <message> + <source>Wallet encryption failed</source> + <translation>錢包加密失敗</translation> + </message> + <message> + <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source> + <translation>因為內部錯誤導致錢包加密失敗。你的錢包還是沒加密。</translation> + </message> + <message> + <source>The supplied passphrases do not match.</source> + <translation>提供的密碼不一樣。</translation> + </message> + <message> + <source>Wallet unlock failed</source> + <translation>錢包解鎖失敗</translation> + </message> + <message> + <source>The passphrase entered for the wallet decryption was incorrect.</source> + <translation>輸入要用來解密錢包的密碼不對。</translation> + </message> + <message> + <source>Wallet decryption failed</source> + <translation>錢包解密失敗</translation> + </message> + <message> + <source>Wallet passphrase was successfully changed.</source> + <translation>錢包密碼改成功了。</translation> + </message> + <message> + <source>Warning: The Caps Lock key is on!</source> + <translation>警告: 大寫字母鎖定作用中！</translation> + </message> </context> <context> <name>BanTableModel</name> @@ -159,6 +318,22 @@ <translation>開啓 URI...</translation> </message> <message> + <source>Click to disable network activity.</source> + <translation>按一下就會不使用網路。</translation> + </message> + <message> + <source>Network activity disabled.</source> + <translation>網路活動關閉了。</translation> + </message> + <message> + <source>Click to enable network activity again.</source> + <translation>按一下就又會使用網路。</translation> + </message> + <message> + <source>Syncing Headers (%1%)...</source> + <translation>正在同步前導資料(%1%)中...</translation> + </message> + <message> <source>Reindexing blocks on disk...</source> <translation>正在為磁碟裡的區塊重建索引...</translation> </message> @@ -270,34 +445,10 @@ <source>Processing blocks on disk...</source> <translation>正在處理磁碟裡的區塊資料...</translation> </message> - <message> - <source>No block source available...</source> - <translation>沒有可用的區塊來源...</translation> - </message> <message numerus="yes"> <source>Processed %n block(s) of transaction history.</source> <translation><numerusform>已經處理了 %n 個區塊的交易紀錄。</numerusform></translation> </message> - <message numerus="yes"> - <source>%n hour(s)</source> - <translation><numerusform>%n 個小時</numerusform></translation> - </message> - <message numerus="yes"> - <source>%n day(s)</source> - <translation><numerusform>%n 天</numerusform></translation> - </message> - <message numerus="yes"> - <source>%n week(s)</source> - <translation><numerusform>%n 個星期</numerusform></translation> - </message> - <message> - <source>%1 and %2</source> - <translation>%1又 %2</translation> - </message> - <message numerus="yes"> - <source>%n year(s)</source> - <translation><numerusform>%n 年</numerusform></translation> - </message> <message> <source>%1 behind</source> <translation>落後 %1</translation> @@ -335,6 +486,10 @@ <translation>%1 客戶端軟體</translation> </message> <message> + <source>Connecting to peers...</source> + <translation>正在跟其他節點連線中...</translation> + </message> + <message> <source>Catching up...</source> <translation>正在趕進度...</translation> </message> @@ -377,6 +532,14 @@ <translation>收款交易</translation> </message> <message> + <source>HD key generation is <b>enabled</b></source> + <translation>產生 HD 金鑰<b>已經啟用</b></translation> + </message> + <message> + <source>HD key generation is <b>disabled</b></source> + <translation>產生 HD 金鑰<b>已經停用</b></translation> + </message> + <message> <source>Wallet is <b>encrypted</b> and currently <b>unlocked</b></source> <translation>錢包<b>已加密</b>並且<b>解鎖中</b></translation> </message> @@ -384,6 +547,10 @@ <source>Wallet is <b>encrypted</b> and currently <b>locked</b></source> <translation>錢包<b>已加密</b>並且<b>上鎖中</b></translation> </message> + <message> + <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> + <translation>發生了致命的錯誤。Bitcoin 軟體沒辦法再繼續安全執行，只好結束。</translation> + </message> </context> <context> <name>CoinControlDialog</name> @@ -404,10 +571,6 @@ <translation>金額:</translation> </message> <message> - <source>Priority:</source> - <translation>優先度:</translation> - </message> - <message> <source>Fee:</source> <translation>手續費:</translation> </message> @@ -460,8 +623,84 @@ <translation>已確認</translation> </message> <message> - <source>Priority</source> - <translation>優先度</translation> + <source>Copy address</source> + <translation>複製位址</translation> + </message> + <message> + <source>Copy label</source> + <translation>複製標記</translation> + </message> + <message> + <source>Copy amount</source> + <translation>複製金額</translation> + </message> + <message> + <source>Copy transaction ID</source> + <translation>複製交易識別碼</translation> + </message> + <message> + <source>Lock unspent</source> + <translation>鎖定不用</translation> + </message> + <message> + <source>Unlock unspent</source> + <translation>解鎖可用</translation> + </message> + <message> + <source>Copy quantity</source> + <translation>複製數目</translation> + </message> + <message> + <source>Copy fee</source> + <translation>複製手續費</translation> + </message> + <message> + <source>Copy after fee</source> + <translation>複製計費後金額</translation> + </message> + <message> + <source>Copy bytes</source> + <translation>複製位元組數</translation> + </message> + <message> + <source>Copy dust</source> + <translation>複製零散金額</translation> + </message> + <message> + <source>Copy change</source> + <translation>複製找零金額</translation> + </message> + <message> + <source>(%1 locked)</source> + <translation>(鎖定 %1 枚)</translation> + </message> + <message> + <source>yes</source> + <translation>是</translation> + </message> + <message> + <source>no</source> + <translation>否</translation> + </message> + <message> + <source>This label turns red if any recipient receives an amount smaller than the current dust threshold.</source> + <translation>當任何一個收款金額小於目前的零散金額上限時，文字會變紅色。</translation> + </message> + <message> + <source>Can vary +/- %1 satoshi(s) per input.</source> + <translation>每組輸入可能有 +/- %1 個 satoshi 的誤差。</translation> + </message> + <message> + <source>(no label)</source> + <translation>(無標記)</translation> + </message> + <message> + <source>change from %1 (%2)</source> + <translation>找零前是 %1 (%2)</translation> + </message> + <message> + <source>(change)</source> + <translation>(找零)</translation> </message> </context> <context> @@ -486,6 +725,38 @@ <source>&Address</source> <translation>位址</translation> </message> + <message> + <source>New receiving address</source> + <translation>造新的收款位址</translation> + </message> + <message> + <source>New sending address</source> + <translation>造新的付款位址</translation> + </message> + <message> + <source>Edit receiving address</source> + <translation>編輯收款位址</translation> + </message> + <message> + <source>Edit sending address</source> + <translation>編輯付款位址</translation> + </message> + <message> + <source>The entered address "%1" is not a valid Bitcoin address.</source> + <translation>輸入的位址 %1 並不是有效的 Bitcoin 位址。</translation> + </message> + <message> + <source>The entered address "%1" is already in the address book.</source> + <translation>輸入的位址 %1 在位址簿中已經有了。</translation> + </message> + <message> + <source>Could not unlock wallet.</source> + <translation>沒辦法把錢包解鎖。</translation> + </message> + <message> + <source>New key generation failed.</source> + <translation>產生新的密鑰失敗了。</translation> + </message> </context> <context> <name>FreespaceChecker</name> @@ -609,6 +880,57 @@ </message> </context> <context> + <name>ModalOverlay</name> + <message> + <source>Form</source> + <translation>表單</translation> + </message> + <message> + <source>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 bitcoin network, as detailed below.</source> + <translation>最近的交易可能還看不到，因此錢包餘額可能不正確。在錢包軟體完成跟 bitcoin 網路的同步後，這裡的資訊就會正確。詳情請見下面。</translation> + </message> + <message> + <source>Attempting to spend bitcoins that are affected by not-yet-displayed transactions will not be accepted by the network.</source> + <translation>使用還沒顯示出來的交易所影響到的 bitcoin 可能會不被網路所接受。</translation> + </message> + <message> + <source>Number of blocks left</source> + <translation>剩餘區塊數</translation> + </message> + <message> + <source>Unknown...</source> + <translation>不明...</translation> + </message> + <message> + <source>Last block time</source> + <translation>最近區塊時間</translation> + </message> + <message> + <source>Progress</source> + <translation>進度</translation> + </message> + <message> + <source>Progress increase per hour</source> + <translation>每小時進度</translation> + </message> + <message> + <source>calculating...</source> + <translation>正在計算中...</translation> + </message> + <message> + <source>Estimated time left until synced</source> + <translation>預估完成同步所需時間</translation> + </message> + <message> + <source>Hide</source> + <translation>隱藏</translation> + </message> + <message> + <source>Unknown. Syncing Headers (%1)...</source> + <translation>不明。正在同步前導資料(%1)中...</translation> + </message> +</context> +<context> <name>OpenURIDialog</name> <message> <source>Open URI</source> @@ -626,6 +948,10 @@ <source>Select payment request file</source> <translation>選擇付款要求資料檔</translation> </message> + <message> + <source>Select payment request file to open</source> + <translation>選擇要開啟的付款要求資料檔</translation> + </message> </context> <context> <name>OptionsDialog</name> @@ -938,6 +1264,97 @@ </message> </context> <context> + <name>PaymentServer</name> + <message> + <source>Payment request error</source> + <translation>要求付款時發生錯誤</translation> + </message> + <message> + <source>Cannot start bitcoin: click-to-pay handler</source> + <translation>沒辦法啟動 bitcoin 協議的「按就付」處理器</translation> + </message> + <message> + <source>URI handling</source> + <translation>URI 處理</translation> + </message> + <message> + <source>Payment request fetch URL is invalid: %1</source> + <translation>取得付款要求的 URL 無效: %1</translation> + </message> + <message> + <source>Invalid payment address %1</source> + <translation>無效的付款位址 %1</translation> + </message> + <message> + <source>URI cannot be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters.</source> + <translation>沒辦法解析 URI 位址！可能是因為 Bitcoin 位址無效，或是 URI 參數格式錯誤。</translation> + </message> + <message> + <source>Payment request file handling</source> + <translation>處理付款要求檔案</translation> + </message> + <message> + <source>Payment request file cannot be read! This can be caused by an invalid payment request file.</source> + <translation>沒辦法讀取付款要求檔案！可能是無效的檔案造成的。</translation> + </message> + <message> + <source>Payment request rejected</source> + <translation>付款的要求被拒絕了</translation> + </message> + <message> + <source>Payment request network doesn't match client network.</source> + <translation>付款要求的網路類型跟客戶端不符。</translation> + </message> + <message> + <source>Payment request expired.</source> + <translation>付款的要求過期了。</translation> + </message> + <message> + <source>Payment request is not initialized.</source> + <translation>付款的要求沒有完成初始化。</translation> + </message> + <message> + <source>Unverified payment requests to custom payment scripts are unsupported.</source> + <translation>不支援含有自訂付款指令碼，且沒驗證過的付款要求。</translation> + </message> + <message> + <source>Invalid payment request.</source> + <translation>付款的要求無效。</translation> + </message> + <message> + <source>Requested payment amount of %1 is too small (considered dust).</source> + <translation>要求付款的金額 %1 太少(會被網路認為是沒必要的零散錢)。</translation> + </message> + <message> + <source>Refund from %1</source> + <translation>來自 %1 的退款</translation> + </message> + <message> + <source>Payment request %1 is too large (%2 bytes, allowed %3 bytes).</source> + <translation>付款要求 %1 過大 (%2 位元組, 上限 %3 位元組).</translation> + </message> + <message> + <source>Error communicating with %1: %2</source> + <translation>跟 %1 通訊時發生錯誤: %2</translation> + </message> + <message> + <source>Payment request cannot be parsed!</source> + <translation>沒辦法解析付款要求內容！</translation> + </message> + <message> + <source>Bad response from server %1</source> + <translation>伺服器 %1 的回應有誤</translation> + </message> + <message> + <source>Network request error</source> + <translation>發出要求時發生網路錯誤</translation> + </message> + <message> + <source>Payment acknowledged</source> + <translation>付款已確認</translation> + </message> +</context> +<context> <name>PeerTableModel</name> <message> <source>User Agent</source> @@ -948,8 +1365,12 @@ <translation>節點/服務</translation> </message> <message> - <source>Ping Time</source> - <translation>Ping 時間</translation> + <source>NodeId</source> + <translation>節點識別碼</translation> + </message> + <message> + <source>Ping</source> + <translation>Ping 時間</translation> </message> </context> <context> @@ -990,6 +1411,72 @@ <source>%1 ms</source> <translation>%1 毫秒</translation> </message> + <message numerus="yes"> + <source>%n second(s)</source> + <translation><numerusform>%n 秒鐘</numerusform></translation> + </message> + <message numerus="yes"> + <source>%n minute(s)</source> + <translation><numerusform>%n 分鐘</numerusform></translation> + </message> + <message numerus="yes"> + <source>%n hour(s)</source> + <translation><numerusform>%n 小時</numerusform></translation> + </message> + <message numerus="yes"> + <source>%n day(s)</source> + <translation><numerusform>%n 天</numerusform></translation> + </message> + <message numerus="yes"> + <source>%n week(s)</source> + <translation><numerusform>%n 星期</numerusform></translation> + </message> + <message> + <source>%1 and %2</source> + <translation>%1又 %2</translation> + </message> + <message numerus="yes"> + <source>%n year(s)</source> + <translation><numerusform>%n 年</numerusform></translation> + </message> + <message> + <source>%1 didn't yet exit safely...</source> + <translation>%1 還沒有安全地結束...</translation> + </message> +</context> +<context> + <name>QObject::QObject</name> + <message> + <source>Error: Specified data directory "%1" does not exist.</source> + <translation>錯誤: 不存在指定的資料目錄 "%1" 。</translation> + </message> + <message> + <source>Error: Cannot parse configuration file: %1. Only use key=value syntax.</source> + <translation>錯誤: 沒辦法解析設定檔: %1。只能用「名稱=設定值」這種語法。</translation> + </message> + <message> + <source>Error: %1</source> + <translation>錯誤: %1</translation> + </message> +</context> +<context> + <name>QRImageWidget</name> + <message> + <source>&Save Image...</source> + <translation>儲存圖片...</translation> + </message> + <message> + <source>&Copy Image</source> + <translation>複製圖片</translation> + </message> + <message> + <source>Save QR Code</source> + <translation>儲存 QR Code</translation> + </message> + <message> + <source>PNG Image (*.png)</source> + <translation>PNG 圖檔(*.png)</translation> + </message> </context> <context> <name>RPCConsole</name> @@ -1150,6 +1637,10 @@ <translation>Ping 等待時間</translation> </message> <message> + <source>Min Ping</source> + <translation>Ping 最短時間</translation> + </message> + <message> <source>Time Offset</source> <translation>時間差</translation> </message> @@ -1194,14 +1685,6 @@ <translation>清主控台</translation> </message> <message> - <source>&Disconnect Node</source> - <translation>跟節點斷線</translation> - </message> - <message> - <source>Ban Node for</source> - <translation>禁止節點連線:</translation> - </message> - <message> <source>1 &hour</source> <translation>1 小時</translation> </message> @@ -1218,8 +1701,16 @@ <translation>1 年</translation> </message> <message> - <source>&Unban Node</source> - <translation>解禁節點連線</translation> + <source>&Disconnect</source> + <translation>斷線</translation> + </message> + <message> + <source>Ban for</source> + <translation>禁止連線</translation> + </message> + <message> + <source>&Unban</source> + <translation>連線解禁</translation> </message> <message> <source>Welcome to the %1 RPC console.</source> @@ -1234,6 +1725,14 @@ <translation>請打 <b>help</b> 來看可用指令的簡介。</translation> </message> <message> + <source>WARNING: Scammers have been active, telling users to type commands here, stealing their wallet contents. Do not use this console without fully understanding the ramification of a command.</source> + <translation>警告: 已知有詐騙集團會叫人在這個畫面輸入指令，以偷取他們錢包的內容物。請不要在沒有充分理解指令可能造成後果的情況下使用主控台。</translation> + </message> + <message> + <source>Network activity disabled</source> + <translation>網路活動已關閉</translation> + </message> + <message> <source>%1 B</source> <translation>%1 B (位元組)</translation> </message> @@ -1352,6 +1851,22 @@ <source>Remove</source> <translation>刪掉</translation> </message> + <message> + <source>Copy URI</source> + <translation>複製 URI</translation> + </message> + <message> + <source>Copy label</source> + <translation>複製標記</translation> + </message> + <message> + <source>Copy message</source> + <translation>複製訊息</translation> + </message> + <message> + <source>Copy amount</source> + <translation>複製金額</translation> + </message> </context> <context> <name>ReceiveRequestDialog</name> @@ -1371,6 +1886,73 @@ <source>&Save Image...</source> <translation>儲存圖片...</translation> </message> + <message> + <source>Request payment to %1</source> + <translation>付款給 %1 的要求</translation> + </message> + <message> + <source>Payment information</source> + <translation>付款資訊</translation> + </message> + <message> + <source>URI</source> + <translation>URI</translation> + </message> + <message> + <source>Address</source> + <translation>位址</translation> + </message> + <message> + <source>Amount</source> + <translation>金額</translation> + </message> + <message> + <source>Label</source> + <translation>標記:</translation> + </message> + <message> + <source>Message</source> + <translation>訊息</translation> + </message> + <message> + <source>Resulting URI too long, try to reduce the text for label / message.</source> + <translation>產生的 URI 過長，請試著縮短標記或訊息的文字內容。</translation> + </message> + <message> + <source>Error encoding URI into QR Code.</source> + <translation>把 URI 編碼成 QR Code 時發生錯誤。</translation> + </message> +</context> +<context> + <name>RecentRequestsTableModel</name> + <message> + <source>Date</source> + <translation>日期</translation> + </message> + <message> + <source>Label</source> + <translation>標記:</translation> + </message> + <message> + <source>Message</source> + <translation>訊息</translation> + </message> + <message> + <source>(no label)</source> + <translation>(無標記)</translation> + </message> + <message> + <source>(no message)</source> + <translation>(無訊息)</translation> + </message> + <message> + <source>(no amount requested)</source> + <translation>(無要求金額)</translation> + </message> + <message> + <source>Requested</source> + <translation>要求金額</translation> + </message> </context> <context> <name>SendCoinsDialog</name> @@ -1407,10 +1989,6 @@ <translation>金額:</translation> </message> <message> - <source>Priority:</source> - <translation>優先度:</translation> - </message> - <message> <source>Fee:</source> <translation>手續費:</translation> </message> @@ -1479,10 +2057,6 @@ <translation>(手續費智慧演算法還沒準備好。通常都要等幾個區塊才行...)</translation> </message> <message> - <source>Confirmation time:</source> - <translation>確認時間:</translation> - </message> - <message> <source>normal</source> <translation>正常</translation> </message> @@ -1507,6 +2081,10 @@ <translation>零散錢:</translation> </message> <message> + <source>Confirmation time target:</source> + <translation>目標確認時間:</translation> + </message> + <message> <source>Clear &All</source> <translation>全部清掉</translation> </message> @@ -1522,6 +2100,122 @@ <source>S&end</source> <translation>付款</translation> </message> + <message> + <source>Copy quantity</source> + <translation>複製數目</translation> + </message> + <message> + <source>Copy amount</source> + <translation>複製金額</translation> + </message> + <message> + <source>Copy fee</source> + <translation>複製手續費</translation> + </message> + <message> + <source>Copy after fee</source> + <translation>複製計費後金額</translation> + </message> + <message> + <source>Copy bytes</source> + <translation>複製位元組數</translation> + </message> + <message> + <source>Copy dust</source> + <translation>複製零散金額</translation> + </message> + <message> + <source>Copy change</source> + <translation>複製找零金額</translation> + </message> + <message> + <source>%1 to %2</source> + <translation>%1 給 %2</translation> + </message> + <message> + <source>Are you sure you want to send?</source> + <translation>你確定要付錢出去嗎？</translation> + </message> + <message> + <source>added as transaction fee</source> + <translation>加做交易手續費</translation> + </message> + <message> + <source>Total Amount %1</source> + <translation>總金額 %1</translation> + </message> + <message> + <source>or</source> + <translation>或</translation> + </message> + <message> + <source>Confirm send coins</source> + <translation>確認付款金額</translation> + </message> + <message> + <source>The recipient address is not valid. Please recheck.</source> + <translation>收款位址無效。請再檢查看看。</translation> + </message> + <message> + <source>The amount to pay must be larger than 0.</source> + <translation>付款金額必須大於零。</translation> + </message> + <message> + <source>The amount exceeds your balance.</source> + <translation>金額超過餘額了。</translation> + </message> + <message> + <source>The total exceeds your balance when the %1 transaction fee is included.</source> + <translation>包含 %1 的交易手續費後，總金額超過你的餘額了。</translation> + </message> + <message> + <source>Duplicate address found: addresses should only be used once each.</source> + <translation>發現有重複的位址: 每個位址只能出現一次。</translation> + </message> + <message> + <source>Transaction creation failed!</source> + <translation>製造交易失敗了！</translation> + </message> + <message> + <source>The transaction was rejected with the following reason: %1</source> + <translation>交易因為以下原因被拒絕了: %1</translation> + </message> + <message> + <source>A fee higher than %1 is considered an absurdly high fee.</source> + <translation>高於 %1 的手續費會被認為是不合理。</translation> + </message> + <message> + <source>Payment request expired.</source> + <translation>付款的要求過期了。</translation> + </message> + <message numerus="yes"> + <source>%n block(s)</source> + <translation><numerusform>%n 個區塊</numerusform></translation> + </message> + <message> + <source>Pay only the required fee of %1</source> + <translation>只付必要的手續費 %1</translation> + </message> + <message> + <source>Warning: Invalid Bitcoin address</source> + <translation>警告: Bitcoin 位址無效</translation> + </message> + <message> + <source>Warning: Unknown change address</source> + <translation>警告: 不明的找零位址</translation> + </message> + <message> + <source>Confirm custom change address</source> + <translation>自定找零位址確認</translation> + </message> + <message> + <source>The address you selected for change is not part of this wallet. Any or all funds in your wallet may be sent to this address. Are you sure?</source> + <translation>選擇的找零位址並不屬於這個錢包。部份或是全部的錢會被送到這個位址去。你確定嗎？</translation> + </message> + <message> + <source>(no label)</source> + <translation>(無標記)</translation> + </message> </context> <context> <name>SendCoinsEntry</name> @@ -1601,6 +2295,17 @@ <source>Memo:</source> <translation>備註:</translation> </message> + <message> + <source>Enter a label for this address to add it to your address book</source> + <translation>請輸入這個位址的標記來把它加進位址簿中</translation> + </message> +</context> +<context> + <name>SendConfirmationDialog</name> + <message> + <source>Yes</source> + <translation>是</translation> + </message> </context> <context> <name>ShutdownWindow</name> @@ -1699,6 +2404,58 @@ <source>Reset all verify message fields</source> <translation>重設所有訊息驗證欄位</translation> </message> + <message> + <source>Click "Sign Message" to generate signature</source> + <translation>請按一下「簽署訊息」來產生簽章</translation> + </message> + <message> + <source>The entered address is invalid.</source> + <translation>輸入的位址無效。</translation> + </message> + <message> + <source>Please check the address and try again.</source> + <translation>請檢查位址是否正確後再試一次。</translation> + </message> + <message> + <source>The entered address does not refer to a key.</source> + <translation>輸入的位址沒有對應到你的任何密鑰。</translation> + </message> + <message> + <source>Wallet unlock was cancelled.</source> + <translation>錢包解鎖已取消。</translation> + </message> + <message> + <source>Private key for the entered address is not available.</source> + <translation>沒有對應輸入位址的密鑰。</translation> + </message> + <message> + <source>Message signing failed.</source> + <translation>訊息簽署失敗。</translation> + </message> + <message> + <source>Message signed.</source> + <translation>訊息簽署好了。</translation> + </message> + <message> + <source>The signature could not be decoded.</source> + <translation>沒辦法把這個簽章解碼。</translation> + </message> + <message> + <source>Please check the signature and try again.</source> + <translation>請檢查簽章是否正確後再試一次。</translation> + </message> + <message> + <source>The signature did not match the message digest.</source> + <translation>這個簽章跟訊息的數位摘要不符。</translation> + </message> + <message> + <source>Message verification failed.</source> + <translation>訊息驗證失敗。</translation> + </message> + <message> + <source>Message verified.</source> + <translation>訊息驗證沒錯。</translation> + </message> </context> <context> <name>SplashScreen</name> @@ -1715,11 +2472,460 @@ </message> </context> <context> + <name>TransactionDesc</name> + <message numerus="yes"> + <source>Open for %n more block(s)</source> + <translation><numerusform>到下 %n 個區塊生出來前可修改</numerusform></translation> + </message> + <message> + <source>Open until %1</source> + <translation>到 %1 前可修改</translation> + </message> + <message> + <source>conflicted with a transaction with %1 confirmations</source> + <translation>跟一個目前確認 %1 次的交易互相衝突</translation> + </message> + <message> + <source>%1/offline</source> + <translation>%1 次/離線中</translation> + </message> + <message> + <source>0/unconfirmed, %1</source> + <translation>0 次/未確認，%1</translation> + </message> + <message> + <source>in memory pool</source> + <translation>在記憶池中</translation> + </message> + <message> + <source>not in memory pool</source> + <translation>不在記憶池中</translation> + </message> + <message> + <source>abandoned</source> + <translation>已中止</translation> + </message> + <message> + <source>%1/unconfirmed</source> + <translation>%1 次/未確認</translation> + </message> + <message> + <source>%1 confirmations</source> + <translation>確認 %1 次</translation> + </message> + <message> + <source>Status</source> + <translation>狀態</translation> + </message> + <message> + <source>, has not been successfully broadcast yet</source> + <translation>，還沒成功公告出去</translation> + </message> + <message numerus="yes"> + <source>, broadcast through %n node(s)</source> + <translation><numerusform>，已公告給 %n 個節點</numerusform></translation> + </message> + <message> + <source>Date</source> + <translation>日期</translation> + </message> + <message> + <source>Source</source> + <translation>來源</translation> + </message> + <message> + <source>Generated</source> + <translation>生產出來</translation> + </message> + <message> + <source>From</source> + <translation>來源</translation> + </message> + <message> + <source>unknown</source> + <translation>未知</translation> + </message> + <message> + <source>To</source> + <translation>目的</translation> + </message> + <message> + <source>own address</source> + <translation>自己的位址</translation> + </message> + <message> + <source>watch-only</source> + <translation>只能看</translation> + </message> + <message> + <source>label</source> + <translation>標記</translation> + </message> + <message> + <source>Credit</source> + <translation>入帳</translation> + </message> + <message numerus="yes"> + <source>matures in %n more block(s)</source> + <translation><numerusform>再等 %n 個區塊生出來後成熟</numerusform></translation> + </message> + <message> + <source>not accepted</source> + <translation>不被接受</translation> + </message> + <message> + <source>Debit</source> + <translation>出帳</translation> + </message> + <message> + <source>Total debit</source> + <translation>出帳總額</translation> + </message> + <message> + <source>Total credit</source> + <translation>入帳總額</translation> + </message> + <message> + <source>Transaction fee</source> + <translation>交易手續費</translation> + </message> + <message> + <source>Net amount</source> + <translation>淨額</translation> + </message> + <message> + <source>Message</source> + <translation>訊息</translation> + </message> + <message> + <source>Comment</source> + <translation>附註</translation> + </message> + <message> + <source>Transaction ID</source> + <translation>交易識別碼</translation> + </message> + <message> + <source>Transaction total size</source> + <translation>交易總大小</translation> + </message> + <message> + <source>Output index</source> + <translation>輸出索引</translation> + </message> + <message> + <source>Merchant</source> + <translation>商家</translation> + </message> + <message> + <source>Generated coins must mature %1 blocks before they can be spent. When you generated this block, it was broadcast to the network to be added to the block chain. If it fails to get into the chain, its state will change to "not accepted" and it won't be spendable. This may occasionally happen if another node generates a block within a few seconds of yours.</source> + <translation>生產出來的錢要再等 %1 個區塊生出來後才成熟可以用。當區塊生產出來時會公布到網路上，來被加進區塊鏈。如果加失敗了，狀態就會變成「不被接受」，而且不能夠花。如果在你生產出區塊的幾秒鐘內，也有其他節點生產出來的話，就有可能會發生這種情形。</translation> + </message> + <message> + <source>Debug information</source> + <translation>除錯資訊</translation> + </message> + <message> + <source>Transaction</source> + <translation>交易</translation> + </message> + <message> + <source>Inputs</source> + <translation>輸入</translation> + </message> + <message> + <source>Amount</source> + <translation>金額</translation> + </message> + <message> + <source>true</source> + <translation>是</translation> + </message> + <message> + <source>false</source> + <translation>否</translation> + </message> +</context> +<context> <name>TransactionDescDialog</name> <message> <source>This pane shows a detailed description of the transaction</source> <translation>這個版面顯示這次交易的詳細說明</translation> </message> + <message> + <source>Details for %1</source> + <translation>交易 %1 的明細</translation> + </message> +</context> +<context> + <name>TransactionTableModel</name> + <message> + <source>Date</source> + <translation>日期</translation> + </message> + <message> + <source>Type</source> + <translation>種類</translation> + </message> + <message> + <source>Label</source> + <translation>標記:</translation> + </message> + <message numerus="yes"> + <source>Open for %n more block(s)</source> + <translation><numerusform>到下 %n 個區塊生出來前可修改</numerusform></translation> + </message> + <message> + <source>Open until %1</source> + <translation>到 %1 前可修改</translation> + </message> + <message> + <source>Offline</source> + <translation>離線中</translation> + </message> + <message> + <source>Unconfirmed</source> + <translation>未確認</translation> + </message> + <message> + <source>Abandoned</source> + <translation>已中止</translation> + </message> + <message> + <source>Confirming (%1 of %2 recommended confirmations)</source> + <translation>確認中(已經 %1 次，建議至少 %2 次)</translation> + </message> + <message> + <source>Confirmed (%1 confirmations)</source> + <translation>已確認(%1 次)</translation> + </message> + <message> + <source>Conflicted</source> + <translation>有衝突</translation> + </message> + <message> + <source>Immature (%1 confirmations, will be available after %2)</source> + <translation>未成熟(確認 %1 次，會在 %2 次後可用)</translation> + </message> + <message> + <source>This block was not received by any other nodes and will probably not be accepted!</source> + <translation>沒有其他節點收到這個區塊，也許它不會被接受！</translation> + </message> + <message> + <source>Generated but not accepted</source> + <translation>生產出來但是不被接受</translation> + </message> + <message> + <source>Received with</source> + <translation>收款</translation> + </message> + <message> + <source>Received from</source> + <translation>收款自</translation> + </message> + <message> + <source>Sent to</source> + <translation>付款</translation> + </message> + <message> + <source>Payment to yourself</source> + <translation>付給自己</translation> + </message> + <message> + <source>Mined</source> + <translation>開採所得</translation> + </message> + <message> + <source>watch-only</source> + <translation>只能看</translation> + </message> + <message> + <source>(n/a)</source> + <translation>(不適用)</translation> + </message> + <message> + <source>(no label)</source> + <translation>(無標記)</translation> + </message> + <message> + <source>Transaction status. Hover over this field to show number of confirmations.</source> + <translation>交易狀態。把游標停在欄位上會顯示確認次數。</translation> + </message> + <message> + <source>Date and time that the transaction was received.</source> + <translation>收到交易的日期和時間。</translation> + </message> + <message> + <source>Type of transaction.</source> + <translation>交易的種類。</translation> + </message> + <message> + <source>Whether or not a watch-only address is involved in this transaction.</source> + <translation>不論如何有一個只能觀看的地只有參與這次的交易</translation> + </message> + <message> + <source>User-defined intent/purpose of the transaction.</source> + <translation>使用者定義的交易動機或理由。</translation> + </message> + <message> + <source>Amount removed from or added to balance.</source> + <translation>要減掉或加進餘額的金額。</translation> + </message> +</context> +<context> + <name>TransactionView</name> + <message> + <source>All</source> + <translation>全部</translation> + </message> + <message> + <source>Today</source> + <translation>今天</translation> + </message> + <message> + <source>This week</source> + <translation>這星期</translation> + </message> + <message> + <source>This month</source> + <translation>這個月</translation> + </message> + <message> + <source>Last month</source> + <translation>上個月</translation> + </message> + <message> + <source>This year</source> + <translation>今年</translation> + </message> + <message> + <source>Range...</source> + <translation>指定範圍...</translation> + </message> + <message> + <source>Received with</source> + <translation>收款</translation> + </message> + <message> + <source>Sent to</source> + <translation>付款</translation> + </message> + <message> + <source>To yourself</source> + <translation>給自己</translation> + </message> + <message> + <source>Mined</source> + <translation>開採所得</translation> + </message> + <message> + <source>Other</source> + <translation>其它</translation> + </message> + <message> + <source>Enter address or label to search</source> + <translation>請輸入要搜尋的位址或標記</translation> + </message> + <message> + <source>Min amount</source> + <translation>最小金額</translation> + </message> + <message> + <source>Abandon transaction</source> + <translation>中止交易</translation> + </message> + <message> + <source>Copy address</source> + <translation>複製位址</translation> + </message> + <message> + <source>Copy label</source> + <translation>複製標記</translation> + </message> + <message> + <source>Copy amount</source> + <translation>複製金額</translation> + </message> + <message> + <source>Copy transaction ID</source> + <translation>複製交易識別碼</translation> + </message> + <message> + <source>Copy raw transaction</source> + <translation>複製交易原始資料</translation> + </message> + <message> + <source>Copy full transaction details</source> + <translation>複製完整交易明細</translation> + </message> + <message> + <source>Edit label</source> + <translation>編輯標記</translation> + </message> + <message> + <source>Show transaction details</source> + <translation>顯示交易明細</translation> + </message> + <message> + <source>Export Transaction History</source> + <translation>匯出交易記錄</translation> + </message> + <message> + <source>Comma separated file (*.csv)</source> + <translation>逗點分隔資料檔(*.csv)</translation> + </message> + <message> + <source>Confirmed</source> + <translation>已確認</translation> + </message> + <message> + <source>Watch-only</source> + <translation>只能觀看的</translation> + </message> + <message> + <source>Date</source> + <translation>日期</translation> + </message> + <message> + <source>Type</source> + <translation>種類</translation> + </message> + <message> + <source>Label</source> + <translation>標記:</translation> + </message> + <message> + <source>Address</source> + <translation>位址</translation> + </message> + <message> + <source>ID</source> + <translation>識別碼</translation> + </message> + <message> + <source>Exporting Failed</source> + <translation>匯出失敗</translation> + </message> + <message> + <source>There was an error trying to save the transaction history to %1.</source> + <translation>儲存交易記錄到 %1 時發生錯誤。</translation> + </message> + <message> + <source>Exporting Successful</source> + <translation>匯出成功</translation> + </message> + <message> + <source>The transaction history was successfully saved to %1.</source> + <translation>交易記錄已經成功儲存到 %1 了。</translation> + </message> + <message> + <source>Range:</source> + <translation>範圍:</translation> + </message> + <message> + <source>to</source> + <translation>到</translation> + </message> </context> <context> <name>UnitDisplayStatusBarControl</name> @@ -1729,6 +2935,55 @@ </message> </context> <context> + <name>WalletFrame</name> + <message> + <source>No wallet has been loaded.</source> + <translation>沒有載入錢包。</translation> + </message> +</context> +<context> + <name>WalletModel</name> + <message> + <source>Send Coins</source> + <translation>付款</translation> + </message> +</context> +<context> + <name>WalletView</name> + <message> + <source>&Export</source> + <translation>匯出</translation> + </message> + <message> + <source>Export the data in the current tab to a file</source> + <translation>將目前分頁的資料匯出存成檔案</translation> + </message> + <message> + <source>Backup Wallet</source> + <translation>備份錢包</translation> + </message> + <message> + <source>Wallet Data (*.dat)</source> + <translation>錢包資料檔(*.dat)</translation> + </message> + <message> + <source>Backup Failed</source> + <translation>備份失敗</translation> + </message> + <message> + <source>There was an error trying to save the wallet data to %1.</source> + <translation>儲存錢包資料到 %1 時發生錯誤。</translation> + </message> + <message> + <source>Backup Successful</source> + <translation>備份成功</translation> + </message> + <message> + <source>The wallet data was successfully saved to %1.</source> + <translation>錢包的資料已經成功儲存到 %1 了。</translation> + </message> +</context> +<context> <name>bitcoin-core</name> <message> <source>Options:</source> @@ -1752,6 +3007,18 @@ </translation> </message> <message> + <source>Accept connections from outside (default: 1 if no -proxy or -connect/-noconnect)</source> + <translation>是否接受外來連線(預設值: 當沒有 -proxy 或 -connect/-noconnect 時為 1)</translation> + </message> + <message> + <source>Connect only to the specified node(s); -noconnect or -connect=0 alone to disable automatic connections</source> + <translation>只連線到指定的節點。用 -noconnect 或是 -connect=0 可以關閉自動連線。</translation> + </message> + <message> + <source>Distributed under the MIT software license, see the accompanying file %s or %s</source> + <translation>依據 MIT 軟體授權條款散布，詳情請見附帶的 %s 檔案或是 %s</translation> + </message> + <message> <source>If <category> is not supplied or if <category> = 1, output all debugging information.</source> <translation>如果沒有提供 <category> 或是值為 1 就會輸出所有的除錯資訊。</translation> </message> @@ -1764,10 +3031,6 @@ <translation>修剪模式：錢包的最後同步狀態是在被修剪掉的區塊資料中。你需要用 -reindex 參數執行(會重新下載整個區塊鏈)</translation> </message> <message> - <source>Reduce storage requirements by pruning (deleting) old blocks. This mode is incompatible with -txindex and -rescan. Warning: Reverting this setting requires re-downloading the entire blockchain. (default: 0 = disable pruning blocks, >%u = target size in MiB to use for block files)</source> - <translation>修剪(刪除)掉老舊區塊來減少需要的儲存空間。這種模式會關閉錢包功能，並且和 -txindex 及 -rescan 參數不相容。警告: 從這種模式還原會需要重新下載一整個區塊鏈。(預設值: 0 表示不修剪區塊，>%u 表示為區塊檔案的目標大小，單位是百萬位元組 MiB)</translation> - </message> - <message> <source>Rescans are not possible in pruned mode. You will need to use -reindex which will download the whole blockchain again.</source> <translation>在修剪模式下沒辦法重新掃描區塊鏈。你需要配合使用 -reindex 參數來重新下載整個區塊鏈。</translation> </message> @@ -1792,10 +3055,6 @@ <translation>無法啟動 HTTP 伺服器。詳情請看除錯紀錄。</translation> </message> <message> - <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> - <translation>是否接受外來連線(預設值: 當沒有 -proxy 或 -connect 時為 1)</translation> - </message> - <message> <source>Bitcoin Core</source> <translation>Bitcoin Core</translation> </message> @@ -1804,10 +3063,6 @@ <translation>%s 開發人員</translation> </message> <message> - <source>-fallbackfee is set very high! This is the transaction fee you may pay when fee estimates are not available.</source> - <translation>警告: -fallbackfee 設定了很高的金額！這是當預估手續費還沒計算出來時，交易付款預設會付的手續費。</translation> - </message> - <message> <source>A fee rate (in %s/kB) that will be used when fee estimation has insufficient data (default: %s)</source> <translation>當沒有足夠的資料計算預估手續費時，所使用的手續費費率(單位是 %s/kB, 預設值: %s)</translation> </message> @@ -1828,10 +3083,6 @@ <translation>清掉錢包裡的所有交易，並且在下次啟動時，使用 -rescan 來從區塊鏈中復原回來。</translation> </message> <message> - <source>Distributed under the MIT software license, see the accompanying file COPYING or <http://www.opensource.org/licenses/mit-license.php>.</source> - <translation>這套軟體是依據 MIT 軟體授權條款散布，詳情請見附帶的 COPYING 檔案，或是以下網站: <http://www.opensource.org/licenses/mit-license.php>.</translation> - </message> - <message> <source>Error loading %s: You can't enable HD on a already existing non-HD wallet</source> <translation>載入 %s 發生錯誤：不能對已存在的非 HD 錢包啟用 HD 功能。</translation> </message> @@ -1844,8 +3095,12 @@ <translation>當錢包有交易改變時要執行的指令(指令中的 %s 會被取代成交易識別碼)</translation> </message> <message> - <source>Force relay of transactions from whitelisted peers even they violate local relay policy (default: %d)</source> - <translation>強制轉發從白名點節點收到的交易，即使它們違反了本機的轉發準則(預設值: %d)</translation> + <source>Extra transactions to keep in memory for compact block reconstructions (default: %u)</source> + <translation>為了將摘要區塊完整回組而額外保留在記憶體中的交易數量(預設值: %u)</translation> + </message> + <message> + <source>If this block is in the chain assume that it and its ancestors are valid and potentially skip their script verification (0 to verify all, default: %s, testnet: %s)</source> + <translation>假設已經在區塊鏈中的區塊以及其先前的區塊都合法，因此對它們略過指令碼驗證(0 表示一律要驗證，預設值: %s, 測試網路: %s)</translation> </message> <message> <source>Maximum allowed median peer time offset adjustment. Local perspective of time may be influenced by peers forward or backward by this amount. (default: %u seconds)</source> @@ -1864,6 +3119,14 @@ <translation>如果你覺得 %s 有用，可以幫助我們。關於這個軟體的更多資訊請見 %s。</translation> </message> <message> + <source>Reduce storage requirements by enabling pruning (deleting) of old blocks. This allows the pruneblockchain RPC to be called to delete specific blocks, and enables automatic pruning of old blocks if a target size in MiB is provided. This mode is incompatible with -txindex and -rescan. Warning: Reverting this setting requires re-downloading the entire blockchain. (default: 0 = disable pruning blocks, 1 = allow manual pruning via RPC, >%u = automatically prune block files to stay under the specified target size in MiB)</source> + <translation>修剪(刪除)掉老舊區塊以降低需要的儲存空間。這樣會增加一個 RPC 指令 pruneblockchain，可以使用它來刪除指定的區塊；也可以指定目標儲存空間大小，以啟用對老舊區塊的自動修剪功能。這個模式跟 -txindex 和 -rescan 參數不相容。警告: 還原回不修剪模式會需要重新下載一整個區塊鏈。(預設值: 0 表示不修剪區塊，1 表示允許使用 RPC 指令做修剪，>%u 的值表示為區塊資料的目標大小，單位是百萬位元組，MiB)</translation> + </message> + <message> + <source>Set lowest fee rate (in %s/kB) for transactions to be included in block creation. (default: %s)</source> + <translation>設定製造區塊時，所要包含交易每千位元組的最低手續費(單位是 %s)。(預設值: %s)</translation> + </message> + <message> <source>Set the number of script verification threads (%u to %d, 0 = auto, <0 = leave that many cores free, default: %d)</source> <translation>設定指令碼驗證的執行緒數目 (%u 到 %d，0 表示程式自動決定，小於 0 表示保留處理器核心不用的數目，預設值: %d)</translation> </message> @@ -1873,7 +3136,7 @@ </message> <message> <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source> - <translation>這是個還沒發表的測試版本 - 使用請自負風險 - 請不要用來開採或商業應用</translation> + <translation>這是個還沒發表的測試版本 - 使用請自負風險 - 請不要用來開採或做商業應用</translation> </message> <message> <source>Unable to rewind the database to a pre-fork state. You will need to redownload the blockchain</source> @@ -1884,18 +3147,22 @@ <translation>是否要使用「通用即插即用」協定(UPnP)，來設定聽候連線的通訊埠的對應(預設值: 當有聽候連線且沒有指定 -proxy 參數時為 1)</translation> </message> <message> + <source>Username and hashed password for JSON-RPC connections. The field <userpw> comes in the format: <USERNAME>:<SALT>$<HASH>. A canonical python script is included in share/rpcuser. The client then connects normally using the rpcuser=<USERNAME>/rpcpassword=<PASSWORD> pair of arguments. This option can be specified multiple times</source> + <translation>JSON-RPC 連線要用的使用者名稱和雜湊密碼。<userpw> 的格式是：<使用者名稱>:<調味值>$<雜湊值>。在 share/rpcuser 目錄下有一個示範的 python 程式。之後客戶端程式就可以用這對參數正常連線：rpcuser=<使用者名稱> 和 rpcpassword=<密碼>。這個選項可以給很多次。</translation> + </message> + <message> + <source>Wallet will not create transactions that violate mempool chain limits (default: %u)</source> + <translation>錢包軟體不會產生違反記憶池交易鏈限制的交易(預設值: %u)</translation> + </message> + <message> <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source> - <translation>警告: 節點網路對於區塊鏈結的決定目前有分歧！看來有些礦工會有問題。</translation> + <translation>警告: 位元幣網路對於區塊鏈結的決定目前有分歧！有些礦工看來會有問題。</translation> </message> <message> <source>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</source> <translation>警告: 我們和某些連線的節點對於區塊鏈結的決定不同！你可能需要升級，或是需要等其它的節點升級。</translation> </message> <message> - <source>Whitelist peers connecting from the given netmask or IP address. Can be specified multiple times.</source> - <translation>把來自指定網域或位址的節點放進白名單。這個選項可以設定多次。</translation> - </message> - <message> <source>You need to rebuild the database using -reindex-chainstate to change -txindex</source> <translation>改變 -txindex 參數後，必須要用 -reindex-chainstate 參數來重建資料庫</translation> </message> @@ -1928,12 +3195,12 @@ <translation>沒辦法解析 -%s 參數指定的位址: '%s'</translation> </message> <message> - <source>Change index out of range</source> - <translation>找零的索引值超出範圍</translation> + <source>Chain selection options:</source> + <translation>區塊鏈選項:</translation> </message> <message> - <source>Connect only to the specified node(s)</source> - <translation>只連線到指定節點(可多個)</translation> + <source>Change index out of range</source> + <translation>找零的索引值超出範圍</translation> </message> <message> <source>Connection options:</source> @@ -2056,10 +3323,6 @@ <translation>認證 cookie 資料的位置(預設值: 同資料目錄)</translation> </message> <message> - <source>Minimum bytes per sigop in transactions we relay and mine (default: %u)</source> - <translation>轉發和開採時，對交易資料的 sigop 平均位元組數下限(預設值: %u)</translation> - </message> - <message> <source>Not enough file descriptors available.</source> <translation>檔案描述元不足。</translation> </message> @@ -2093,17 +3356,13 @@ </message> <message> <source>Rewinding blocks...</source> - <translation>倒轉回區塊鏈之前的狀態...</translation> + <translation>正在倒轉回區塊鏈之前的狀態...</translation> </message> <message> <source>Set database cache size in megabytes (%d to %d, default: %d)</source> <translation>設定資料庫快取大小是多少百萬位元組(MB，範圍: %d 到 %d，預設值: %d)</translation> </message> <message> - <source>Set maximum block cost (default: %d)</source> - <translation>設定區塊成本的最大值(預設值: %d)</translation> - </message> - <message> <source>Set maximum block size in bytes (default: %d)</source> <translation>設定區塊大小上限成多少位元組(預設值: %d)</translation> </message> @@ -2136,6 +3395,10 @@ <translation>使用通用隨插即用 (UPnP) 協定來設定對應的服務連接埠(預設值: %u)</translation> </message> <message> + <source>Use the test chain</source> + <translation>使用測試區塊鏈</translation> + </message> + <message> <source>User Agent comment (%s) contains unsafe characters.</source> <translation>使用者代理註解(%s)中含有不安全的字元。</translation> </message> @@ -2208,10 +3471,6 @@ <translation>轉發和開採時，對只帶資料的交易的大小上限(預設值: %u)</translation> </message> <message> - <source>Query for peer addresses via DNS lookup, if low on addresses (default: 1 unless -connect)</source> - <translation>是否允許在節點位址數目不足時，使用域名查詢來搜尋節點 (預設值: 當沒用 -connect 時為 1)</translation> - </message> - <message> <source>Randomize credentials for every proxy connection. This enables Tor stream isolation (default: %u)</source> <translation>對每個代理連線使用隨機產生的憑證。這個選項會開啟 Tor 的串流隔離(預設值: %u)</translation> </message> @@ -2224,10 +3483,6 @@ <translation>扣除手續費後的交易金額太少而不能傳送</translation> </message> <message> - <source>This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit <https://www.openssl.org/> and cryptographic software written by Eric Young and UPnP software written by Thomas Bernard.</source> - <translation>此產品也包含了由 OpenSSL Project 所開發的 OpenSSL Toolkit 軟體 <https://www.openssl.org/>, 和由 Eric Young 撰寫的加解密軟體，以及由 Thomas Bernard 所撰寫的 UPnP 軟體。</translation> - </message> - <message> <source>Use hierarchical deterministic key generation (HD) after BIP32. Only has effect during wallet creation/first start</source> <translation>在 BIP32 開始作用後，啟用階層式可預期性密鑰產生方式(HD)。只有在產生新錢包或第一次啟動時才有作用。</translation> </message> @@ -2340,10 +3595,6 @@ <translation>交易金額太小</translation> </message> <message> - <source>Transaction amounts must be positive</source> - <translation>交易金額必須是正的</translation> - </message> - <message> <source>Transaction too large for fee policy</source> <translation>根據交易手續費準則，本交易的位元量過大</translation> </message> @@ -2408,18 +3659,22 @@ <translation>參數 -maxtxfee 設定了很高的金額！這可是你一次交易就有可能付出的最高手續費。</translation> </message> <message> - <source>-paytxfee is set very high! This is the transaction fee you will pay if you send a transaction.</source> - <translation>參數 -paytxfee 設定了很高的金額！這可是你交易付款時所要付的手續費。</translation> - </message> - <message> <source>Do not keep transactions in the mempool longer than <n> hours (default: %u)</source> <translation>不要讓交易留在記憶池中超過 <n> 個小時(預設值: %u)</translation> </message> <message> + <source>Equivalent bytes per sigop in transactions for relay and mining (default: %u)</source> + <translation>轉發和開採時，交易資料中每個 sigop 的等同位元組數(預設值: %u)</translation> + </message> + <message> <source>Fees (in %s/kB) smaller than this are considered zero fee for transaction creation (default: %s)</source> <translation>當製造交易時，如果每千位元組(kB)的手續費比這個值(單位是 %s)低，就視為沒付手續費(預設值: %s)</translation> </message> <message> + <source>Force relay of transactions from whitelisted peers even if they violate local relay policy (default: %d)</source> + <translation>強制轉發從白名點節點收到的交易，即使它們違反了本機的轉發準則(預設值: %d)</translation> + </message> + <message> <source>How thorough the block verification of -checkblocks is (0-4, default: %u)</source> <translation>使用 -checkblocks 檢查區塊的仔細程度(0 到 4，預設值: %u)</translation> </message> @@ -2436,10 +3691,26 @@ <translation>輸出除錯資訊(預設值: %u, 不一定要指定 <category>)</translation> </message> <message> + <source>Query for peer addresses via DNS lookup, if low on addresses (default: 1 unless -connect/-noconnect)</source> + <translation>是否允許在節點位址數目不足時，使用域名查詢來搜尋節點 (預設值: 當沒用 -connect/-noconnect 時為 1)</translation> + </message> + <message> + <source>Sets the serialization of raw transaction or block hex returned in non-verbose mode, non-segwit(0) or segwit(1) (default: %d)</source> + <translation>設定非冗長模式時，回傳的交易原始資料或區塊位元值的序列化形式：無 segwit 為 0，或是有 segwit 為 1 (預設值: %d)</translation> + </message> + <message> <source>Support filtering of blocks and transaction with bloom filters (default: %u)</source> <translation>支援用布倫過濾器來過濾區塊和交易(預設值: %u)</translation> </message> <message> + <source>This is the transaction fee you may pay when fee estimates are not available.</source> + <translation>這是當預估手續費還沒計算出來時，付款交易預設會付的手續費。</translation> + </message> + <message> + <source>This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit %s and cryptographic software written by Eric Young and UPnP software written by Thomas Bernard.</source> + <translation>此產品包含了由 OpenSSL Project 所開發的 OpenSSL Toolkit 軟體 %s, 由 Eric Young 撰寫的加解密軟體，以及由 Thomas Bernard 所撰寫的 UPnP 軟體。</translation> + </message> + <message> <source>Total length of network version string (%i) exceeds maximum length (%i). Reduce the number or size of uacomments.</source> <translation>網路版本字串的總長度(%i)超過最大長度(%i)了。請減少 uacomment 參數的數目或長度。</translation> </message> @@ -2460,10 +3731,6 @@ <translation>使用另外的 SOCK5 代理伺服器，來透過 Tor 隱藏服務跟其他節點聯絡(預設值: %s)</translation> </message> <message> - <source>Username and hashed password for JSON-RPC connections. The field <userpw> comes in the format: <USERNAME>:<SALT>$<HASH>. A canonical python script is included in share/rpcuser. This option can be specified multiple times</source> - <translation>JSON-RPC 連線要用的使用者名稱和雜湊密碼。<userpw> 的格式是：<使用者名稱>:<調味值>$<雜湊值>。在 share/rpcuser 目錄下有一個示範的 python 程式。這個選項可以給很多次。</translation> - </message> - <message> <source>Warning: Unknown block versions being mined! It's possible unknown rules are in effect</source> <translation>警告: 有礦工正在開採不明版本的區塊！這表示有不明的交易規則正在作用中</translation> </message> @@ -2472,6 +3739,14 @@ <translation>警告: 錢包檔壞掉，但資料被救回來了！原來的檔案 %s 改儲存為 %s，在目錄 %s 下。 如果餘額或交易資料有誤的話，你應該要從備份資料復原回來。</translation> </message> <message> + <source>Whitelist peers connecting from the given IP address (e.g. 1.2.3.4) or CIDR notated network (e.g. 1.2.3.0/24). Can be specified multiple times.</source> + <translation>把來自指定位址(例如：1.2.3.4)或 CIDR 格式網段(例如：1.2.3.0/24)的節點放進白名單。這個選項可以設定多次。</translation> + </message> + <message> + <source>%s is set very high!</source> + <translation>%s 的設定值異常大！</translation> + </message> + <message> <source>(default: %s)</source> <translation>(預設值: %s)</translation> </message> @@ -2492,6 +3767,10 @@ <translation>無效的 -proxy 位址: '%s'</translation> </message> <message> + <source>Keypool ran out, please call keypoolrefill first</source> + <translation>密鑰池已經乾了，請先執行 keypoolrefill</translation> + </message> + <message> <source>Listen for JSON-RPC connections on <port> (default: %u or testnet: %u)</source> <translation>在通訊埠 <port> 聽候 JSON-RPC 連線(預設值: %u, 或若為測試網路: %u)</translation> </message> @@ -2528,12 +3807,16 @@ <translation>允許轉發非 P2SH 的多簽章交易(預設值: %u)</translation> </message> <message> + <source>Send transactions with full-RBF opt-in enabled (default: %u)</source> + <translation>送出允許提高手續費(full-RBF)的交易(預設值: %u)</translation> + </message> + <message> <source>Set key pool size to <n> (default: %u)</source> <translation>設定密鑰池大小為 <n> (預設值: %u)</translation> </message> <message> - <source>Set minimum block size in bytes (default: %u)</source> - <translation>設定區塊大小下限為多少位元組(預設值: %u)</translation> + <source>Set maximum BIP141 block weight (default: %d)</source> + <translation>設定 BIP141 區塊重量的最大值(預設值: %d)</translation> </message> <message> <source>Set the number of threads to service RPC calls (default: %d)</source> @@ -2556,10 +3839,38 @@ <translation>傳送交易時可以花還沒確認的零錢(預設值: %u)</translation> </message> <message> + <source>Starting network threads...</source> + <translation>正在啟動網路執行緒...</translation> + </message> + <message> + <source>The wallet will avoid paying less than the minimum relay fee.</source> + <translation>錢包軟體會付多於最小轉發費用的手續費。</translation> + </message> + <message> + <source>This is the minimum transaction fee you pay on every transaction.</source> + <translation>這是你每次交易付款時最少要付的手續費。</translation> + </message> + <message> + <source>This is the transaction fee you will pay if you send a transaction.</source> + <translation>這是你交易付款時所要付的手續費。</translation> + </message> + <message> <source>Threshold for disconnecting misbehaving peers (default: %u)</source> <translation>與亂搞的節點斷線的臨界值 (預設: %u)</translation> </message> <message> + <source>Transaction amounts must not be negative</source> + <translation>交易金額不能是負的</translation> + </message> + <message> + <source>Transaction has too long of a mempool chain</source> + <translation>交易造成記憶池中的交易鏈太長</translation> + </message> + <message> + <source>Transaction must have at least one recipient</source> + <translation>交易必須至少要有一個收款人</translation> + </message> + <message> <source>Unknown network specified in -onlynet: '%s'</source> <translation>在 -onlynet 指定了不明的網路別: '%s'</translation> </message> diff --git a/src/qt/modaloverlay.cpp b/src/qt/modaloverlay.cpp index 3e8282e63d..4779ffa43f 100644 --- a/src/qt/modaloverlay.cpp +++ b/src/qt/modaloverlay.cpp @@ -7,6 +7,8 @@ #include "guiutil.h" +#include "chainparams.h" + #include <QResizeEvent> #include <QPropertyAnimation> @@ -105,7 +107,7 @@ void ModalOverlay::tipUpdate(int count, const QDateTime& blockDate, double nVeri ui->progressIncreasePerH->setText(QString::number(progressPerHour*100, 'f', 2)+"%"); // show expected remaining time - ui->expectedTimeLeft->setText(GUIUtil::formateNiceTimeOffset(remainingMSecs/1000.0)); + ui->expectedTimeLeft->setText(GUIUtil::formatNiceTimeOffset(remainingMSecs/1000.0)); static const int MAX_SAMPLES = 5000; if (blockProcessTime.count() > MAX_SAMPLES) @@ -125,11 +127,11 @@ void ModalOverlay::tipUpdate(int count, const QDateTime& blockDate, double nVeri // estimate the number of headers left based on nPowTargetSpacing // and check if the gui is not aware of the the best header (happens rarely) - int estimateNumHeadersLeft = bestHeaderDate.secsTo(currentDate) / 600; + int estimateNumHeadersLeft = bestHeaderDate.secsTo(currentDate) / Params().GetConsensus().nPowTargetSpacing; bool hasBestHeader = bestHeaderHeight >= count; // show remaining number of blocks - if (estimateNumHeadersLeft < 24 && hasBestHeader) { + if (estimateNumHeadersLeft < HEADER_HEIGHT_DELTA_SYNC && hasBestHeader) { ui->numberOfBlocksLeft->setText(QString::number(bestHeaderHeight - count)); } else { ui->numberOfBlocksLeft->setText(tr("Unknown. Syncing Headers (%1)...").arg(bestHeaderHeight)); diff --git a/src/qt/modaloverlay.h b/src/qt/modaloverlay.h index 70d37b87ad..21ccdbd839 100644 --- a/src/qt/modaloverlay.h +++ b/src/qt/modaloverlay.h @@ -8,6 +8,9 @@ #include <QDateTime> #include <QWidget> +//! The required delta of headers to the estimated number of available headers until we show the IBD progress +static constexpr int HEADER_HEIGHT_DELTA_SYNC = 24; + namespace Ui { class ModalOverlay; } diff --git a/src/qt/optionsdialog.cpp b/src/qt/optionsdialog.cpp index 89f633aa73..7ff00b1e9e 100644 --- a/src/qt/optionsdialog.cpp +++ b/src/qt/optionsdialog.cpp @@ -277,6 +277,9 @@ void OptionsDialog::showRestartWarning(bool fPersistent) void OptionsDialog::clearStatusLabel() { ui->statusLabel->clear(); + if (model && model->isRestartRequired()) { + showRestartWarning(true); + } } void OptionsDialog::updateProxyValidationState() @@ -286,7 +289,7 @@ void OptionsDialog::updateProxyValidationState() if (pUiProxyIp->isValid() && (!ui->proxyPort->isEnabled() || ui->proxyPort->text().toInt() > 0) && (!ui->proxyPortTor->isEnabled() || ui->proxyPortTor->text().toInt() > 0)) { setOkButtonState(otherProxyWidget->isValid()); //only enable ok button if both proxys are valid - ui->statusLabel->clear(); + clearStatusLabel(); } else { diff --git a/src/qt/paymentrequestplus.h b/src/qt/paymentrequestplus.h index ee1a37d83c..a2fea3fdc6 100644 --- a/src/qt/paymentrequestplus.h +++ b/src/qt/paymentrequestplus.h @@ -5,7 +5,10 @@ #ifndef BITCOIN_QT_PAYMENTREQUESTPLUS_H #define BITCOIN_QT_PAYMENTREQUESTPLUS_H +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #include "paymentrequest.pb.h" +#pragma GCC diagnostic pop #include "base58.h" diff --git a/src/qt/paymentserver.cpp b/src/qt/paymentserver.cpp index 6b2871424d..dd75f12076 100644 --- a/src/qt/paymentserver.cpp +++ b/src/qt/paymentserver.cpp @@ -10,7 +10,7 @@ #include "base58.h" #include "chainparams.h" -#include "validation.h" // For minRelayTxFee +#include "policy/policy.h" #include "ui_interface.h" #include "util.h" #include "wallet/wallet.h" @@ -55,8 +55,6 @@ const char* BIP70_MESSAGE_PAYMENTREQUEST = "PaymentRequest"; const char* BIP71_MIMETYPE_PAYMENT = "application/bitcoin-payment"; const char* BIP71_MIMETYPE_PAYMENTACK = "application/bitcoin-paymentack"; const char* BIP71_MIMETYPE_PAYMENTREQUEST = "application/bitcoin-paymentrequest"; -// BIP70 max payment request size in bytes (DoS protection) -const qint64 BIP70_MAX_PAYMENTREQUEST_SIZE = 50000; struct X509StoreDeleter { void operator()(X509_STORE* b) { @@ -582,7 +580,7 @@ bool PaymentServer::processPaymentRequest(const PaymentRequestPlus& request, Sen // Extract and check amounts CTxOut txOut(sendingTo.second, sendingTo.first); - if (txOut.IsDust(::minRelayTxFee)) { + if (txOut.IsDust(dustRelayFee)) { Q_EMIT message(tr("Payment request error"), tr("Requested payment amount of %1 is too small (considered dust).") .arg(BitcoinUnits::formatWithUnit(optionsModel->getDisplayUnit(), sendingTo.second)), CClientUIInterface::MSG_ERROR); diff --git a/src/qt/paymentserver.h b/src/qt/paymentserver.h index 37ee522d54..7c6d4507fe 100644 --- a/src/qt/paymentserver.h +++ b/src/qt/paymentserver.h @@ -21,10 +21,10 @@ // // When startup is finished and the main window is // shown, a signal is sent to slot uiReady(), which -// emits a receivedURL() signal for any payment +// emits a receivedURI() signal for any payment // requests that happened during startup. // -// After startup, receivedURL() happens as usual. +// After startup, receivedURI() happens as usual. // // This class has one more feature: a static // method that finds URIs passed in the command line @@ -53,7 +53,7 @@ class QUrl; QT_END_NAMESPACE // BIP70 max payment request size in bytes (DoS protection) -extern const qint64 BIP70_MAX_PAYMENTREQUEST_SIZE; +static const qint64 BIP70_MAX_PAYMENTREQUEST_SIZE = 50000; class PaymentServer : public QObject { diff --git a/src/qt/rpcconsole.cpp b/src/qt/rpcconsole.cpp index d84d6185d5..60406c2059 100644 --- a/src/qt/rpcconsole.cpp +++ b/src/qt/rpcconsole.cpp @@ -170,12 +170,12 @@ bool RPCConsole::RPCParseCommandLine(std::string &strResult, const std::string & size_t filter_begin_pos = 0, chpos; std::vector<std::pair<size_t, size_t>> filter_ranges; - auto add_to_current_stack = [&](const std::string& curarg) { - if (stack.back().empty() && (!nDepthInsideSensitive) && historyFilter.contains(QString::fromStdString(curarg), Qt::CaseInsensitive)) { + auto add_to_current_stack = [&](const std::string& strArg) { + if (stack.back().empty() && (!nDepthInsideSensitive) && historyFilter.contains(QString::fromStdString(strArg), Qt::CaseInsensitive)) { nDepthInsideSensitive = 1; filter_begin_pos = chpos; } - stack.back().push_back(curarg); + stack.back().push_back(strArg); }; auto close_out_params = [&]() { @@ -1023,11 +1023,11 @@ void RPCConsole::updateNodeDetail(const CNodeCombinedStats *stats) peerAddrDetails += "<br />" + tr("via %1").arg(QString::fromStdString(stats->nodeStats.addrLocal)); ui->peerHeading->setText(peerAddrDetails); ui->peerServices->setText(GUIUtil::formatServicesStr(stats->nodeStats.nServices)); - ui->peerLastSend->setText(stats->nodeStats.nLastSend ? GUIUtil::formatDurationStr(GetTime() - stats->nodeStats.nLastSend) : tr("never")); - ui->peerLastRecv->setText(stats->nodeStats.nLastRecv ? GUIUtil::formatDurationStr(GetTime() - stats->nodeStats.nLastRecv) : tr("never")); + ui->peerLastSend->setText(stats->nodeStats.nLastSend ? GUIUtil::formatDurationStr(GetSystemTimeInSeconds() - stats->nodeStats.nLastSend) : tr("never")); + ui->peerLastRecv->setText(stats->nodeStats.nLastRecv ? GUIUtil::formatDurationStr(GetSystemTimeInSeconds() - stats->nodeStats.nLastRecv) : tr("never")); ui->peerBytesSent->setText(FormatBytes(stats->nodeStats.nSendBytes)); ui->peerBytesRecv->setText(FormatBytes(stats->nodeStats.nRecvBytes)); - ui->peerConnTime->setText(GUIUtil::formatDurationStr(GetTime() - stats->nodeStats.nTimeConnected)); + ui->peerConnTime->setText(GUIUtil::formatDurationStr(GetSystemTimeInSeconds() - stats->nodeStats.nTimeConnected)); ui->peerPingTime->setText(GUIUtil::formatPingTime(stats->nodeStats.dPingTime)); ui->peerPingWait->setText(GUIUtil::formatPingTime(stats->nodeStats.dPingWait)); ui->peerMinPing->setText(GUIUtil::formatPingTime(stats->nodeStats.dMinPing)); diff --git a/src/qt/sendcoinsdialog.cpp b/src/qt/sendcoinsdialog.cpp index 5aeda7a30d..1c0ed663c1 100644 --- a/src/qt/sendcoinsdialog.cpp +++ b/src/qt/sendcoinsdialog.cpp @@ -16,6 +16,7 @@ #include "walletmodel.h" #include "base58.h" +#include "chainparams.h" #include "wallet/coincontrol.h" #include "validation.h" // mempool and minRelayTxFee #include "ui_interface.h" @@ -607,8 +608,8 @@ void SendCoinsDialog::updateGlobalFeeVariables() // set nMinimumTotalFee to 0 to not accidentally pay a custom fee CoinControlDialog::coinControl->nMinimumTotalFee = 0; - // show the estimated reuquired time for confirmation - ui->confirmationTargetLabel->setText(GUIUtil::formatDurationStr(nConfirmTarget*600)+" / "+tr("%n block(s)", "", nConfirmTarget)); + // show the estimated required time for confirmation + ui->confirmationTargetLabel->setText(GUIUtil::formatDurationStr(nConfirmTarget * Params().GetConsensus().nPowTargetSpacing) + " / " + tr("%n block(s)", "", nConfirmTarget)); } else { diff --git a/src/qt/test/rpcnestedtests.cpp b/src/qt/test/rpcnestedtests.cpp index fbec5722b6..bd496f149c 100644 --- a/src/qt/test/rpcnestedtests.cpp +++ b/src/qt/test/rpcnestedtests.cpp @@ -29,7 +29,7 @@ static UniValue rpcNestedTest_rpc(const JSONRPCRequest& request) static const CRPCCommand vRPCCommands[] = { - { "test", "rpcNestedTest", &rpcNestedTest_rpc, true }, + { "test", "rpcNestedTest", &rpcNestedTest_rpc, true, {} }, }; void RPCNestedTests::rpcNestedTests() diff --git a/src/qt/transactionrecord.cpp b/src/qt/transactionrecord.cpp index cbdedbf68b..a9d9b6887e 100644 --- a/src/qt/transactionrecord.cpp +++ b/src/qt/transactionrecord.cpp @@ -47,14 +47,15 @@ QList<TransactionRecord> TransactionRecord::decomposeTransaction(const CWallet * // // Credit // - BOOST_FOREACH(const CTxOut& txout, wtx.tx->vout) + for(unsigned int i = 0; i < wtx.tx->vout.size(); i++) { + const CTxOut& txout = wtx.tx->vout[i]; isminetype mine = wallet->IsMine(txout); if(mine) { TransactionRecord sub(hash, nTime); CTxDestination address; - sub.idx = parts.size(); // sequence number + sub.idx = i; // vout index sub.credit = txout.nValue; sub.involvesWatchAddress = mine & ISMINE_WATCH_ONLY; if (ExtractDestination(txout.scriptPubKey, address) && IsMine(*wallet, address)) @@ -118,7 +119,7 @@ QList<TransactionRecord> TransactionRecord::decomposeTransaction(const CWallet * { const CTxOut& txout = wtx.tx->vout[nOut]; TransactionRecord sub(hash, nTime); - sub.idx = parts.size(); + sub.idx = nOut; sub.involvesWatchAddress = involvesWatchAddress; if(wallet->IsMine(txout)) diff --git a/src/qt/utilitydialog.cpp b/src/qt/utilitydialog.cpp index 70efe27990..7ab4125284 100644 --- a/src/qt/utilitydialog.cpp +++ b/src/qt/utilitydialog.cpp @@ -39,7 +39,7 @@ HelpMessageDialog::HelpMessageDialog(QWidget *parent, bool about) : QString version = tr(PACKAGE_NAME) + " " + tr("version") + " " + QString::fromStdString(FormatFullVersion()); /* On x86 add a bit specifier to the version so that users can distinguish between - * 32 and 64 bit builds. On other architectures, 32/64 bit may be more ambigious. + * 32 and 64 bit builds. On other architectures, 32/64 bit may be more ambiguous. */ #if defined(__x86_64__) version += " " + tr("(%1-bit)").arg(64); diff --git a/src/qt/walletmodel.cpp b/src/qt/walletmodel.cpp index 0a5a7c3e9f..878b7d58ae 100644 --- a/src/qt/walletmodel.cpp +++ b/src/qt/walletmodel.cpp @@ -580,7 +580,7 @@ void WalletModel::getOutputs(const std::vector<COutPoint>& vOutpoints, std::vect if (!wallet->mapWallet.count(outpoint.hash)) continue; int nDepth = wallet->mapWallet[outpoint.hash].GetDepthInMainChain(); if (nDepth < 0) continue; - COutput out(&wallet->mapWallet[outpoint.hash], outpoint.n, nDepth, true, true); + COutput out(&wallet->mapWallet[outpoint.hash], outpoint.n, nDepth, true /* spendable */, true /* solvable */, true /* safe */); vOutputs.push_back(out); } } @@ -607,7 +607,7 @@ void WalletModel::listCoins(std::map<QString, std::vector<COutput> >& mapCoins) if (!wallet->mapWallet.count(outpoint.hash)) continue; int nDepth = wallet->mapWallet[outpoint.hash].GetDepthInMainChain(); if (nDepth < 0) continue; - COutput out(&wallet->mapWallet[outpoint.hash], outpoint.n, nDepth, true, true); + COutput out(&wallet->mapWallet[outpoint.hash], outpoint.n, nDepth, true /* spendable */, true /* solvable */, true /* safe */); if (outpoint.n < out.tx->tx->vout.size() && wallet->IsMine(out.tx->tx->vout[outpoint.n]) == ISMINE_SPENDABLE) vCoins.push_back(out); } @@ -619,7 +619,7 @@ void WalletModel::listCoins(std::map<QString, std::vector<COutput> >& mapCoins) while (wallet->IsChange(cout.tx->tx->vout[cout.i]) && cout.tx->tx->vin.size() > 0 && wallet->IsMine(cout.tx->tx->vin[0])) { if (!wallet->mapWallet.count(cout.tx->tx->vin[0].prevout.hash)) break; - cout = COutput(&wallet->mapWallet[cout.tx->tx->vin[0].prevout.hash], cout.tx->tx->vin[0].prevout.n, 0, true, true); + cout = COutput(&wallet->mapWallet[cout.tx->tx->vin[0].prevout.hash], cout.tx->tx->vin[0].prevout.n, 0 /* depth */, true /* spendable */, true /* solvable */, true /* safe */); } CTxDestination address; diff --git a/src/random.cpp b/src/random.cpp index 6634019bea..8284f457c9 100644 --- a/src/random.cpp +++ b/src/random.cpp @@ -21,6 +21,17 @@ #include <sys/time.h> #endif +#ifdef HAVE_SYS_GETRANDOM +#include <sys/syscall.h> +#include <linux/random.h> +#endif +#ifdef HAVE_GETENTROPY +#include <unistd.h> +#endif +#ifdef HAVE_SYSCTL_ARND +#include <sys/sysctl.h> +#endif + #include <openssl/err.h> #include <openssl/rand.h> @@ -91,34 +102,86 @@ static void RandAddSeedPerfmon() #endif } +#ifndef WIN32 +/** Fallback: get 32 bytes of system entropy from /dev/urandom. The most + * compatible way to get cryptographic randomness on UNIX-ish platforms. + */ +void GetDevURandom(unsigned char *ent32) +{ + int f = open("/dev/urandom", O_RDONLY); + if (f == -1) { + RandFailure(); + } + int have = 0; + do { + ssize_t n = read(f, ent32 + have, NUM_OS_RANDOM_BYTES - have); + if (n <= 0 || n + have > NUM_OS_RANDOM_BYTES) { + RandFailure(); + } + have += n; + } while (have < NUM_OS_RANDOM_BYTES); + close(f); +} +#endif + /** Get 32 bytes of system entropy. */ -static void GetOSRand(unsigned char *ent32) +void GetOSRand(unsigned char *ent32) { -#ifdef WIN32 +#if defined(WIN32) HCRYPTPROV hProvider; int ret = CryptAcquireContextW(&hProvider, NULL, NULL, PROV_RSA_FULL, CRYPT_VERIFYCONTEXT); if (!ret) { RandFailure(); } - ret = CryptGenRandom(hProvider, 32, ent32); + ret = CryptGenRandom(hProvider, NUM_OS_RANDOM_BYTES, ent32); if (!ret) { RandFailure(); } CryptReleaseContext(hProvider, 0); -#else - int f = open("/dev/urandom", O_RDONLY); - if (f == -1) { +#elif defined(HAVE_SYS_GETRANDOM) + /* Linux. From the getrandom(2) man page: + * "If the urandom source has been initialized, reads of up to 256 bytes + * will always return as many bytes as requested and will not be + * interrupted by signals." + */ + int rv = syscall(SYS_getrandom, ent32, NUM_OS_RANDOM_BYTES, 0); + if (rv != NUM_OS_RANDOM_BYTES) { + if (rv < 0 && errno == ENOSYS) { + /* Fallback for kernel <3.17: the return value will be -1 and errno + * ENOSYS if the syscall is not available, in that case fall back + * to /dev/urandom. + */ + GetDevURandom(ent32); + } else { + RandFailure(); + } + } +#elif defined(HAVE_GETENTROPY) + /* On OpenBSD this can return up to 256 bytes of entropy, will return an + * error if more are requested. + * The call cannot return less than the requested number of bytes. + */ + if (getentropy(ent32, NUM_OS_RANDOM_BYTES) != 0) { RandFailure(); } +#elif defined(HAVE_SYSCTL_ARND) + /* FreeBSD and similar. It is possible for the call to return less + * bytes than requested, so need to read in a loop. + */ + static const int name[2] = {CTL_KERN, KERN_ARND}; int have = 0; do { - ssize_t n = read(f, ent32 + have, 32 - have); - if (n <= 0 || n + have > 32) { + size_t len = NUM_OS_RANDOM_BYTES - have; + if (sysctl(name, ARRAYLEN(name), ent32 + have, &len, NULL, 0) != 0) { RandFailure(); } - have += n; - } while (have < 32); - close(f); + have += len; + } while (have < NUM_OS_RANDOM_BYTES); +#else + /* Fall back to /dev/urandom if there is no specific method implemented to + * get system entropy for this OS. + */ + GetDevURandom(ent32); #endif } @@ -195,3 +258,33 @@ FastRandomContext::FastRandomContext(bool fDeterministic) } } +bool Random_SanityCheck() +{ + /* This does not measure the quality of randomness, but it does test that + * OSRandom() overwrites all 32 bytes of the output given a maximum + * number of tries. + */ + static const ssize_t MAX_TRIES = 1024; + uint8_t data[NUM_OS_RANDOM_BYTES]; + bool overwritten[NUM_OS_RANDOM_BYTES] = {}; /* Tracks which bytes have been overwritten at least once */ + int num_overwritten; + int tries = 0; + /* Loop until all bytes have been overwritten at least once, or max number tries reached */ + do { + memset(data, 0, NUM_OS_RANDOM_BYTES); + GetOSRand(data); + for (int x=0; x < NUM_OS_RANDOM_BYTES; ++x) { + overwritten[x] |= (data[x] != 0); + } + + num_overwritten = 0; + for (int x=0; x < NUM_OS_RANDOM_BYTES; ++x) { + if (overwritten[x]) { + num_overwritten += 1; + } + } + + tries += 1; + } while (num_overwritten < NUM_OS_RANDOM_BYTES && tries < MAX_TRIES); + return (num_overwritten == NUM_OS_RANDOM_BYTES); /* If this failed, bailed out after too many tries */ +} diff --git a/src/random.h b/src/random.h index 664f030eba..0464bdce14 100644 --- a/src/random.h +++ b/src/random.h @@ -46,4 +46,21 @@ public: uint32_t Rw; }; +/* Number of random bytes returned by GetOSRand. + * When changing this constant make sure to change all call sites, and make + * sure that the underlying OS APIs for all platforms support the number. + * (many cap out at 256 bytes). + */ +static const ssize_t NUM_OS_RANDOM_BYTES = 32; + +/** Get 32 bytes of system entropy. Do not use this in application code: use + * GetStrongRandBytes instead. + */ +void GetOSRand(unsigned char *ent32); + +/** Check that OS randomness is available and returning the requested number + * of bytes. + */ +bool Random_SanityCheck(); + #endif // BITCOIN_RANDOM_H diff --git a/src/rest.cpp b/src/rest.cpp index 8a7c985e72..54eefcafe3 100644 --- a/src/rest.cpp +++ b/src/rest.cpp @@ -17,12 +17,9 @@ #include "version.h" #include <boost/algorithm/string.hpp> -#include <boost/dynamic_bitset.hpp> #include <univalue.h> -using namespace std; - static const size_t MAX_GETUTXOS_OUTPOINTS = 15; //allow a max of 15 outpoints to be queried at once enum RetFormat { @@ -65,7 +62,7 @@ extern UniValue mempoolToJSON(bool fVerbose = false); extern void ScriptPubKeyToJSON(const CScript& scriptPubKey, UniValue& out, bool fIncludeHex); extern UniValue blockheaderToJSON(const CBlockIndex* blockindex); -static bool RESTERR(HTTPRequest* req, enum HTTPStatusCode status, string message) +static bool RESTERR(HTTPRequest* req, enum HTTPStatusCode status, std::string message) { req->WriteHeader("Content-Type", "text/plain"); req->WriteReply(status, message + "\r\n"); @@ -93,9 +90,9 @@ static enum RetFormat ParseDataFormat(std::string& param, const std::string& str return rf_names[0].rf; } -static string AvailableDataFormatsString() +static std::string AvailableDataFormatsString() { - string formats = ""; + std::string formats = ""; for (unsigned int i = 0; i < ARRAYLEN(rf_names); i++) if (strlen(rf_names[i].name) > 0) { formats.append("."); @@ -109,7 +106,7 @@ static string AvailableDataFormatsString() return formats; } -static bool ParseHashStr(const string& strReq, uint256& v) +static bool ParseHashStr(const std::string& strReq, uint256& v) { if (!IsHex(strReq) || (strReq.size() != 64)) return false; @@ -133,7 +130,7 @@ static bool rest_headers(HTTPRequest* req, return false; std::string param; const RetFormat rf = ParseDataFormat(param, strURIPart); - vector<string> path; + std::vector<std::string> path; boost::split(path, param, boost::is_any_of("/")); if (path.size() != 2) @@ -143,7 +140,7 @@ static bool rest_headers(HTTPRequest* req, if (count < 1 || count > 2000) return RESTERR(req, HTTP_BAD_REQUEST, "Header count out of range: " + path[0]); - string hashStr = path[1]; + std::string hashStr = path[1]; uint256 hash; if (!ParseHashStr(hashStr, hash)) return RESTERR(req, HTTP_BAD_REQUEST, "Invalid hash: " + hashStr); @@ -169,14 +166,14 @@ static bool rest_headers(HTTPRequest* req, switch (rf) { case RF_BINARY: { - string binaryHeader = ssHeader.str(); + std::string binaryHeader = ssHeader.str(); req->WriteHeader("Content-Type", "application/octet-stream"); req->WriteReply(HTTP_OK, binaryHeader); return true; } case RF_HEX: { - string strHex = HexStr(ssHeader.begin(), ssHeader.end()) + "\n"; + std::string strHex = HexStr(ssHeader.begin(), ssHeader.end()) + "\n"; req->WriteHeader("Content-Type", "text/plain"); req->WriteReply(HTTP_OK, strHex); return true; @@ -186,7 +183,7 @@ static bool rest_headers(HTTPRequest* req, BOOST_FOREACH(const CBlockIndex *pindex, headers) { jsonHeaders.push_back(blockheaderToJSON(pindex)); } - string strJSON = jsonHeaders.write() + "\n"; + std::string strJSON = jsonHeaders.write() + "\n"; req->WriteHeader("Content-Type", "application/json"); req->WriteReply(HTTP_OK, strJSON); return true; @@ -233,14 +230,14 @@ static bool rest_block(HTTPRequest* req, switch (rf) { case RF_BINARY: { - string binaryBlock = ssBlock.str(); + std::string binaryBlock = ssBlock.str(); req->WriteHeader("Content-Type", "application/octet-stream"); req->WriteReply(HTTP_OK, binaryBlock); return true; } case RF_HEX: { - string strHex = HexStr(ssBlock.begin(), ssBlock.end()) + "\n"; + std::string strHex = HexStr(ssBlock.begin(), ssBlock.end()) + "\n"; req->WriteHeader("Content-Type", "text/plain"); req->WriteReply(HTTP_OK, strHex); return true; @@ -248,7 +245,7 @@ static bool rest_block(HTTPRequest* req, case RF_JSON: { UniValue objBlock = blockToJSON(block, pblockindex, showTxDetails); - string strJSON = objBlock.write() + "\n"; + std::string strJSON = objBlock.write() + "\n"; req->WriteHeader("Content-Type", "application/json"); req->WriteReply(HTTP_OK, strJSON); return true; @@ -288,7 +285,7 @@ static bool rest_chaininfo(HTTPRequest* req, const std::string& strURIPart) JSONRPCRequest jsonRequest; jsonRequest.params = UniValue(UniValue::VARR); UniValue chainInfoObject = getblockchaininfo(jsonRequest); - string strJSON = chainInfoObject.write() + "\n"; + std::string strJSON = chainInfoObject.write() + "\n"; req->WriteHeader("Content-Type", "application/json"); req->WriteReply(HTTP_OK, strJSON); return true; @@ -313,7 +310,7 @@ static bool rest_mempool_info(HTTPRequest* req, const std::string& strURIPart) case RF_JSON: { UniValue mempoolInfoObject = mempoolInfoToJSON(); - string strJSON = mempoolInfoObject.write() + "\n"; + std::string strJSON = mempoolInfoObject.write() + "\n"; req->WriteHeader("Content-Type", "application/json"); req->WriteReply(HTTP_OK, strJSON); return true; @@ -338,7 +335,7 @@ static bool rest_mempool_contents(HTTPRequest* req, const std::string& strURIPar case RF_JSON: { UniValue mempoolObject = mempoolToJSON(true); - string strJSON = mempoolObject.write() + "\n"; + std::string strJSON = mempoolObject.write() + "\n"; req->WriteHeader("Content-Type", "application/json"); req->WriteReply(HTTP_OK, strJSON); return true; @@ -373,14 +370,14 @@ static bool rest_tx(HTTPRequest* req, const std::string& strURIPart) switch (rf) { case RF_BINARY: { - string binaryTx = ssTx.str(); + std::string binaryTx = ssTx.str(); req->WriteHeader("Content-Type", "application/octet-stream"); req->WriteReply(HTTP_OK, binaryTx); return true; } case RF_HEX: { - string strHex = HexStr(ssTx.begin(), ssTx.end()) + "\n"; + std::string strHex = HexStr(ssTx.begin(), ssTx.end()) + "\n"; req->WriteHeader("Content-Type", "text/plain"); req->WriteReply(HTTP_OK, strHex); return true; @@ -389,7 +386,7 @@ static bool rest_tx(HTTPRequest* req, const std::string& strURIPart) case RF_JSON: { UniValue objTx(UniValue::VOBJ); TxToJSON(*tx, hashBlock, objTx); - string strJSON = objTx.write() + "\n"; + std::string strJSON = objTx.write() + "\n"; req->WriteHeader("Content-Type", "application/json"); req->WriteReply(HTTP_OK, strJSON); return true; @@ -411,7 +408,7 @@ static bool rest_getutxos(HTTPRequest* req, const std::string& strURIPart) std::string param; const RetFormat rf = ParseDataFormat(param, strURIPart); - vector<string> uriParts; + std::vector<std::string> uriParts; if (param.length() > 1) { std::string strUriParams = param.substr(1); @@ -425,7 +422,7 @@ static bool rest_getutxos(HTTPRequest* req, const std::string& strURIPart) bool fInputParsed = false; bool fCheckMemPool = false; - vector<COutPoint> vOutPoints; + std::vector<COutPoint> vOutPoints; // parse/deserialize input // input-format = output-format, rest/getutxos/bin requires binary input, gives binary output, ... @@ -499,10 +496,11 @@ static bool rest_getutxos(HTTPRequest* req, const std::string& strURIPart) return RESTERR(req, HTTP_BAD_REQUEST, strprintf("Error: max outpoints exceeded (max: %d, tried: %d)", MAX_GETUTXOS_OUTPOINTS, vOutPoints.size())); // check spentness and form a bitmap (as well as a JSON capable human-readable string representation) - vector<unsigned char> bitmap; - vector<CCoin> outs; + std::vector<unsigned char> bitmap; + std::vector<CCoin> outs; std::string bitmapStringRepresentation; - boost::dynamic_bitset<unsigned char> hits(vOutPoints.size()); + std::vector<bool> hits; + bitmap.resize((vOutPoints.size() + 7) / 8); { LOCK2(cs_main, mempool.cs); @@ -518,10 +516,11 @@ static bool rest_getutxos(HTTPRequest* req, const std::string& strURIPart) for (size_t i = 0; i < vOutPoints.size(); i++) { CCoins coins; uint256 hash = vOutPoints[i].hash; + bool hit = false; if (view.GetCoins(hash, coins)) { mempool.pruneSpent(hash, coins); if (coins.IsAvailable(vOutPoints[i].n)) { - hits[i] = true; + hit = true; // Safe to index into vout here because IsAvailable checked if it's off the end of the array, or if // n is valid but points to an already spent output (IsNull). CCoin coin; @@ -533,10 +532,11 @@ static bool rest_getutxos(HTTPRequest* req, const std::string& strURIPart) } } - bitmapStringRepresentation.append(hits[i] ? "1" : "0"); // form a binary string representation (human-readable for json output) + hits.push_back(hit); + bitmapStringRepresentation.append(hit ? "1" : "0"); // form a binary string representation (human-readable for json output) + bitmap[i / 8] |= ((uint8_t)hit) << (i % 8); } } - boost::to_block_range(hits, std::back_inserter(bitmap)); switch (rf) { case RF_BINARY: { @@ -544,7 +544,7 @@ static bool rest_getutxos(HTTPRequest* req, const std::string& strURIPart) // use exact same output as mentioned in Bip64 CDataStream ssGetUTXOResponse(SER_NETWORK, PROTOCOL_VERSION); ssGetUTXOResponse << chainActive.Height() << chainActive.Tip()->GetBlockHash() << bitmap << outs; - string ssGetUTXOResponseString = ssGetUTXOResponse.str(); + std::string ssGetUTXOResponseString = ssGetUTXOResponse.str(); req->WriteHeader("Content-Type", "application/octet-stream"); req->WriteReply(HTTP_OK, ssGetUTXOResponseString); @@ -554,7 +554,7 @@ static bool rest_getutxos(HTTPRequest* req, const std::string& strURIPart) case RF_HEX: { CDataStream ssGetUTXOResponse(SER_NETWORK, PROTOCOL_VERSION); ssGetUTXOResponse << chainActive.Height() << chainActive.Tip()->GetBlockHash() << bitmap << outs; - string strHex = HexStr(ssGetUTXOResponse.begin(), ssGetUTXOResponse.end()) + "\n"; + std::string strHex = HexStr(ssGetUTXOResponse.begin(), ssGetUTXOResponse.end()) + "\n"; req->WriteHeader("Content-Type", "text/plain"); req->WriteReply(HTTP_OK, strHex); @@ -586,7 +586,7 @@ static bool rest_getutxos(HTTPRequest* req, const std::string& strURIPart) objGetUTXOResponse.push_back(Pair("utxos", utxos)); // return json string - string strJSON = objGetUTXOResponse.write() + "\n"; + std::string strJSON = objGetUTXOResponse.write() + "\n"; req->WriteHeader("Content-Type", "application/json"); req->WriteReply(HTTP_OK, strJSON); return true; diff --git a/src/rpc/blockchain.cpp b/src/rpc/blockchain.cpp index 538e488bdf..96254a8cb9 100644 --- a/src/rpc/blockchain.cpp +++ b/src/rpc/blockchain.cpp @@ -28,7 +28,6 @@ #include <mutex> #include <condition_variable> -using namespace std; struct CUpdatedBlock { @@ -43,10 +42,15 @@ static CUpdatedBlock latestblock; extern void TxToJSON(const CTransaction& tx, const uint256 hashBlock, UniValue& entry); void ScriptPubKeyToJSON(const CScript& scriptPubKey, UniValue& out, bool fIncludeHex); +/** + * Get the difficulty of the net wrt to the given block index, or the chain tip if + * not provided. + * + * @return A floating point number that is a multiple of the main net minimum + * difficulty (4295032833 hashes). + */ double GetDifficulty(const CBlockIndex* blockindex) { - // Floating point number that is a multiple of the minimum difficulty, - // minimum difficulty = 1.0. if (blockindex == NULL) { if (chainActive.Tip() == NULL) @@ -149,7 +153,7 @@ UniValue blockToJSON(const CBlock& block, const CBlockIndex* blockindex, bool tx UniValue getblockcount(const JSONRPCRequest& request) { if (request.fHelp || request.params.size() != 0) - throw runtime_error( + throw std::runtime_error( "getblockcount\n" "\nReturns the number of blocks in the longest blockchain.\n" "\nResult:\n" @@ -166,7 +170,7 @@ UniValue getblockcount(const JSONRPCRequest& request) UniValue getbestblockhash(const JSONRPCRequest& request) { if (request.fHelp || request.params.size() != 0) - throw runtime_error( + throw std::runtime_error( "getbestblockhash\n" "\nReturns the hash of the best (tip) block in the longest blockchain.\n" "\nResult:\n" @@ -193,7 +197,7 @@ void RPCNotifyBlockChange(bool ibd, const CBlockIndex * pindex) UniValue waitfornewblock(const JSONRPCRequest& request) { if (request.fHelp || request.params.size() > 1) - throw runtime_error( + throw std::runtime_error( "waitfornewblock (timeout)\n" "\nWaits for a specific new block and returns useful info about it.\n" "\nReturns the current block on timeout or exit.\n" @@ -231,13 +235,13 @@ UniValue waitfornewblock(const JSONRPCRequest& request) UniValue waitforblock(const JSONRPCRequest& request) { if (request.fHelp || request.params.size() < 1 || request.params.size() > 2) - throw runtime_error( + throw std::runtime_error( "waitforblock <blockhash> (timeout)\n" "\nWaits for a specific new block and returns useful info about it.\n" "\nReturns the current block on timeout or exit.\n" "\nArguments:\n" - "1. blockhash to wait for (string)\n" - "2. timeout (int, optional, default=0) Time in milliseconds to wait for a response. 0 indicates no timeout.\n" + "1. \"blockhash\" (required, string) Block hash to wait for.\n" + "2. timeout (int, optional, default=0) Time in milliseconds to wait for a response. 0 indicates no timeout.\n" "\nResult:\n" "{ (json object)\n" " \"hash\" : { (string) The blockhash\n" @@ -273,13 +277,13 @@ UniValue waitforblock(const JSONRPCRequest& request) UniValue waitforblockheight(const JSONRPCRequest& request) { if (request.fHelp || request.params.size() < 1 || request.params.size() > 2) - throw runtime_error( - "waitforblockheight <blockheight> (timeout)\n" + throw std::runtime_error( + "waitforblockheight <height> (timeout)\n" "\nWaits for (at least) block height and returns the height and hash\n" "of the current tip.\n" "\nReturns the current block on timeout or exit.\n" "\nArguments:\n" - "1. block height to wait for (int)\n" + "1. height (required, int) Block height to wait for (int)\n" "2. timeout (int, optional, default=0) Time in milliseconds to wait for a response. 0 indicates no timeout.\n" "\nResult:\n" "{ (json object)\n" @@ -315,7 +319,7 @@ UniValue waitforblockheight(const JSONRPCRequest& request) UniValue getdifficulty(const JSONRPCRequest& request) { if (request.fHelp || request.params.size() != 0) - throw runtime_error( + throw std::runtime_error( "getdifficulty\n" "\nReturns the proof-of-work difficulty as a multiple of the minimum difficulty.\n" "\nResult:\n" @@ -336,8 +340,6 @@ std::string EntryDescriptionString() " \"modifiedfee\" : n, (numeric) transaction fee with fee deltas used for mining priority\n" " \"time\" : n, (numeric) local time transaction entered pool in seconds since 1 Jan 1970 GMT\n" " \"height\" : n, (numeric) block height when transaction entered pool\n" - " \"startingpriority\" : n, (numeric) priority when transaction entered pool\n" - " \"currentpriority\" : n, (numeric) transaction priority now\n" " \"descendantcount\" : n, (numeric) number of in-mempool descendant transactions (including this one)\n" " \"descendantsize\" : n, (numeric) virtual transaction size of in-mempool descendants (including this one)\n" " \"descendantfees\" : n, (numeric) modified fees (see above) of in-mempool descendants (including this one)\n" @@ -358,8 +360,6 @@ void entryToJSON(UniValue &info, const CTxMemPoolEntry &e) info.push_back(Pair("modifiedfee", ValueFromAmount(e.GetModifiedFee()))); info.push_back(Pair("time", e.GetTime())); info.push_back(Pair("height", (int)e.GetHeight())); - info.push_back(Pair("startingpriority", e.GetPriority(e.GetHeight()))); - info.push_back(Pair("currentpriority", e.GetPriority(chainActive.Height()))); info.push_back(Pair("descendantcount", e.GetCountWithDescendants())); info.push_back(Pair("descendantsize", e.GetSizeWithDescendants())); info.push_back(Pair("descendantfees", e.GetModFeesWithDescendants())); @@ -367,7 +367,7 @@ void entryToJSON(UniValue &info, const CTxMemPoolEntry &e) info.push_back(Pair("ancestorsize", e.GetSizeWithAncestors())); info.push_back(Pair("ancestorfees", e.GetModFeesWithAncestors())); const CTransaction& tx = e.GetTx(); - set<string> setDepends; + std::set<std::string> setDepends; BOOST_FOREACH(const CTxIn& txin, tx.vin) { if (mempool.exists(txin.prevout.hash)) @@ -375,7 +375,7 @@ void entryToJSON(UniValue &info, const CTxMemPoolEntry &e) } UniValue depends(UniValue::VARR); - BOOST_FOREACH(const string& dep, setDepends) + BOOST_FOREACH(const std::string& dep, setDepends) { depends.push_back(dep); } @@ -400,7 +400,7 @@ UniValue mempoolToJSON(bool fVerbose = false) } else { - vector<uint256> vtxid; + std::vector<uint256> vtxid; mempool.queryHashes(vtxid); UniValue a(UniValue::VARR); @@ -414,11 +414,11 @@ UniValue mempoolToJSON(bool fVerbose = false) UniValue getrawmempool(const JSONRPCRequest& request) { if (request.fHelp || request.params.size() > 1) - throw runtime_error( + throw std::runtime_error( "getrawmempool ( verbose )\n" "\nReturns all transaction ids in memory pool as a json array of string transaction ids.\n" "\nArguments:\n" - "1. verbose (boolean, optional, default=false) true for a json object, false for array of transaction ids\n" + "1. verbose (boolean, optional, default=false) True for a json object, false for array of transaction ids\n" "\nResult: (for verbose = false):\n" "[ (json array of string)\n" " \"transactionid\" (string) The transaction id\n" @@ -445,12 +445,12 @@ UniValue getrawmempool(const JSONRPCRequest& request) UniValue getmempoolancestors(const JSONRPCRequest& request) { if (request.fHelp || request.params.size() < 1 || request.params.size() > 2) { - throw runtime_error( + throw std::runtime_error( "getmempoolancestors txid (verbose)\n" "\nIf txid is in the mempool, returns all in-mempool ancestors.\n" "\nArguments:\n" - "1. \"txid\" (string, required) The transaction id (must be in mempool)\n" - "2. verbose (boolean, optional, default=false) true for a json object, false for array of transaction ids\n" + "1. \"txid\" (string, required) The transaction id (must be in mempool)\n" + "2. verbose (boolean, optional, default=false) True for a json object, false for array of transaction ids\n" "\nResult (for verbose=false):\n" "[ (json array of strings)\n" " \"transactionid\" (string) The transaction id of an in-mempool ancestor transaction\n" @@ -509,12 +509,12 @@ UniValue getmempoolancestors(const JSONRPCRequest& request) UniValue getmempooldescendants(const JSONRPCRequest& request) { if (request.fHelp || request.params.size() < 1 || request.params.size() > 2) { - throw runtime_error( + throw std::runtime_error( "getmempooldescendants txid (verbose)\n" "\nIf txid is in the mempool, returns all in-mempool descendants.\n" "\nArguments:\n" - "1. \"txid\" (string, required) The transaction id (must be in mempool)\n" - "2. verbose (boolean, optional, default=false) true for a json object, false for array of transaction ids\n" + "1. \"txid\" (string, required) The transaction id (must be in mempool)\n" + "2. verbose (boolean, optional, default=false) True for a json object, false for array of transaction ids\n" "\nResult (for verbose=false):\n" "[ (json array of strings)\n" " \"transactionid\" (string) The transaction id of an in-mempool descendant transaction\n" @@ -573,7 +573,7 @@ UniValue getmempooldescendants(const JSONRPCRequest& request) UniValue getmempoolentry(const JSONRPCRequest& request) { if (request.fHelp || request.params.size() != 1) { - throw runtime_error( + throw std::runtime_error( "getmempoolentry txid\n" "\nReturns mempool data for given transaction\n" "\nArguments:\n" @@ -606,11 +606,11 @@ UniValue getmempoolentry(const JSONRPCRequest& request) UniValue getblockhash(const JSONRPCRequest& request) { if (request.fHelp || request.params.size() != 1) - throw runtime_error( - "getblockhash index\n" - "\nReturns hash of block in best-block-chain at index provided.\n" + throw std::runtime_error( + "getblockhash height\n" + "\nReturns hash of block in best-block-chain at height provided.\n" "\nArguments:\n" - "1. index (numeric, required) The block index\n" + "1. height (numeric, required) The height index\n" "\nResult:\n" "\"hash\" (string) The block hash\n" "\nExamples:\n" @@ -631,7 +631,7 @@ UniValue getblockhash(const JSONRPCRequest& request) UniValue getblockheader(const JSONRPCRequest& request) { if (request.fHelp || request.params.size() < 1 || request.params.size() > 2) - throw runtime_error( + throw std::runtime_error( "getblockheader \"hash\" ( verbose )\n" "\nIf verbose is false, returns a string that is serialized, hex-encoded data for blockheader 'hash'.\n" "If verbose is true, returns an Object with information about blockheader <hash>.\n" @@ -651,9 +651,9 @@ UniValue getblockheader(const JSONRPCRequest& request) " \"nonce\" : n, (numeric) The nonce\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" " \"previousblockhash\" : \"hash\", (string) The hash of the previous block\n" " \"nextblockhash\" : \"hash\", (string) The hash of the next block\n" - " \"chainwork\" : \"0000...1f3\" (string) Expected number of hashes required to produce the current chain (in hex)\n" "}\n" "\nResult (for verbose=false):\n" "\"data\" (string) A string that is serialized, hex-encoded data for block 'hash'.\n" @@ -690,13 +690,13 @@ UniValue getblockheader(const JSONRPCRequest& request) UniValue getblock(const JSONRPCRequest& request) { if (request.fHelp || request.params.size() < 1 || request.params.size() > 2) - throw runtime_error( - "getblock \"hash\" ( verbose )\n" + throw std::runtime_error( + "getblock \"blockhash\" ( verbose )\n" "\nIf verbose is false, returns a string that is serialized, hex-encoded data for block 'hash'.\n" "If verbose is true, returns an Object with information about block <hash>.\n" "\nArguments:\n" - "1. \"hash\" (string, required) The block hash\n" - "2. verbose (boolean, optional, default=true) true for a json object, false for the hex encoded data\n" + "1. \"blockhash\" (string, required) The block hash\n" + "2. verbose (boolean, optional, default=true) true for a json object, false for the hex encoded data\n" "\nResult (for verbose = true):\n" "{\n" " \"hash\" : \"hash\", (string) the block hash (same as provided)\n" @@ -744,10 +744,15 @@ UniValue getblock(const JSONRPCRequest& request) CBlockIndex* pblockindex = mapBlockIndex[hash]; if (fHavePruned && !(pblockindex->nStatus & BLOCK_HAVE_DATA) && pblockindex->nTx > 0) - throw JSONRPCError(RPC_INTERNAL_ERROR, "Block not available (pruned data)"); + throw JSONRPCError(RPC_MISC_ERROR, "Block not available (pruned data)"); - if(!ReadBlockFromDisk(block, pblockindex, Params().GetConsensus())) - throw JSONRPCError(RPC_INTERNAL_ERROR, "Can't read block from disk"); + if (!ReadBlockFromDisk(block, pblockindex, Params().GetConsensus())) + // Block not found on disk. This could be because we have the block + // header in our index but don't have the block (for example if a + // non-whitelisted node sends us an unrequested long chain of valid + // blocks, we add the headers to our index, but don't accept the + // block). + throw JSONRPCError(RPC_MISC_ERROR, "Block not found on disk"); if (!fVerbose) { @@ -814,10 +819,59 @@ static bool GetUTXOStats(CCoinsView *view, CCoinsStats &stats) return true; } +UniValue pruneblockchain(const JSONRPCRequest& request) +{ + if (request.fHelp || request.params.size() != 1) + throw std::runtime_error( + "pruneblockchain\n" + "\nArguments:\n" + "1. \"height\" (numeric, required) The block height to prune up to. May be set to a discrete height, or a unix timestamp\n" + " to prune blocks whose block time is at least 2 hours older than the provided timestamp.\n" + "\nResult:\n" + "n (numeric) Height of the last block pruned.\n" + "\nExamples:\n" + + HelpExampleCli("pruneblockchain", "1000") + + HelpExampleRpc("pruneblockchain", "1000")); + + if (!fPruneMode) + throw JSONRPCError(RPC_MISC_ERROR, "Cannot prune blocks because node is not in prune mode."); + + LOCK(cs_main); + + int heightParam = request.params[0].get_int(); + if (heightParam < 0) + throw JSONRPCError(RPC_INVALID_PARAMETER, "Negative block height."); + + // Height value more than a billion is too high to be a block height, and + // too low to be a block time (corresponds to timestamp from Sep 2001). + if (heightParam > 1000000000) { + // Add a 2 hour buffer to include blocks which might have had old timestamps + CBlockIndex* pindex = chainActive.FindEarliestAtLeast(heightParam - TIMESTAMP_WINDOW); + if (!pindex) { + throw JSONRPCError(RPC_INVALID_PARAMETER, "Could not find block with at least the specified timestamp."); + } + heightParam = pindex->nHeight; + } + + unsigned int height = (unsigned int) heightParam; + unsigned int chainHeight = (unsigned int) chainActive.Height(); + if (chainHeight < Params().PruneAfterHeight()) + throw JSONRPCError(RPC_MISC_ERROR, "Blockchain is too short for pruning."); + else if (height > chainHeight) + throw JSONRPCError(RPC_INVALID_PARAMETER, "Blockchain is shorter than the attempted prune height."); + else if (height > chainHeight - MIN_BLOCKS_TO_KEEP) { + LogPrint("rpc", "Attempt to prune blocks close to the tip. Retaining the minimum number of blocks."); + height = chainHeight - MIN_BLOCKS_TO_KEEP; + } + + PruneBlockFilesManual(height); + return uint64_t(height); +} + UniValue gettxoutsetinfo(const JSONRPCRequest& request) { if (request.fHelp || request.params.size() != 0) - throw runtime_error( + throw std::runtime_error( "gettxoutsetinfo\n" "\nReturns statistics about the unspent transaction output set.\n" "Note this call may take some time.\n" @@ -857,13 +911,13 @@ UniValue gettxoutsetinfo(const JSONRPCRequest& request) UniValue gettxout(const JSONRPCRequest& request) { if (request.fHelp || request.params.size() < 2 || request.params.size() > 3) - throw runtime_error( - "gettxout \"txid\" n ( includemempool )\n" + throw std::runtime_error( + "gettxout \"txid\" n ( include_mempool )\n" "\nReturns details about an unspent transaction output.\n" "\nArguments:\n" "1. \"txid\" (string, required) The transaction id\n" "2. n (numeric, required) vout number\n" - "3. includemempool (boolean, optional) Whether to include the mempool\n" + "3. include_mempool (boolean, optional) Whether to include the mempool\n" "\nResult:\n" "{\n" " \"bestblock\" : \"hash\", (string) the block hash\n" @@ -875,7 +929,7 @@ UniValue gettxout(const JSONRPCRequest& request) " \"reqSigs\" : n, (numeric) Number of required signatures\n" " \"type\" : \"pubkeyhash\", (string) The type, eg pubkeyhash\n" " \"addresses\" : [ (array of string) array of bitcoin addresses\n" - " \"bitcoinaddress\" (string) bitcoin address\n" + " \"address\" (string) bitcoin address\n" " ,...\n" " ]\n" " },\n" @@ -939,12 +993,12 @@ UniValue verifychain(const JSONRPCRequest& request) int nCheckLevel = GetArg("-checklevel", DEFAULT_CHECKLEVEL); int nCheckDepth = GetArg("-checkblocks", DEFAULT_CHECKBLOCKS); if (request.fHelp || request.params.size() > 2) - throw runtime_error( - "verifychain ( checklevel numblocks )\n" + throw std::runtime_error( + "verifychain ( checklevel nblocks )\n" "\nVerifies blockchain database.\n" "\nArguments:\n" "1. checklevel (numeric, optional, 0-4, default=" + strprintf("%d", nCheckLevel) + ") How thorough the block verification is.\n" - "2. numblocks (numeric, optional, default=" + strprintf("%d", nCheckDepth) + ", 0=all) The number of blocks to check.\n" + "2. nblocks (numeric, optional, default=" + strprintf("%d", nCheckDepth) + ", 0=all) The number of blocks to check.\n" "\nResult:\n" "true|false (boolean) Verified or not\n" "\nExamples:\n" @@ -1025,7 +1079,7 @@ void BIP9SoftForkDescPushBack(UniValue& bip9_softforks, const std::string &name, UniValue getblockchaininfo(const JSONRPCRequest& request) { if (request.fHelp || request.params.size() != 0) - throw runtime_error( + throw std::runtime_error( "getblockchaininfo\n" "Returns an object containing various state info regarding blockchain processing.\n" "\nResult:\n" @@ -1073,7 +1127,7 @@ UniValue getblockchaininfo(const JSONRPCRequest& request) obj.push_back(Pair("bestblockhash", chainActive.Tip()->GetBlockHash().GetHex())); obj.push_back(Pair("difficulty", (double)GetDifficulty())); obj.push_back(Pair("mediantime", (int64_t)chainActive.Tip()->GetMedianTimePast())); - obj.push_back(Pair("verificationprogress", Checkpoints::GuessVerificationProgress(Params().Checkpoints(), chainActive.Tip()))); + obj.push_back(Pair("verificationprogress", GuessVerificationProgress(Params().TxData(), chainActive.Tip()))); obj.push_back(Pair("chainwork", chainActive.Tip()->nChainWork.GetHex())); obj.push_back(Pair("pruned", fPruneMode)); @@ -1118,7 +1172,7 @@ struct CompareBlocksByHeight UniValue getchaintips(const JSONRPCRequest& request) { if (request.fHelp || request.params.size() != 0) - throw runtime_error( + throw std::runtime_error( "getchaintips\n" "Return information about all known tips in the block tree," " including the main chain as well as orphaned branches.\n" @@ -1151,7 +1205,7 @@ UniValue getchaintips(const JSONRPCRequest& request) LOCK(cs_main); /* - * Idea: the set of chain tips is chainActive.tip, plus orphan blocks which do not have another orphan building off of them. + * Idea: the set of chain tips is chainActive.tip, plus orphan blocks which do not have another orphan building off of them. * Algorithm: * - Make one pass through mapBlockIndex, picking out the orphan blocks, and also storing a set of the orphan block's pprev pointers. * - Iterate through the orphan blocks. If the block isn't pointed to by another orphan, it is a chain tip. @@ -1190,7 +1244,7 @@ UniValue getchaintips(const JSONRPCRequest& request) const int branchLen = block->nHeight - chainActive.FindFork(block)->nHeight; obj.push_back(Pair("branchlen", branchLen)); - string status; + std::string status; if (chainActive.Contains(block)) { // This block is part of the currently active chain. status = "active"; @@ -1234,7 +1288,7 @@ UniValue mempoolInfoToJSON() UniValue getmempoolinfo(const JSONRPCRequest& request) { if (request.fHelp || request.params.size() != 0) - throw runtime_error( + throw std::runtime_error( "getmempoolinfo\n" "\nReturns details on the active state of the TX memory pool.\n" "\nResult:\n" @@ -1256,13 +1310,13 @@ UniValue getmempoolinfo(const JSONRPCRequest& request) UniValue preciousblock(const JSONRPCRequest& request) { if (request.fHelp || request.params.size() != 1) - throw runtime_error( - "preciousblock \"hash\"\n" + throw std::runtime_error( + "preciousblock \"blockhash\"\n" "\nTreats a block as if it were received before others with the same work.\n" "\nA later preciousblock call can override the effect of an earlier one.\n" "\nThe effects of preciousblock are not retained across restarts.\n" "\nArguments:\n" - "1. hash (string, required) the hash of the block to mark as precious\n" + "1. \"blockhash\" (string, required) the hash of the block to mark as precious\n" "\nResult:\n" "\nExamples:\n" + HelpExampleCli("preciousblock", "\"blockhash\"") @@ -1294,11 +1348,11 @@ UniValue preciousblock(const JSONRPCRequest& request) UniValue invalidateblock(const JSONRPCRequest& request) { if (request.fHelp || request.params.size() != 1) - throw runtime_error( - "invalidateblock \"hash\"\n" + throw std::runtime_error( + "invalidateblock \"blockhash\"\n" "\nPermanently marks a block as invalid, as if it violated a consensus rule.\n" "\nArguments:\n" - "1. hash (string, required) the hash of the block to mark as invalid\n" + "1. \"blockhash\" (string, required) the hash of the block to mark as invalid\n" "\nResult:\n" "\nExamples:\n" + HelpExampleCli("invalidateblock", "\"blockhash\"") @@ -1332,12 +1386,12 @@ UniValue invalidateblock(const JSONRPCRequest& request) UniValue reconsiderblock(const JSONRPCRequest& request) { if (request.fHelp || request.params.size() != 1) - throw runtime_error( - "reconsiderblock \"hash\"\n" + throw std::runtime_error( + "reconsiderblock \"blockhash\"\n" "\nRemoves invalidity status of a block and its descendants, reconsider them for activation.\n" "This can be used to undo the effects of invalidateblock.\n" "\nArguments:\n" - "1. hash (string, required) the hash of the block to reconsider\n" + "1. \"blockhash\" (string, required) the hash of the block to reconsider\n" "\nResult:\n" "\nExamples:\n" + HelpExampleCli("reconsiderblock", "\"blockhash\"") @@ -1367,33 +1421,34 @@ UniValue reconsiderblock(const JSONRPCRequest& request) } static const CRPCCommand commands[] = -{ // category name actor (function) okSafeMode - // --------------------- ------------------------ ----------------------- ---------- - { "blockchain", "getblockchaininfo", &getblockchaininfo, true }, - { "blockchain", "getbestblockhash", &getbestblockhash, true }, - { "blockchain", "getblockcount", &getblockcount, true }, - { "blockchain", "getblock", &getblock, true }, - { "blockchain", "getblockhash", &getblockhash, true }, - { "blockchain", "getblockheader", &getblockheader, true }, - { "blockchain", "getchaintips", &getchaintips, true }, - { "blockchain", "getdifficulty", &getdifficulty, true }, - { "blockchain", "getmempoolancestors", &getmempoolancestors, true }, - { "blockchain", "getmempooldescendants", &getmempooldescendants, true }, - { "blockchain", "getmempoolentry", &getmempoolentry, true }, - { "blockchain", "getmempoolinfo", &getmempoolinfo, true }, - { "blockchain", "getrawmempool", &getrawmempool, true }, - { "blockchain", "gettxout", &gettxout, true }, - { "blockchain", "gettxoutsetinfo", &gettxoutsetinfo, true }, - { "blockchain", "verifychain", &verifychain, true }, - - { "blockchain", "preciousblock", &preciousblock, true }, +{ // category name actor (function) okSafe argNames + // --------------------- ------------------------ ----------------------- ------ ---------- + { "blockchain", "getblockchaininfo", &getblockchaininfo, true, {} }, + { "blockchain", "getbestblockhash", &getbestblockhash, true, {} }, + { "blockchain", "getblockcount", &getblockcount, true, {} }, + { "blockchain", "getblock", &getblock, true, {"blockhash","verbose"} }, + { "blockchain", "getblockhash", &getblockhash, true, {"height"} }, + { "blockchain", "getblockheader", &getblockheader, true, {"blockhash","verbose"} }, + { "blockchain", "getchaintips", &getchaintips, true, {} }, + { "blockchain", "getdifficulty", &getdifficulty, true, {} }, + { "blockchain", "getmempoolancestors", &getmempoolancestors, true, {"txid","verbose"} }, + { "blockchain", "getmempooldescendants", &getmempooldescendants, true, {"txid","verbose"} }, + { "blockchain", "getmempoolentry", &getmempoolentry, true, {"txid"} }, + { "blockchain", "getmempoolinfo", &getmempoolinfo, true, {} }, + { "blockchain", "getrawmempool", &getrawmempool, true, {"verbose"} }, + { "blockchain", "gettxout", &gettxout, true, {"txid","n","include_mempool"} }, + { "blockchain", "gettxoutsetinfo", &gettxoutsetinfo, true, {} }, + { "blockchain", "pruneblockchain", &pruneblockchain, true, {"height"} }, + { "blockchain", "verifychain", &verifychain, true, {"checklevel","nblocks"} }, + + { "blockchain", "preciousblock", &preciousblock, true, {"blockhash"} }, /* Not shown in help */ - { "hidden", "invalidateblock", &invalidateblock, true }, - { "hidden", "reconsiderblock", &reconsiderblock, true }, - { "hidden", "waitfornewblock", &waitfornewblock, true }, - { "hidden", "waitforblock", &waitforblock, true }, - { "hidden", "waitforblockheight", &waitforblockheight, true }, + { "hidden", "invalidateblock", &invalidateblock, true, {"blockhash"} }, + { "hidden", "reconsiderblock", &reconsiderblock, true, {"blockhash"} }, + { "hidden", "waitfornewblock", &waitfornewblock, true, {"timeout"} }, + { "hidden", "waitforblock", &waitforblock, true, {"blockhash","timeout"} }, + { "hidden", "waitforblockheight", &waitforblockheight, true, {"height","timeout"} }, }; void RegisterBlockchainRPCCommands(CRPCTable &t) diff --git a/src/rpc/client.cpp b/src/rpc/client.cpp index e094524bcb..2cb250a198 100644 --- a/src/rpc/client.cpp +++ b/src/rpc/client.cpp @@ -13,111 +13,124 @@ #include <boost/algorithm/string/case_conv.hpp> // for to_lower() #include <univalue.h> -using namespace std; - class CRPCConvertParam { public: std::string methodName; //!< method whose params want conversion int paramIdx; //!< 0-based idx of param to convert + std::string paramName; //!< parameter name }; +/** + * Specify a (method, idx, name) here if the argument is a non-string RPC + * argument and needs to be converted from JSON. + * + * @note Parameter indexes start from 0. + */ static const CRPCConvertParam vRPCConvertParams[] = { - { "stop", 0 }, - { "setmocktime", 0 }, - { "generate", 0 }, - { "generate", 1 }, - { "generatetoaddress", 0 }, - { "generatetoaddress", 2 }, - { "getnetworkhashps", 0 }, - { "getnetworkhashps", 1 }, - { "sendtoaddress", 1 }, - { "sendtoaddress", 4 }, - { "settxfee", 0 }, - { "getreceivedbyaddress", 1 }, - { "getreceivedbyaccount", 1 }, - { "listreceivedbyaddress", 0 }, - { "listreceivedbyaddress", 1 }, - { "listreceivedbyaddress", 2 }, - { "listreceivedbyaccount", 0 }, - { "listreceivedbyaccount", 1 }, - { "listreceivedbyaccount", 2 }, - { "getbalance", 1 }, - { "getbalance", 2 }, - { "getblockhash", 0 }, - { "waitforblockheight", 0 }, - { "waitforblockheight", 1 }, - { "waitforblock", 1 }, - { "waitforblock", 2 }, - { "waitfornewblock", 0 }, - { "waitfornewblock", 1 }, - { "move", 2 }, - { "move", 3 }, - { "sendfrom", 2 }, - { "sendfrom", 3 }, - { "listtransactions", 1 }, - { "listtransactions", 2 }, - { "listtransactions", 3 }, - { "listaccounts", 0 }, - { "listaccounts", 1 }, - { "walletpassphrase", 1 }, - { "getblocktemplate", 0 }, - { "listsinceblock", 1 }, - { "listsinceblock", 2 }, - { "sendmany", 1 }, - { "sendmany", 2 }, - { "sendmany", 4 }, - { "addmultisigaddress", 0 }, - { "addmultisigaddress", 1 }, - { "createmultisig", 0 }, - { "createmultisig", 1 }, - { "listunspent", 0 }, - { "listunspent", 1 }, - { "listunspent", 2 }, - { "getblock", 1 }, - { "getblockheader", 1 }, - { "gettransaction", 1 }, - { "getrawtransaction", 1 }, - { "createrawtransaction", 0 }, - { "createrawtransaction", 1 }, - { "createrawtransaction", 2 }, - { "signrawtransaction", 1 }, - { "signrawtransaction", 2 }, - { "sendrawtransaction", 1 }, - { "fundrawtransaction", 1 }, - { "gettxout", 1 }, - { "gettxout", 2 }, - { "gettxoutproof", 0 }, - { "lockunspent", 0 }, - { "lockunspent", 1 }, - { "importprivkey", 2 }, - { "importaddress", 2 }, - { "importaddress", 3 }, - { "importpubkey", 2 }, - { "importmulti", 0 }, - { "importmulti", 1 }, - { "verifychain", 0 }, - { "verifychain", 1 }, - { "keypoolrefill", 0 }, - { "getrawmempool", 0 }, - { "estimatefee", 0 }, - { "estimatepriority", 0 }, - { "estimatesmartfee", 0 }, - { "estimatesmartpriority", 0 }, - { "prioritisetransaction", 1 }, - { "prioritisetransaction", 2 }, - { "setban", 2 }, - { "setban", 3 }, - { "setnetworkactive", 0 }, - { "getmempoolancestors", 1 }, - { "getmempooldescendants", 1 }, + { "setmocktime", 0, "timestamp" }, + { "generate", 0, "nblocks" }, + { "generate", 1, "maxtries" }, + { "generatetoaddress", 0, "nblocks" }, + { "generatetoaddress", 2, "maxtries" }, + { "getnetworkhashps", 0, "nblocks" }, + { "getnetworkhashps", 1, "height" }, + { "sendtoaddress", 1, "amount" }, + { "sendtoaddress", 4, "subtractfeefromamount" }, + { "settxfee", 0, "amount" }, + { "getreceivedbyaddress", 1, "minconf" }, + { "getreceivedbyaccount", 1, "minconf" }, + { "listreceivedbyaddress", 0, "minconf" }, + { "listreceivedbyaddress", 1, "include_empty" }, + { "listreceivedbyaddress", 2, "include_watchonly" }, + { "listreceivedbyaccount", 0, "minconf" }, + { "listreceivedbyaccount", 1, "include_empty" }, + { "listreceivedbyaccount", 2, "include_watchonly" }, + { "getbalance", 1, "minconf" }, + { "getbalance", 2, "include_watchonly" }, + { "getblockhash", 0, "height" }, + { "waitforblockheight", 0, "height" }, + { "waitforblockheight", 1, "timeout" }, + { "waitforblock", 1, "timeout" }, + { "waitfornewblock", 0, "timeout" }, + { "move", 2, "amount" }, + { "move", 3, "minconf" }, + { "sendfrom", 2, "amount" }, + { "sendfrom", 3, "minconf" }, + { "listtransactions", 1, "count" }, + { "listtransactions", 2, "skip" }, + { "listtransactions", 3, "include_watchonly" }, + { "listaccounts", 0, "minconf" }, + { "listaccounts", 1, "include_watchonly" }, + { "walletpassphrase", 1, "timeout" }, + { "getblocktemplate", 0, "template_request" }, + { "listsinceblock", 1, "target_confirmations" }, + { "listsinceblock", 2, "include_watchonly" }, + { "sendmany", 1, "amounts" }, + { "sendmany", 2, "minconf" }, + { "sendmany", 4, "subtractfeefrom" }, + { "addmultisigaddress", 0, "nrequired" }, + { "addmultisigaddress", 1, "keys" }, + { "createmultisig", 0, "nrequired" }, + { "createmultisig", 1, "keys" }, + { "listunspent", 0, "minconf" }, + { "listunspent", 1, "maxconf" }, + { "listunspent", 2, "addresses" }, + { "getblock", 1, "verbose" }, + { "getblockheader", 1, "verbose" }, + { "gettransaction", 1, "include_watchonly" }, + { "getrawtransaction", 1, "verbose" }, + { "createrawtransaction", 0, "transactions" }, + { "createrawtransaction", 1, "outputs" }, + { "createrawtransaction", 2, "locktime" }, + { "signrawtransaction", 1, "prevtxs" }, + { "signrawtransaction", 2, "privkeys" }, + { "sendrawtransaction", 1, "allowhighfees" }, + { "fundrawtransaction", 1, "options" }, + { "gettxout", 1, "n" }, + { "gettxout", 2, "include_mempool" }, + { "gettxoutproof", 0, "txids" }, + { "lockunspent", 0, "unlock" }, + { "lockunspent", 1, "transactions" }, + { "importprivkey", 2, "rescan" }, + { "importaddress", 2, "rescan" }, + { "importaddress", 3, "p2sh" }, + { "importpubkey", 2, "rescan" }, + { "importmulti", 0, "requests" }, + { "importmulti", 1, "options" }, + { "verifychain", 0, "checklevel" }, + { "verifychain", 1, "nblocks" }, + { "pruneblockchain", 0, "height" }, + { "keypoolrefill", 0, "newsize" }, + { "getrawmempool", 0, "verbose" }, + { "estimatefee", 0, "nblocks" }, + { "estimatesmartfee", 0, "nblocks" }, + { "prioritisetransaction", 1, "fee_delta" }, + { "setban", 2, "bantime" }, + { "setban", 3, "absolute" }, + { "setnetworkactive", 0, "state" }, + { "getmempoolancestors", 1, "verbose" }, + { "getmempooldescendants", 1, "verbose" }, + { "bumpfee", 1, "options" }, + // Echo with conversion (For testing only) + { "echojson", 0, "arg0" }, + { "echojson", 1, "arg1" }, + { "echojson", 2, "arg2" }, + { "echojson", 3, "arg3" }, + { "echojson", 4, "arg4" }, + { "echojson", 5, "arg5" }, + { "echojson", 6, "arg6" }, + { "echojson", 7, "arg7" }, + { "echojson", 8, "arg8" }, + { "echojson", 9, "arg9" }, }; class CRPCConvertTable { private: - std::set<std::pair<std::string, int> > members; + std::set<std::pair<std::string, int>> members; + std::set<std::pair<std::string, std::string>> membersByName; public: CRPCConvertTable(); @@ -125,6 +138,9 @@ public: bool convert(const std::string& method, int idx) { return (members.count(std::make_pair(method, idx)) > 0); } + bool convert(const std::string& method, const std::string& name) { + return (membersByName.count(std::make_pair(method, name)) > 0); + } }; CRPCConvertTable::CRPCConvertTable() @@ -135,6 +151,8 @@ CRPCConvertTable::CRPCConvertTable() for (unsigned int i = 0; i < n_elem; i++) { members.insert(std::make_pair(vRPCConvertParams[i].methodName, vRPCConvertParams[i].paramIdx)); + membersByName.insert(std::make_pair(vRPCConvertParams[i].methodName, + vRPCConvertParams[i].paramName)); } } @@ -148,11 +166,10 @@ UniValue ParseNonRFCJSONValue(const std::string& strVal) UniValue jVal; if (!jVal.read(std::string("[")+strVal+std::string("]")) || !jVal.isArray() || jVal.size()!=1) - throw runtime_error(string("Error parsing JSON:")+strVal); + throw std::runtime_error(std::string("Error parsing JSON:")+strVal); return jVal[0]; } -/** Convert strings to command-specific RPC representation */ UniValue RPCConvertValues(const std::string &strMethod, const std::vector<std::string> &strParams) { UniValue params(UniValue::VARR); @@ -171,3 +188,28 @@ UniValue RPCConvertValues(const std::string &strMethod, const std::vector<std::s return params; } + +UniValue RPCConvertNamedValues(const std::string &strMethod, const std::vector<std::string> &strParams) +{ + UniValue params(UniValue::VOBJ); + + for (const std::string &s: strParams) { + size_t pos = s.find("="); + if (pos == std::string::npos) { + throw(std::runtime_error("No '=' in named argument '"+s+"', this needs to be present for every argument (even if it is empty)")); + } + + std::string name = s.substr(0, pos); + std::string value = s.substr(pos+1); + + if (!rpcCvtTable.convert(strMethod, name)) { + // insert string value directly + params.pushKV(name, value); + } else { + // parse string as JSON, insert bool/number/object/etc. value + params.pushKV(name, ParseNonRFCJSONValue(value)); + } + } + + return params; +} diff --git a/src/rpc/client.h b/src/rpc/client.h index cb7c12b129..e7cf035d8f 100644 --- a/src/rpc/client.h +++ b/src/rpc/client.h @@ -8,7 +8,12 @@ #include <univalue.h> +/** Convert positional arguments to command-specific RPC representation */ UniValue RPCConvertValues(const std::string& strMethod, const std::vector<std::string>& strParams); + +/** Convert named arguments to command-specific RPC representation */ +UniValue RPCConvertNamedValues(const std::string& strMethod, const std::vector<std::string>& strParams); + /** Non-RFC4627 JSON parser, accepts internal values (such as numbers, true, false, null) * as well as objects and arrays. */ diff --git a/src/rpc/mining.cpp b/src/rpc/mining.cpp index 3796a18fec..abdfa651ab 100644 --- a/src/rpc/mining.cpp +++ b/src/rpc/mining.cpp @@ -30,8 +30,6 @@ #include <univalue.h> -using namespace std; - /** * Return average network hashes per second based on the last 'lookup' blocks, * or from the last difficulty change if 'lookup' is nonpositive. @@ -77,14 +75,14 @@ UniValue GetNetworkHashPS(int lookup, int height) { UniValue getnetworkhashps(const JSONRPCRequest& request) { if (request.fHelp || request.params.size() > 2) - throw runtime_error( - "getnetworkhashps ( blocks height )\n" + throw std::runtime_error( + "getnetworkhashps ( nblocks height )\n" "\nReturns the estimated network hashes per second based on the last n blocks.\n" "Pass in [blocks] to override # of blocks, -1 specifies since last difficulty change.\n" "Pass in [height] to estimate the network speed at the time when a certain block was found.\n" "\nArguments:\n" - "1. blocks (numeric, optional, default=120) The number of blocks, or -1 for blocks since last difficulty change.\n" - "2. height (numeric, optional, default=-1) To estimate at the time of the given height.\n" + "1. nblocks (numeric, optional, default=120) The number of blocks, or -1 for blocks since last difficulty change.\n" + "2. height (numeric, optional, default=-1) To estimate at the time of the given height.\n" "\nResult:\n" "x (numeric) Hashes per second estimated\n" "\nExamples:\n" @@ -149,11 +147,11 @@ UniValue generateBlocks(boost::shared_ptr<CReserveScript> coinbaseScript, int nG UniValue generate(const JSONRPCRequest& request) { if (request.fHelp || request.params.size() < 1 || request.params.size() > 2) - throw runtime_error( - "generate numblocks ( maxtries )\n" - "\nMine up to numblocks blocks immediately (before the RPC call returns)\n" + throw std::runtime_error( + "generate nblocks ( maxtries )\n" + "\nMine up to nblocks blocks immediately (before the RPC call returns)\n" "\nArguments:\n" - "1. numblocks (numeric, required) How many blocks are generated immediately.\n" + "1. nblocks (numeric, required) How many blocks are generated immediately.\n" "2. maxtries (numeric, optional) How many iterations to try (default = 1000000).\n" "\nResult:\n" "[ blockhashes ] (array) hashes of blocks generated\n" @@ -185,12 +183,12 @@ UniValue generate(const JSONRPCRequest& request) UniValue generatetoaddress(const JSONRPCRequest& request) { if (request.fHelp || request.params.size() < 2 || request.params.size() > 3) - throw runtime_error( - "generatetoaddress numblocks address (maxtries)\n" + throw std::runtime_error( + "generatetoaddress nblocks address (maxtries)\n" "\nMine blocks immediately to a specified address (before the RPC call returns)\n" "\nArguments:\n" - "1. numblocks (numeric, required) How many blocks are generated immediately.\n" - "2. address (string, required) The address to send the newly generated bitcoin to.\n" + "1. nblocks (numeric, required) How many blocks are generated immediately.\n" + "2. address (string, required) The address to send the newly generated bitcoin to.\n" "3. maxtries (numeric, optional) How many iterations to try (default = 1000000).\n" "\nResult:\n" "[ blockhashes ] (array) hashes of blocks generated\n" @@ -208,7 +206,7 @@ UniValue generatetoaddress(const JSONRPCRequest& request) CBitcoinAddress address(request.params[1].get_str()); if (!address.IsValid()) throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Error: Invalid address"); - + boost::shared_ptr<CReserveScript> coinbaseScript(new CReserveScript()); coinbaseScript->reserveScript = GetScriptForDestination(address.Get()); @@ -218,7 +216,7 @@ UniValue generatetoaddress(const JSONRPCRequest& request) UniValue getmininginfo(const JSONRPCRequest& request) { if (request.fHelp || request.params.size() != 0) - throw runtime_error( + throw std::runtime_error( "getmininginfo\n" "\nReturns a json object containing mining-related information." "\nResult:\n" @@ -258,31 +256,28 @@ UniValue getmininginfo(const JSONRPCRequest& request) // NOTE: Unlike wallet RPC (which use BTC values), mining RPCs follow GBT (BIP 22) in using satoshi amounts UniValue prioritisetransaction(const JSONRPCRequest& request) { - if (request.fHelp || request.params.size() != 3) - throw runtime_error( - "prioritisetransaction <txid> <priority delta> <fee delta>\n" + if (request.fHelp || request.params.size() != 2) + throw std::runtime_error( + "prioritisetransaction <txid> <fee delta>\n" "Accepts the transaction into mined blocks at a higher (or lower) priority\n" "\nArguments:\n" "1. \"txid\" (string, required) The transaction id.\n" - "2. priority delta (numeric, required) The priority to add or subtract.\n" - " The transaction selection algorithm considers the tx as it would have a higher priority.\n" - " (priority of a transaction is calculated: coinage * value_in_satoshis / txsize) \n" - "3. fee delta (numeric, required) The fee value (in satoshis) to add (or subtract, if negative).\n" + "2. fee_delta (numeric, required) The fee value (in satoshis) to add (or subtract, if negative).\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.\n" "\nResult:\n" "true (boolean) Returns true\n" "\nExamples:\n" - + HelpExampleCli("prioritisetransaction", "\"txid\" 0.0 10000") - + HelpExampleRpc("prioritisetransaction", "\"txid\", 0.0, 10000") + + HelpExampleCli("prioritisetransaction", "\"txid\" 10000") + + HelpExampleRpc("prioritisetransaction", "\"txid\", 10000") ); LOCK(cs_main); uint256 hash = ParseHashStr(request.params[0].get_str(), "txid"); - CAmount nAmount = request.params[2].get_int64(); + CAmount nAmount = request.params[1].get_int64(); - mempool.PrioritiseTransaction(hash, request.params[0].get_str(), request.params[1].get_real(), nAmount); + mempool.PrioritiseTransaction(hash, nAmount); return true; } @@ -318,7 +313,7 @@ std::string gbt_vb_name(const Consensus::DeploymentPos pos) { UniValue getblocktemplate(const JSONRPCRequest& request) { if (request.fHelp || request.params.size() > 1) - throw runtime_error( + throw std::runtime_error( "getblocktemplate ( TemplateRequest )\n" "\nIf the request parameters include a 'mode' key, that is used to explicitly select between the default 'template' request or a 'proposal'.\n" "It returns data needed to construct a block to work on.\n" @@ -329,7 +324,7 @@ UniValue getblocktemplate(const JSONRPCRequest& request) " https://github.com/bitcoin/bips/blob/master/bip-0145.mediawiki\n" "\nArguments:\n" - "1. TemplateRequest (json object, optional) A json object in the following spec\n" + "1. template_request (json object, optional) A json object in the following spec\n" " {\n" " \"mode\":\"template\" (string, optional) This must be set to \"template\", \"proposal\" (see BIP 23), or omitted\n" " \"capabilities\":[ (array, optional) A list of strings\n" @@ -556,7 +551,7 @@ UniValue getblocktemplate(const JSONRPCRequest& request) UniValue aCaps(UniValue::VARR); aCaps.push_back("proposal"); UniValue transactions(UniValue::VARR); - map<uint256, int64_t> setTxIndex; + std::map<uint256, int64_t> setTxIndex; int i = 0; for (const auto& it : pblock->vtx) { const CTransaction& tx = *it; @@ -676,8 +671,12 @@ UniValue getblocktemplate(const JSONRPCRequest& request) nSigOpLimit /= WITNESS_SCALE_FACTOR; } result.push_back(Pair("sigoplimit", nSigOpLimit)); - result.push_back(Pair("sizelimit", (int64_t)MAX_BLOCK_SERIALIZED_SIZE)); - result.push_back(Pair("weightlimit", (int64_t)MAX_BLOCK_WEIGHT)); + if (fPreSegWit) { + result.push_back(Pair("sizelimit", (int64_t)MAX_BLOCK_BASE_SIZE)); + } else { + result.push_back(Pair("sizelimit", (int64_t)MAX_BLOCK_SERIALIZED_SIZE)); + result.push_back(Pair("weightlimit", (int64_t)MAX_BLOCK_WEIGHT)); + } result.push_back(Pair("curtime", pblock->GetBlockTime())); result.push_back(Pair("bits", strprintf("%08x", pblock->nBits))); result.push_back(Pair("height", (int64_t)(pindexPrev->nHeight+1))); @@ -697,7 +696,7 @@ public: bool found; CValidationState state; - submitblock_StateCatcher(const uint256 &hashIn) : hash(hashIn), found(false), state() {}; + submitblock_StateCatcher(const uint256 &hashIn) : hash(hashIn), found(false), state() {} protected: virtual void BlockChecked(const CBlock& block, const CValidationState& stateIn) { @@ -705,21 +704,21 @@ protected: return; found = true; state = stateIn; - }; + } }; UniValue submitblock(const JSONRPCRequest& request) { if (request.fHelp || request.params.size() < 1 || request.params.size() > 2) - throw runtime_error( + throw std::runtime_error( "submitblock \"hexdata\" ( \"jsonparametersobject\" )\n" "\nAttempts to submit new block to network.\n" "The 'jsonparametersobject' parameter is currently ignored.\n" "See https://en.bitcoin.it/wiki/BIP_0022 for full specification.\n" - "\nArguments:\n" - "1. \"hexdata\" (string, required) the hex-encoded block data to submit\n" - "2. \"jsonparametersobject\" (string, optional) object of optional parameters\n" + "\nArguments\n" + "1. \"hexdata\" (string, required) the hex-encoded block data to submit\n" + "2. \"parameters\" (string, optional) object of optional parameters\n" " {\n" " \"workid\" : \"id\" (string, optional) if the server provided a workid, it MUST be included with submissions\n" " }\n" @@ -776,13 +775,13 @@ UniValue submitblock(const JSONRPCRequest& request) UniValue estimatefee(const JSONRPCRequest& request) { if (request.fHelp || request.params.size() != 1) - throw runtime_error( + throw std::runtime_error( "estimatefee nblocks\n" "\nEstimates the approximate fee per kilobyte needed for a transaction to begin\n" "confirmation within nblocks blocks. Uses virtual transaction size of transaction\n" "as defined in BIP 141 (witness data is discounted).\n" "\nArguments:\n" - "1. nblocks (numeric)\n" + "1. nblocks (numeric, required)\n" "\nResult:\n" "n (numeric) estimated fee-per-kilobyte\n" "\n" @@ -807,37 +806,10 @@ UniValue estimatefee(const JSONRPCRequest& request) return ValueFromAmount(feeRate.GetFeePerK()); } -UniValue estimatepriority(const JSONRPCRequest& request) -{ - if (request.fHelp || request.params.size() != 1) - throw runtime_error( - "estimatepriority nblocks\n" - "\nDEPRECATED. Estimates the approximate priority a zero-fee transaction needs to begin\n" - "confirmation within nblocks blocks.\n" - "\nArguments:\n" - "1. nblocks (numeric)\n" - "\nResult:\n" - "n (numeric) estimated priority\n" - "\n" - "A negative value is returned if not enough transactions and blocks\n" - "have been observed to make an estimate.\n" - "\nExample:\n" - + HelpExampleCli("estimatepriority", "6") - ); - - RPCTypeCheck(request.params, boost::assign::list_of(UniValue::VNUM)); - - int nBlocks = request.params[0].get_int(); - if (nBlocks < 1) - nBlocks = 1; - - return mempool.estimatePriority(nBlocks); -} - UniValue estimatesmartfee(const JSONRPCRequest& request) { if (request.fHelp || request.params.size() != 1) - throw runtime_error( + throw std::runtime_error( "estimatesmartfee nblocks\n" "\nWARNING: This interface is unstable and may disappear or change!\n" "\nEstimates the approximate fee per kilobyte needed for a transaction to begin\n" @@ -871,58 +843,20 @@ UniValue estimatesmartfee(const JSONRPCRequest& request) return result; } -UniValue estimatesmartpriority(const JSONRPCRequest& request) -{ - if (request.fHelp || request.params.size() != 1) - throw runtime_error( - "estimatesmartpriority nblocks\n" - "\nDEPRECATED. WARNING: This interface is unstable and may disappear or change!\n" - "\nEstimates the approximate priority a zero-fee transaction needs to begin\n" - "confirmation within nblocks blocks if possible and return the number of blocks\n" - "for which the estimate is valid.\n" - "\nArguments:\n" - "1. nblocks (numeric)\n" - "\nResult:\n" - "{\n" - " \"priority\" : x.x, (numeric) estimated priority\n" - " \"blocks\" : n (numeric) block number where estimate was found\n" - "}\n" - "\n" - "A negative value is returned if not enough transactions and blocks\n" - "have been observed to make an estimate for any number of blocks.\n" - "However if the mempool reject fee is set it will return 1e9 * MAX_MONEY.\n" - "\nExample:\n" - + HelpExampleCli("estimatesmartpriority", "6") - ); - - RPCTypeCheck(request.params, boost::assign::list_of(UniValue::VNUM)); - - int nBlocks = request.params[0].get_int(); - - UniValue result(UniValue::VOBJ); - int answerFound; - double priority = mempool.estimateSmartPriority(nBlocks, &answerFound); - result.push_back(Pair("priority", priority)); - result.push_back(Pair("blocks", answerFound)); - return result; -} - static const CRPCCommand commands[] = { // category name actor (function) okSafeMode // --------------------- ------------------------ ----------------------- ---------- - { "mining", "getnetworkhashps", &getnetworkhashps, true }, - { "mining", "getmininginfo", &getmininginfo, true }, - { "mining", "prioritisetransaction", &prioritisetransaction, true }, - { "mining", "getblocktemplate", &getblocktemplate, true }, - { "mining", "submitblock", &submitblock, true }, - - { "generating", "generate", &generate, true }, - { "generating", "generatetoaddress", &generatetoaddress, true }, - - { "util", "estimatefee", &estimatefee, true }, - { "util", "estimatepriority", &estimatepriority, true }, - { "util", "estimatesmartfee", &estimatesmartfee, true }, - { "util", "estimatesmartpriority", &estimatesmartpriority, true }, + { "mining", "getnetworkhashps", &getnetworkhashps, true, {"nblocks","height"} }, + { "mining", "getmininginfo", &getmininginfo, true, {} }, + { "mining", "prioritisetransaction", &prioritisetransaction, true, {"txid","fee_delta"} }, + { "mining", "getblocktemplate", &getblocktemplate, true, {"template_request"} }, + { "mining", "submitblock", &submitblock, true, {"hexdata","parameters"} }, + + { "generating", "generate", &generate, true, {"nblocks","maxtries"} }, + { "generating", "generatetoaddress", &generatetoaddress, true, {"nblocks","address","maxtries"} }, + + { "util", "estimatefee", &estimatefee, true, {"nblocks"} }, + { "util", "estimatesmartfee", &estimatesmartfee, true, {"nblocks"} }, }; void RegisterMiningRPCCommands(CRPCTable &t) diff --git a/src/rpc/misc.cpp b/src/rpc/misc.cpp index f7c4ecc20c..2a8f95b615 100644 --- a/src/rpc/misc.cpp +++ b/src/rpc/misc.cpp @@ -14,6 +14,7 @@ #include "util.h" #include "utilstrencodings.h" #ifdef ENABLE_WALLET +#include "wallet/rpcwallet.h" #include "wallet/wallet.h" #include "wallet/walletdb.h" #endif @@ -24,8 +25,6 @@ #include <univalue.h> -using namespace std; - /** * @note Do not add or change anything in the information returned by this * method. `getinfo` exists for backwards-compatibility only. It combines @@ -42,7 +41,7 @@ using namespace std; UniValue getinfo(const JSONRPCRequest& request) { if (request.fHelp || request.params.size() != 0) - throw runtime_error( + throw std::runtime_error( "getinfo\n" "\nDEPRECATED. Returns an object containing various state info.\n" "\nResult:\n" @@ -61,7 +60,7 @@ UniValue getinfo(const JSONRPCRequest& request) " \"keypoolsize\": xxxx, (numeric) how many new keys are pre-generated\n" " \"unlocked_until\": ttt, (numeric) the timestamp in seconds since epoch (midnight Jan 1 1970 GMT) that the wallet is unlocked for transfers, or 0 if the wallet is locked\n" " \"paytxfee\": x.xxxx, (numeric) the transaction fee set in " + CURRENCY_UNIT + "/kB\n" - " \"relayfee\": x.xxxx, (numeric) minimum relay fee for non-free transactions in " + CURRENCY_UNIT + "/kB\n" + " \"relayfee\": x.xxxx, (numeric) minimum relay fee for transactions in " + CURRENCY_UNIT + "/kB\n" " \"errors\": \"...\" (string) any error messages\n" "}\n" "\nExamples:\n" @@ -70,7 +69,9 @@ UniValue getinfo(const JSONRPCRequest& request) ); #ifdef ENABLE_WALLET - LOCK2(cs_main, pwalletMain ? &pwalletMain->cs_wallet : NULL); + CWallet * const pwallet = GetWalletForJSONRPCRequest(request); + + LOCK2(cs_main, pwallet ? &pwallet->cs_wallet : NULL); #else LOCK(cs_main); #endif @@ -82,25 +83,26 @@ UniValue getinfo(const JSONRPCRequest& request) obj.push_back(Pair("version", CLIENT_VERSION)); obj.push_back(Pair("protocolversion", PROTOCOL_VERSION)); #ifdef ENABLE_WALLET - if (pwalletMain) { - obj.push_back(Pair("walletversion", pwalletMain->GetVersion())); - obj.push_back(Pair("balance", ValueFromAmount(pwalletMain->GetBalance()))); + if (pwallet) { + obj.push_back(Pair("walletversion", pwallet->GetVersion())); + obj.push_back(Pair("balance", ValueFromAmount(pwallet->GetBalance()))); } #endif obj.push_back(Pair("blocks", (int)chainActive.Height())); obj.push_back(Pair("timeoffset", GetTimeOffset())); if(g_connman) obj.push_back(Pair("connections", (int)g_connman->GetNodeCount(CConnman::CONNECTIONS_ALL))); - obj.push_back(Pair("proxy", (proxy.IsValid() ? proxy.proxy.ToStringIPPort() : string()))); + obj.push_back(Pair("proxy", (proxy.IsValid() ? proxy.proxy.ToStringIPPort() : std::string()))); obj.push_back(Pair("difficulty", (double)GetDifficulty())); obj.push_back(Pair("testnet", Params().NetworkIDString() == CBaseChainParams::TESTNET)); #ifdef ENABLE_WALLET - if (pwalletMain) { - obj.push_back(Pair("keypoololdest", pwalletMain->GetOldestKeyPoolTime())); - obj.push_back(Pair("keypoolsize", (int)pwalletMain->GetKeyPoolSize())); + if (pwallet) { + obj.push_back(Pair("keypoololdest", pwallet->GetOldestKeyPoolTime())); + obj.push_back(Pair("keypoolsize", (int)pwallet->GetKeyPoolSize())); + } + if (pwallet && pwallet->IsCrypted()) { + obj.push_back(Pair("unlocked_until", pwallet->nRelockTime)); } - if (pwalletMain && pwalletMain->IsCrypted()) - obj.push_back(Pair("unlocked_until", nWalletUnlockTime)); obj.push_back(Pair("paytxfee", ValueFromAmount(payTxFee.GetFeePerK()))); #endif obj.push_back(Pair("relayfee", ValueFromAmount(::minRelayTxFee.GetFeePerK()))); @@ -112,13 +114,17 @@ UniValue getinfo(const JSONRPCRequest& request) class DescribeAddressVisitor : public boost::static_visitor<UniValue> { public: + CWallet * const pwallet; + + DescribeAddressVisitor(CWallet *_pwallet) : pwallet(_pwallet) {} + UniValue operator()(const CNoDestination &dest) const { return UniValue(UniValue::VOBJ); } UniValue operator()(const CKeyID &keyID) const { UniValue obj(UniValue::VOBJ); CPubKey vchPubKey; obj.push_back(Pair("isscript", false)); - if (pwalletMain && pwalletMain->GetPubKey(keyID, vchPubKey)) { + if (pwallet && pwallet->GetPubKey(keyID, vchPubKey)) { obj.push_back(Pair("pubkey", HexStr(vchPubKey))); obj.push_back(Pair("iscompressed", vchPubKey.IsCompressed())); } @@ -129,7 +135,7 @@ public: UniValue obj(UniValue::VOBJ); CScript subscript; obj.push_back(Pair("isscript", true)); - if (pwalletMain && pwalletMain->GetCScript(scriptID, subscript)) { + if (pwallet && pwallet->GetCScript(scriptID, subscript)) { std::vector<CTxDestination> addresses; txnouttype whichType; int nRequired; @@ -151,15 +157,15 @@ public: UniValue validateaddress(const JSONRPCRequest& request) { if (request.fHelp || request.params.size() != 1) - throw runtime_error( - "validateaddress \"bitcoinaddress\"\n" + throw std::runtime_error( + "validateaddress \"address\"\n" "\nReturn information about the given bitcoin address.\n" "\nArguments:\n" - "1. \"bitcoinaddress\" (string, required) The bitcoin address to validate\n" + "1. \"address\" (string, required) The bitcoin address to validate\n" "\nResult:\n" "{\n" " \"isvalid\" : true|false, (boolean) If the address is valid or not. If not, this is the only property returned.\n" - " \"address\" : \"bitcoinaddress\", (string) The bitcoin address validated\n" + " \"address\" : \"address\", (string) The bitcoin address validated\n" " \"scriptPubKey\" : \"hex\", (string) The hex encoded scriptPubKey generated by the address\n" " \"ismine\" : true|false, (boolean) If the address is yours or not\n" " \"iswatchonly\" : true|false, (boolean) If the address is watchonly\n" @@ -167,6 +173,7 @@ UniValue validateaddress(const JSONRPCRequest& request) " \"pubkey\" : \"publickeyhex\", (string) The hex value of the raw public key\n" " \"iscompressed\" : true|false, (boolean) If the address is compressed\n" " \"account\" : \"account\" (string) DEPRECATED. The account associated with the address, \"\" is the default account\n" + " \"timestamp\" : timestamp, (number, optional) The creation time of the key if available in seconds since epoch (Jan 1 1970 GMT)\n" " \"hdkeypath\" : \"keypath\" (string, optional) The HD keypath if the key is HD and available\n" " \"hdmasterkeyid\" : \"<hash160>\" (string, optional) The Hash160 of the HD master pubkey\n" "}\n" @@ -176,7 +183,9 @@ UniValue validateaddress(const JSONRPCRequest& request) ); #ifdef ENABLE_WALLET - LOCK2(cs_main, pwalletMain ? &pwalletMain->cs_wallet : NULL); + CWallet * const pwallet = GetWalletForJSONRPCRequest(request); + + LOCK2(cs_main, pwallet ? &pwallet->cs_wallet : NULL); #else LOCK(cs_main); #endif @@ -189,48 +198,61 @@ UniValue validateaddress(const JSONRPCRequest& request) if (isValid) { CTxDestination dest = address.Get(); - string currentAddress = address.ToString(); + std::string currentAddress = address.ToString(); ret.push_back(Pair("address", currentAddress)); CScript scriptPubKey = GetScriptForDestination(dest); ret.push_back(Pair("scriptPubKey", HexStr(scriptPubKey.begin(), scriptPubKey.end()))); #ifdef ENABLE_WALLET - isminetype mine = pwalletMain ? IsMine(*pwalletMain, dest) : ISMINE_NO; + isminetype mine = pwallet ? IsMine(*pwallet, dest) : ISMINE_NO; ret.push_back(Pair("ismine", (mine & ISMINE_SPENDABLE) ? true : false)); ret.push_back(Pair("iswatchonly", (mine & ISMINE_WATCH_ONLY) ? true: false)); - UniValue detail = boost::apply_visitor(DescribeAddressVisitor(), dest); + UniValue detail = boost::apply_visitor(DescribeAddressVisitor(pwallet), dest); ret.pushKVs(detail); - if (pwalletMain && pwalletMain->mapAddressBook.count(dest)) - ret.push_back(Pair("account", pwalletMain->mapAddressBook[dest].name)); + if (pwallet && pwallet->mapAddressBook.count(dest)) { + ret.push_back(Pair("account", pwallet->mapAddressBook[dest].name)); + } CKeyID keyID; - if (pwalletMain && address.GetKeyID(keyID) && pwalletMain->mapKeyMetadata.count(keyID) && !pwalletMain->mapKeyMetadata[keyID].hdKeypath.empty()) - { - ret.push_back(Pair("hdkeypath", pwalletMain->mapKeyMetadata[keyID].hdKeypath)); - ret.push_back(Pair("hdmasterkeyid", pwalletMain->mapKeyMetadata[keyID].hdMasterKeyID.GetHex())); + if (pwallet) { + const auto& meta = pwallet->mapKeyMetadata; + auto it = address.GetKeyID(keyID) ? meta.find(keyID) : meta.end(); + if (it == meta.end()) { + it = meta.find(CScriptID(scriptPubKey)); + } + if (it != meta.end()) { + ret.push_back(Pair("timestamp", it->second.nCreateTime)); + if (!it->second.hdKeypath.empty()) { + ret.push_back(Pair("hdkeypath", it->second.hdKeypath)); + ret.push_back(Pair("hdmasterkeyid", it->second.hdMasterKeyID.GetHex())); + } + } } #endif } return ret; } +// Needed even with !ENABLE_WALLET, to pass (ignored) pointers around +class CWallet; + /** * Used by addmultisigaddress / createmultisig: */ -CScript _createmultisig_redeemScript(const UniValue& params) +CScript _createmultisig_redeemScript(CWallet * const pwallet, const UniValue& params) { int nRequired = params[0].get_int(); const UniValue& keys = params[1].get_array(); // Gather public keys if (nRequired < 1) - throw runtime_error("a multisignature address must require at least one key to redeem"); + throw std::runtime_error("a multisignature address must require at least one key to redeem"); if ((int)keys.size() < nRequired) - throw runtime_error( + throw std::runtime_error( strprintf("not enough keys supplied " "(got %u keys, but need at least %d to redeem)", keys.size(), nRequired)); if (keys.size() > 16) - throw runtime_error("Number of addresses involved in the multisignature address creation > 16\nReduce the number"); + throw std::runtime_error("Number of addresses involved in the multisignature address creation > 16\nReduce the number"); std::vector<CPubKey> pubkeys; pubkeys.resize(keys.size()); for (unsigned int i = 0; i < keys.size(); i++) @@ -239,18 +261,18 @@ CScript _createmultisig_redeemScript(const UniValue& params) #ifdef ENABLE_WALLET // Case 1: Bitcoin address and we have full public key: CBitcoinAddress address(ks); - if (pwalletMain && address.IsValid()) - { + if (pwallet && address.IsValid()) { CKeyID keyID; if (!address.GetKeyID(keyID)) - throw runtime_error( + throw std::runtime_error( strprintf("%s does not refer to a key",ks)); CPubKey vchPubKey; - if (!pwalletMain->GetPubKey(keyID, vchPubKey)) - throw runtime_error( + if (!pwallet->GetPubKey(keyID, vchPubKey)) { + throw std::runtime_error( strprintf("no full public key for address %s",ks)); + } if (!vchPubKey.IsFullyValid()) - throw runtime_error(" Invalid public key: "+ks); + throw std::runtime_error(" Invalid public key: "+ks); pubkeys[i] = vchPubKey; } @@ -261,18 +283,18 @@ CScript _createmultisig_redeemScript(const UniValue& params) { CPubKey vchPubKey(ParseHex(ks)); if (!vchPubKey.IsFullyValid()) - throw runtime_error(" Invalid public key: "+ks); + throw std::runtime_error(" Invalid public key: "+ks); pubkeys[i] = vchPubKey; } else { - throw runtime_error(" Invalid public key: "+ks); + throw std::runtime_error(" Invalid public key: "+ks); } } CScript result = GetScriptForMultisig(nRequired, pubkeys); if (result.size() > MAX_SCRIPT_ELEMENT_SIZE) - throw runtime_error( + throw std::runtime_error( strprintf("redeemScript exceeds size limit: %d > %d", result.size(), MAX_SCRIPT_ELEMENT_SIZE)); return result; @@ -280,9 +302,15 @@ CScript _createmultisig_redeemScript(const UniValue& params) UniValue createmultisig(const JSONRPCRequest& request) { +#ifdef ENABLE_WALLET + CWallet * const pwallet = GetWalletForJSONRPCRequest(request); +#else + CWallet * const pwallet = NULL; +#endif + if (request.fHelp || request.params.size() < 2 || request.params.size() > 2) { - string msg = "createmultisig nrequired [\"key\",...]\n" + std::string msg = "createmultisig nrequired [\"key\",...]\n" "\nCreates a multi-signature address with n signature of m keys required.\n" "It returns a json object with the address and redeemScript.\n" @@ -306,11 +334,11 @@ UniValue createmultisig(const JSONRPCRequest& request) "\nAs a json rpc call\n" + HelpExampleRpc("createmultisig", "2, \"[\\\"16sSauSf5pF2UkUwvKGq4qjNRzBZYqgEL5\\\",\\\"171sgjn4YtPu27adkKGrdDwzRTxnRkBfKV\\\"]\"") ; - throw runtime_error(msg); + throw std::runtime_error(msg); } // Construct using pay-to-script-hash: - CScript inner = _createmultisig_redeemScript(request.params); + CScript inner = _createmultisig_redeemScript(pwallet, request.params); CScriptID innerID(inner); CBitcoinAddress address(innerID); @@ -324,11 +352,11 @@ UniValue createmultisig(const JSONRPCRequest& request) UniValue verifymessage(const JSONRPCRequest& request) { if (request.fHelp || request.params.size() != 3) - throw runtime_error( - "verifymessage \"bitcoinaddress\" \"signature\" \"message\"\n" + throw std::runtime_error( + "verifymessage \"address\" \"signature\" \"message\"\n" "\nVerify a signed message\n" "\nArguments:\n" - "1. \"bitcoinaddress\" (string, required) The bitcoin address to use for the signature.\n" + "1. \"address\" (string, required) The bitcoin address to use for the signature.\n" "2. \"signature\" (string, required) The signature provided by the signer in base 64 encoding (see signmessage).\n" "3. \"message\" (string, required) The message that was signed.\n" "\nResult:\n" @@ -337,18 +365,18 @@ UniValue verifymessage(const JSONRPCRequest& request) "\nUnlock the wallet for 30 seconds\n" + HelpExampleCli("walletpassphrase", "\"mypassphrase\" 30") + "\nCreate the signature\n" - + HelpExampleCli("signmessage", "\"1D1ZrZNe3JUo7ZycKEYQQiQAWd9y54F4XZ\" \"my message\"") + + + HelpExampleCli("signmessage", "\"1D1ZrZNe3JUo7ZycKEYQQiQAWd9y54F4XX\" \"my message\"") + "\nVerify the signature\n" - + HelpExampleCli("verifymessage", "\"1D1ZrZNe3JUo7ZycKEYQQiQAWd9y54F4XZ\" \"signature\" \"my message\"") + + + HelpExampleCli("verifymessage", "\"1D1ZrZNe3JUo7ZycKEYQQiQAWd9y54F4XX\" \"signature\" \"my message\"") + "\nAs json rpc\n" - + HelpExampleRpc("verifymessage", "\"1D1ZrZNe3JUo7ZycKEYQQiQAWd9y54F4XZ\", \"signature\", \"my message\"") + + HelpExampleRpc("verifymessage", "\"1D1ZrZNe3JUo7ZycKEYQQiQAWd9y54F4XX\", \"signature\", \"my message\"") ); LOCK(cs_main); - string strAddress = request.params[0].get_str(); - string strSign = request.params[1].get_str(); - string strMessage = request.params[2].get_str(); + std::string strAddress = request.params[0].get_str(); + std::string strSign = request.params[1].get_str(); + std::string strMessage = request.params[2].get_str(); CBitcoinAddress addr(strAddress); if (!addr.IsValid()) @@ -359,7 +387,7 @@ UniValue verifymessage(const JSONRPCRequest& request) throw JSONRPCError(RPC_TYPE_ERROR, "Address does not refer to key"); bool fInvalid = false; - vector<unsigned char> vchSig = DecodeBase64(strSign.c_str(), &fInvalid); + std::vector<unsigned char> vchSig = DecodeBase64(strSign.c_str(), &fInvalid); if (fInvalid) throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Malformed base64 encoding"); @@ -378,7 +406,7 @@ UniValue verifymessage(const JSONRPCRequest& request) UniValue signmessagewithprivkey(const JSONRPCRequest& request) { if (request.fHelp || request.params.size() != 2) - throw runtime_error( + throw std::runtime_error( "signmessagewithprivkey \"privkey\" \"message\"\n" "\nSign a message with the private key of an address\n" "\nArguments:\n" @@ -390,13 +418,13 @@ UniValue signmessagewithprivkey(const JSONRPCRequest& request) "\nCreate the signature\n" + HelpExampleCli("signmessagewithprivkey", "\"privkey\" \"my message\"") + "\nVerify the signature\n" - + HelpExampleCli("verifymessage", "\"1D1ZrZNe3JUo7ZycKEYQQiQAWd9y54F4XZ\" \"signature\" \"my message\"") + + + HelpExampleCli("verifymessage", "\"1D1ZrZNe3JUo7ZycKEYQQiQAWd9y54F4XX\" \"signature\" \"my message\"") + "\nAs json rpc\n" + HelpExampleRpc("signmessagewithprivkey", "\"privkey\", \"my message\"") ); - string strPrivkey = request.params[0].get_str(); - string strMessage = request.params[1].get_str(); + std::string strPrivkey = request.params[0].get_str(); + std::string strMessage = request.params[1].get_str(); CBitcoinSecret vchSecret; bool fGood = vchSecret.SetString(strPrivkey); @@ -410,7 +438,7 @@ UniValue signmessagewithprivkey(const JSONRPCRequest& request) ss << strMessageMagic; ss << strMessage; - vector<unsigned char> vchSig; + std::vector<unsigned char> vchSig; if (!key.SignCompact(ss.GetHash(), vchSig)) throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Sign failed"); @@ -420,7 +448,7 @@ UniValue signmessagewithprivkey(const JSONRPCRequest& request) UniValue setmocktime(const JSONRPCRequest& request) { if (request.fHelp || request.params.size() != 1) - throw runtime_error( + throw std::runtime_error( "setmocktime timestamp\n" "\nSet the local time to given timestamp (-regtest only)\n" "\nArguments:\n" @@ -429,24 +457,18 @@ UniValue setmocktime(const JSONRPCRequest& request) ); if (!Params().MineBlocksOnDemand()) - throw runtime_error("setmocktime for regression testing (-regtest mode) only"); + throw std::runtime_error("setmocktime for regression testing (-regtest mode) only"); - // cs_vNodes is locked and node send/receive times are updated - // atomically with the time change to prevent peers from being - // disconnected because we think we haven't communicated with them - // in a long time. + // For now, don't change mocktime if we're in the middle of validation, as + // this could have an effect on mempool time-based eviction, as well as + // IsCurrentForFeeEstimation() and IsInitialBlockDownload(). + // TODO: figure out the right way to synchronize around mocktime, and + // ensure all call sites of GetTime() are accessing this safely. LOCK(cs_main); RPCTypeCheck(request.params, boost::assign::list_of(UniValue::VNUM)); SetMockTime(request.params[0].get_int64()); - uint64_t t = GetTime(); - if(g_connman) { - g_connman->ForEachNode([t](CNode* pnode) { - pnode->nLastSend = pnode->nLastRecv = t; - }); - } - return NullUniValue; } @@ -469,7 +491,7 @@ UniValue getmemoryinfo(const JSONRPCRequest& request) * as users will undoubtedly confuse it with the other "memory pool" */ if (request.fHelp || request.params.size() != 0) - throw runtime_error( + throw std::runtime_error( "getmemoryinfo\n" "Returns an object containing information about memory usage.\n" "\nResult:\n" @@ -492,18 +514,33 @@ UniValue getmemoryinfo(const JSONRPCRequest& request) return obj; } +UniValue echo(const JSONRPCRequest& request) +{ + if (request.fHelp) + throw std::runtime_error( + "echo|echojson \"message\" ...\n" + "\nSimply echo back the input arguments. This command is for testing.\n" + "\nThe difference between echo and echojson is that echojson has argument conversion enabled in the client-side table in" + "bitcoin-cli and the GUI. There is no server-side difference." + ); + + return request.params; +} + static const CRPCCommand commands[] = { // category name actor (function) okSafeMode // --------------------- ------------------------ ----------------------- ---------- - { "control", "getinfo", &getinfo, true }, /* uses wallet if enabled */ - { "control", "getmemoryinfo", &getmemoryinfo, true }, - { "util", "validateaddress", &validateaddress, true }, /* uses wallet if enabled */ - { "util", "createmultisig", &createmultisig, true }, - { "util", "verifymessage", &verifymessage, true }, - { "util", "signmessagewithprivkey", &signmessagewithprivkey, true }, + { "control", "getinfo", &getinfo, true, {} }, /* uses wallet if enabled */ + { "control", "getmemoryinfo", &getmemoryinfo, true, {} }, + { "util", "validateaddress", &validateaddress, true, {"address"} }, /* uses wallet if enabled */ + { "util", "createmultisig", &createmultisig, true, {"nrequired","keys"} }, + { "util", "verifymessage", &verifymessage, true, {"address","signature","message"} }, + { "util", "signmessagewithprivkey", &signmessagewithprivkey, true, {"privkey","message"} }, /* Not shown in help */ - { "hidden", "setmocktime", &setmocktime, true }, + { "hidden", "setmocktime", &setmocktime, true, {"timestamp"}}, + { "hidden", "echo", &echo, true, {"arg0","arg1","arg2","arg3","arg4","arg5","arg6","arg7","arg8","arg9"}}, + { "hidden", "echojson", &echo, true, {"arg0","arg1","arg2","arg3","arg4","arg5","arg6","arg7","arg8","arg9"}}, }; void RegisterMiscRPCCommands(CRPCTable &t) diff --git a/src/rpc/net.cpp b/src/rpc/net.cpp index 2af00c1de9..44c6e6d308 100644 --- a/src/rpc/net.cpp +++ b/src/rpc/net.cpp @@ -10,6 +10,7 @@ #include "net.h" #include "net_processing.h" #include "netbase.h" +#include "policy/policy.h" #include "protocol.h" #include "sync.h" #include "timedata.h" @@ -22,12 +23,10 @@ #include <univalue.h> -using namespace std; - UniValue getconnectioncount(const JSONRPCRequest& request) { if (request.fHelp || request.params.size() != 0) - throw runtime_error( + throw std::runtime_error( "getconnectioncount\n" "\nReturns the number of connections to other nodes.\n" "\nResult:\n" @@ -46,7 +45,7 @@ UniValue getconnectioncount(const JSONRPCRequest& request) UniValue ping(const JSONRPCRequest& request) { if (request.fHelp || request.params.size() != 0) - throw runtime_error( + throw std::runtime_error( "ping\n" "\nRequests that a ping be sent to all other nodes, to measure ping time.\n" "Results provided in getpeerinfo, pingtime and pingwait fields are decimal seconds.\n" @@ -69,7 +68,7 @@ UniValue ping(const JSONRPCRequest& request) UniValue getpeerinfo(const JSONRPCRequest& request) { if (request.fHelp || request.params.size() != 0) - throw runtime_error( + throw std::runtime_error( "getpeerinfo\n" "\nReturns data about each connected network node as a json array of objects.\n" "\nResult:\n" @@ -100,13 +99,14 @@ UniValue getpeerinfo(const JSONRPCRequest& request) " \"inflight\": [\n" " n, (numeric) The heights of blocks we're currently asking from this peer\n" " ...\n" - " ]\n" + " ],\n" + " \"whitelisted\": true|false, (boolean) Whether the peer is whitelisted\n" " \"bytessent_per_msg\": {\n" - " \"addr\": n, (numeric) The total bytes sent aggregated by message type\n" + " \"addr\": n, (numeric) The total bytes sent aggregated by message type\n" " ...\n" - " }\n" + " },\n" " \"bytesrecv_per_msg\": {\n" - " \"addr\": n, (numeric) The total bytes received aggregated by message type\n" + " \"addr\": n, (numeric) The total bytes received aggregated by message type\n" " ...\n" " }\n" " }\n" @@ -120,7 +120,7 @@ UniValue getpeerinfo(const JSONRPCRequest& request) if(!g_connman) throw JSONRPCError(RPC_CLIENT_P2P_DISABLED, "Error: Peer-to-peer functionality missing or disabled"); - vector<CNodeStats> vstats; + std::vector<CNodeStats> vstats; g_connman->GetNodeStats(vstats); UniValue ret(UniValue::VARR); @@ -149,7 +149,7 @@ UniValue getpeerinfo(const JSONRPCRequest& request) obj.push_back(Pair("pingwait", stats.dPingWait)); obj.push_back(Pair("version", stats.nVersion)); // Use the sanitized form of subver here, to avoid tricksy remote peers from - // corrupting or modifiying the JSON output by putting special characters in + // corrupting or modifying the JSON output by putting special characters in // their ver message. obj.push_back(Pair("subver", stats.cleanSubVer)); obj.push_back(Pair("inbound", stats.fInbound)); @@ -189,12 +189,12 @@ UniValue getpeerinfo(const JSONRPCRequest& request) UniValue addnode(const JSONRPCRequest& request) { - string strCommand; + std::string strCommand; if (request.params.size() == 2) strCommand = request.params[1].get_str(); if (request.fHelp || request.params.size() != 2 || (strCommand != "onetry" && strCommand != "add" && strCommand != "remove")) - throw runtime_error( + throw std::runtime_error( "addnode \"node\" \"add|remove|onetry\"\n" "\nAttempts add or remove a node from the addnode list.\n" "Or try a connection to a node once.\n" @@ -209,7 +209,7 @@ UniValue addnode(const JSONRPCRequest& request) if(!g_connman) throw JSONRPCError(RPC_CLIENT_P2P_DISABLED, "Error: Peer-to-peer functionality missing or disabled"); - string strNode = request.params[0].get_str(); + std::string strNode = request.params[0].get_str(); if (strCommand == "onetry") { @@ -235,7 +235,7 @@ UniValue addnode(const JSONRPCRequest& request) UniValue disconnectnode(const JSONRPCRequest& request) { if (request.fHelp || request.params.size() != 1) - throw runtime_error( + throw std::runtime_error( "disconnectnode \"node\" \n" "\nImmediately disconnects from the specified node.\n" "\nArguments:\n" @@ -258,7 +258,7 @@ UniValue disconnectnode(const JSONRPCRequest& request) UniValue getaddednodeinfo(const JSONRPCRequest& request) { if (request.fHelp || request.params.size() > 1) - throw runtime_error( + throw std::runtime_error( "getaddednodeinfo ( \"node\" )\n" "\nReturns information about the given added node, or all added nodes\n" "(note that onetry addnodes are not listed here)\n" @@ -326,7 +326,7 @@ UniValue getaddednodeinfo(const JSONRPCRequest& request) UniValue getnettotals(const JSONRPCRequest& request) { if (request.fHelp || request.params.size() > 0) - throw runtime_error( + throw std::runtime_error( "getnettotals\n" "\nReturns information about network traffic, including bytes in, bytes out,\n" "and current time.\n" @@ -382,7 +382,7 @@ static UniValue GetNetworksInfo() obj.push_back(Pair("name", GetNetworkName(network))); obj.push_back(Pair("limited", IsLimited(network))); obj.push_back(Pair("reachable", IsReachable(network))); - obj.push_back(Pair("proxy", proxy.IsValid() ? proxy.proxy.ToStringIPPort() : string())); + obj.push_back(Pair("proxy", proxy.IsValid() ? proxy.proxy.ToStringIPPort() : std::string())); obj.push_back(Pair("proxy_randomize_credentials", proxy.randomize_credentials)); networks.push_back(obj); } @@ -392,7 +392,7 @@ static UniValue GetNetworksInfo() UniValue getnetworkinfo(const JSONRPCRequest& request) { if (request.fHelp || request.params.size() != 0) - throw runtime_error( + throw std::runtime_error( "getnetworkinfo\n" "Returns an object containing various state info regarding P2P networking.\n" "\nResult:\n" @@ -411,10 +411,12 @@ UniValue getnetworkinfo(const JSONRPCRequest& request) " \"limited\": true|false, (boolean) is the network limited using -onlynet?\n" " \"reachable\": true|false, (boolean) is the network reachable?\n" " \"proxy\": \"host:port\" (string) the proxy that is used for this network, or empty if none\n" + " \"proxy_randomize_credentials\": true|false, (string) Whether randomized credentials are used\n" " }\n" " ,...\n" " ],\n" - " \"relayfee\": x.xxxxxxxx, (numeric) minimum relay fee for non-free transactions in " + CURRENCY_UNIT + "/kB\n" + " \"relayfee\": x.xxxxxxxx, (numeric) minimum relay fee for transactions in " + CURRENCY_UNIT + "/kB\n" + " \"incrementalfee\": x.xxxxxxxx, (numeric) minimum fee increment for mempool limiting or BIP 125 replacement in " + CURRENCY_UNIT + "/kB\n" " \"localaddresses\": [ (array) list of local addresses\n" " {\n" " \"address\": \"xxxx\", (string) network address\n" @@ -423,7 +425,7 @@ UniValue getnetworkinfo(const JSONRPCRequest& request) " }\n" " ,...\n" " ]\n" - " \"warnings\": \"...\" (string) any network warnings (such as alert messages) \n" + " \"warnings\": \"...\" (string) any network warnings\n" "}\n" "\nExamples:\n" + HelpExampleCli("getnetworkinfo", "") @@ -445,6 +447,7 @@ UniValue getnetworkinfo(const JSONRPCRequest& request) } obj.push_back(Pair("networks", GetNetworksInfo())); obj.push_back(Pair("relayfee", ValueFromAmount(::minRelayTxFee.GetFeePerK()))); + obj.push_back(Pair("incrementalfee", ValueFromAmount(::incrementalRelayFee.GetFeePerK()))); UniValue localAddresses(UniValue::VARR); { LOCK(cs_mapLocalHost); @@ -464,16 +467,16 @@ UniValue getnetworkinfo(const JSONRPCRequest& request) UniValue setban(const JSONRPCRequest& request) { - string strCommand; + std::string strCommand; if (request.params.size() >= 2) strCommand = request.params[1].get_str(); if (request.fHelp || request.params.size() < 2 || (strCommand != "add" && strCommand != "remove")) - throw runtime_error( - "setban \"ip(/netmask)\" \"add|remove\" (bantime) (absolute)\n" + throw std::runtime_error( + "setban \"subnet\" \"add|remove\" (bantime) (absolute)\n" "\nAttempts add or remove a IP/Subnet from the banned list.\n" "\nArguments:\n" - "1. \"ip(/netmask)\" (string, required) The IP/Subnet (see getpeerinfo for nodes ip) with a optional netmask (default is /32 = single ip)\n" + "1. \"subnet\" (string, required) The IP/Subnet (see getpeerinfo for nodes ip) with a optional netmask (default is /32 = single ip)\n" "2. \"command\" (string, required) 'add' to add a IP/Subnet to the list, 'remove' to remove a IP/Subnet from the list\n" "3. \"bantime\" (numeric, optional) time in seconds how long (or until when if [absolute] is set) the ip is banned (0 or empty means using the default time of 24h which can also be overwritten by the -bantime startup argument)\n" "4. \"absolute\" (boolean, optional) If set, the bantime must be a absolute timestamp in seconds since epoch (Jan 1 1970 GMT)\n" @@ -489,7 +492,7 @@ UniValue setban(const JSONRPCRequest& request) CNetAddr netAddr; bool isSubnet = false; - if (request.params[0].get_str().find("/") != string::npos) + if (request.params[0].get_str().find("/") != std::string::npos) isSubnet = true; if (!isSubnet) { @@ -501,7 +504,7 @@ UniValue setban(const JSONRPCRequest& request) LookupSubNet(request.params[0].get_str().c_str(), subNet); if (! (isSubnet ? subNet.IsValid() : netAddr.IsValid()) ) - throw JSONRPCError(RPC_CLIENT_NODE_ALREADY_ADDED, "Error: Invalid IP/Subnet"); + throw JSONRPCError(RPC_CLIENT_INVALID_IP_OR_SUBNET, "Error: Invalid IP/Subnet"); if (strCommand == "add") { @@ -521,7 +524,7 @@ UniValue setban(const JSONRPCRequest& request) else if(strCommand == "remove") { if (!( isSubnet ? g_connman->Unban(subNet) : g_connman->Unban(netAddr) )) - throw JSONRPCError(RPC_MISC_ERROR, "Error: Unban failed"); + throw JSONRPCError(RPC_CLIENT_INVALID_IP_OR_SUBNET, "Error: Unban failed. Requested address/subnet was not previously banned."); } return NullUniValue; } @@ -529,7 +532,7 @@ UniValue setban(const JSONRPCRequest& request) UniValue listbanned(const JSONRPCRequest& request) { if (request.fHelp || request.params.size() != 0) - throw runtime_error( + throw std::runtime_error( "listbanned\n" "\nList all banned IPs/Subnets.\n" "\nExamples:\n" @@ -562,7 +565,7 @@ UniValue listbanned(const JSONRPCRequest& request) UniValue clearbanned(const JSONRPCRequest& request) { if (request.fHelp || request.params.size() != 0) - throw runtime_error( + throw std::runtime_error( "clearbanned\n" "\nClear all banned IPs.\n" "\nExamples:\n" @@ -580,9 +583,11 @@ UniValue clearbanned(const JSONRPCRequest& request) UniValue setnetworkactive(const JSONRPCRequest& request) { if (request.fHelp || request.params.size() != 1) { - throw runtime_error( + throw std::runtime_error( "setnetworkactive true|false\n" - "Disable/enable all p2p network activity." + "\nDisable/enable all p2p network activity.\n" + "\nArguments:\n" + "1. \"state\" (boolean, required) true to enable networking, false to disable\n" ); } @@ -598,18 +603,18 @@ UniValue setnetworkactive(const JSONRPCRequest& request) static const CRPCCommand commands[] = { // category name actor (function) okSafeMode // --------------------- ------------------------ ----------------------- ---------- - { "network", "getconnectioncount", &getconnectioncount, true }, - { "network", "ping", &ping, true }, - { "network", "getpeerinfo", &getpeerinfo, true }, - { "network", "addnode", &addnode, true }, - { "network", "disconnectnode", &disconnectnode, true }, - { "network", "getaddednodeinfo", &getaddednodeinfo, true }, - { "network", "getnettotals", &getnettotals, true }, - { "network", "getnetworkinfo", &getnetworkinfo, true }, - { "network", "setban", &setban, true }, - { "network", "listbanned", &listbanned, true }, - { "network", "clearbanned", &clearbanned, true }, - { "network", "setnetworkactive", &setnetworkactive, true, }, + { "network", "getconnectioncount", &getconnectioncount, true, {} }, + { "network", "ping", &ping, true, {} }, + { "network", "getpeerinfo", &getpeerinfo, true, {} }, + { "network", "addnode", &addnode, true, {"node","command"} }, + { "network", "disconnectnode", &disconnectnode, true, {"node"} }, + { "network", "getaddednodeinfo", &getaddednodeinfo, true, {"node"} }, + { "network", "getnettotals", &getnettotals, true, {} }, + { "network", "getnetworkinfo", &getnetworkinfo, true, {} }, + { "network", "setban", &setban, true, {"subnet", "command", "bantime", "absolute"} }, + { "network", "listbanned", &listbanned, true, {} }, + { "network", "clearbanned", &clearbanned, true, {} }, + { "network", "setnetworkactive", &setnetworkactive, true, {"state"} }, }; void RegisterNetRPCCommands(CRPCTable &t) diff --git a/src/rpc/protocol.cpp b/src/rpc/protocol.cpp index dc710d939f..2be1edb5a6 100644 --- a/src/rpc/protocol.cpp +++ b/src/rpc/protocol.cpp @@ -15,8 +15,6 @@ #include <stdint.h> #include <fstream> -using namespace std; - /** * JSON-RPC protocol. Bitcoin speaks version 1.0 for maximum compatibility, * but uses JSON-RPC 1.1/2.0 standards for parts of the 1.0 standard that were @@ -26,7 +24,7 @@ using namespace std; * 1.2 spec: http://jsonrpc.org/historical/json-rpc-over-http.html */ -UniValue JSONRPCRequestObj(const string& strMethod, const UniValue& params, const UniValue& id) +UniValue JSONRPCRequestObj(const std::string& strMethod, const UniValue& params, const UniValue& id) { UniValue request(UniValue::VOBJ); request.push_back(Pair("method", strMethod)); @@ -47,13 +45,13 @@ UniValue JSONRPCReplyObj(const UniValue& result, const UniValue& error, const Un return reply; } -string JSONRPCReply(const UniValue& result, const UniValue& error, const UniValue& id) +std::string JSONRPCReply(const UniValue& result, const UniValue& error, const UniValue& id) { UniValue reply = JSONRPCReplyObj(result, error, id); return reply.write() + "\n"; } -UniValue JSONRPCError(int code, const string& message) +UniValue JSONRPCError(int code, const std::string& message) { UniValue error(UniValue::VOBJ); error.push_back(Pair("code", code)); diff --git a/src/rpc/protocol.h b/src/rpc/protocol.h index 47e56e712b..85bc4db101 100644 --- a/src/rpc/protocol.h +++ b/src/rpc/protocol.h @@ -31,9 +31,15 @@ enum HTTPStatusCode enum RPCErrorCode { //! Standard JSON-RPC 2.0 errors + // RPC_INVALID_REQUEST is internally mapped to HTTP_BAD_REQUEST (400). + // It should not be used for application-layer errors. RPC_INVALID_REQUEST = -32600, + // RPC_METHOD_NOT_FOUND is internally mapped to HTTP_NOT_FOUND (404). + // It should not be used for application-layer errors. RPC_METHOD_NOT_FOUND = -32601, RPC_INVALID_PARAMS = -32602, + // RPC_INTERNAL_ERROR should only be used for genuine errors in bitcoind + // (for example datadir corruption). RPC_INTERNAL_ERROR = -32603, RPC_PARSE_ERROR = -32700, diff --git a/src/rpc/rawtransaction.cpp b/src/rpc/rawtransaction.cpp index 276ebfda26..c438d90a47 100644 --- a/src/rpc/rawtransaction.cpp +++ b/src/rpc/rawtransaction.cpp @@ -24,6 +24,7 @@ #include "uint256.h" #include "utilstrencodings.h" #ifdef ENABLE_WALLET +#include "wallet/rpcwallet.h" #include "wallet/wallet.h" #endif @@ -33,12 +34,10 @@ #include <univalue.h> -using namespace std; - void ScriptPubKeyToJSON(const CScript& scriptPubKey, UniValue& out, bool fIncludeHex) { txnouttype type; - vector<CTxDestination> addresses; + std::vector<CTxDestination> addresses; int nRequired; out.push_back(Pair("asm", ScriptToAsmStr(scriptPubKey))); @@ -126,11 +125,13 @@ void TxToJSON(const CTransaction& tx, const uint256 hashBlock, UniValue& entry) UniValue getrawtransaction(const JSONRPCRequest& request) { if (request.fHelp || request.params.size() < 1 || request.params.size() > 2) - throw runtime_error( + throw std::runtime_error( "getrawtransaction \"txid\" ( verbose )\n" - "\nNOTE: By default this function only works sometimes. This is when the tx is in the mempool\n" - "or there is an unspent output in the utxo for this transaction. To make it always work,\n" - "you need to maintain a transaction index, using the -txindex command line option.\n" + + "\nNOTE: By default this function only works for mempool transactions. If the -txindex option is\n" + "enabled, it also works for blockchain transactions.\n" + "DEPRECATED: for now, it also works for transactions with unspent outputs.\n" + "\nReturn the raw transaction data.\n" "\nIf verbose is 'true', returns an Object with information about 'txid'.\n" "If verbose is 'false' or omitted, returns a string that is serialized, hex-encoded data for 'txid'.\n" @@ -174,7 +175,7 @@ UniValue getrawtransaction(const JSONRPCRequest& request) " \"reqSigs\" : n, (numeric) The required sigs\n" " \"type\" : \"pubkeyhash\", (string) The type, eg 'pubkeyhash'\n" " \"addresses\" : [ (json array of string)\n" - " \"bitcoinaddress\" (string) bitcoin address\n" + " \"address\" (string) bitcoin address\n" " ,...\n" " ]\n" " }\n" @@ -212,15 +213,17 @@ UniValue getrawtransaction(const JSONRPCRequest& request) } else { throw JSONRPCError(RPC_TYPE_ERROR, "Invalid type provided. Verbose parameter must be a boolean."); - } + } } CTransactionRef tx; uint256 hashBlock; if (!GetTransaction(hash, tx, Params().GetConsensus(), hashBlock, true)) - throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "No information available about transaction"); + throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, std::string(fTxIndex ? "No such mempool or blockchain transaction" + : "No such mempool transaction. Use -txindex to enable blockchain transaction queries") + + ". Use gettransaction for wallet transactions."); - string strHex = EncodeHexTx(*tx, RPCSerializationFlags()); + std::string strHex = EncodeHexTx(*tx, RPCSerializationFlags()); if (!fVerbose) return strHex; @@ -234,35 +237,34 @@ UniValue getrawtransaction(const JSONRPCRequest& request) UniValue gettxoutproof(const JSONRPCRequest& request) { if (request.fHelp || (request.params.size() != 1 && request.params.size() != 2)) - throw runtime_error( + throw std::runtime_error( "gettxoutproof [\"txid\",...] ( blockhash )\n" "\nReturns a hex-encoded proof that \"txid\" was included in a block.\n" "\nNOTE: By default this function only works sometimes. This is when there is an\n" "unspent output in the utxo for this transaction. To make it always work,\n" "you need to maintain a transaction index, using the -txindex command line option or\n" "specify the block in which the transaction is included manually (by blockhash).\n" - "\nReturn the raw transaction data.\n" "\nArguments:\n" "1. \"txids\" (string) A json array of txids to filter\n" " [\n" " \"txid\" (string) A transaction hash\n" " ,...\n" " ]\n" - "2. \"block hash\" (string, optional) If specified, looks for txid in the block with this hash\n" + "2. \"blockhash\" (string, optional) If specified, looks for txid in the block with this hash\n" "\nResult:\n" "\"data\" (string) A string that is a serialized, hex-encoded data for the proof.\n" ); - set<uint256> setTxids; + std::set<uint256> setTxids; uint256 oneTxid; UniValue txids = request.params[0].get_array(); for (unsigned int idx = 0; idx < txids.size(); idx++) { const UniValue& txid = txids[idx]; if (txid.get_str().length() != 64 || !IsHex(txid.get_str())) - throw JSONRPCError(RPC_INVALID_PARAMETER, string("Invalid txid ")+txid.get_str()); + throw JSONRPCError(RPC_INVALID_PARAMETER, std::string("Invalid txid ")+txid.get_str()); uint256 hash(uint256S(txid.get_str())); if (setTxids.count(hash)) - throw JSONRPCError(RPC_INVALID_PARAMETER, string("Invalid parameter, duplicated txid: ")+txid.get_str()); + throw JSONRPCError(RPC_INVALID_PARAMETER, std::string("Invalid parameter, duplicated txid: ")+txid.get_str()); setTxids.insert(hash); oneTxid = hash; } @@ -315,7 +317,7 @@ UniValue gettxoutproof(const JSONRPCRequest& request) UniValue verifytxoutproof(const JSONRPCRequest& request) { if (request.fHelp || request.params.size() != 1) - throw runtime_error( + throw std::runtime_error( "verifytxoutproof \"proof\"\n" "\nVerifies that a proof points to a transaction in a block, returning the transaction it commits to\n" "and throwing an RPC error if the block is not in our best chain\n" @@ -331,8 +333,8 @@ UniValue verifytxoutproof(const JSONRPCRequest& request) UniValue res(UniValue::VARR); - vector<uint256> vMatch; - vector<unsigned int> vIndex; + std::vector<uint256> vMatch; + std::vector<unsigned int> vIndex; if (merkleBlock.txn.ExtractMatches(vMatch, vIndex) != merkleBlock.header.hashMerkleRoot) return res; @@ -349,7 +351,7 @@ UniValue verifytxoutproof(const JSONRPCRequest& request) UniValue createrawtransaction(const JSONRPCRequest& request) { if (request.fHelp || request.params.size() < 2 || request.params.size() > 3) - throw runtime_error( + throw std::runtime_error( "createrawtransaction [{\"txid\":\"id\",\"vout\":n},...] {\"address\":amount,\"data\":\"hex\",...} ( locktime )\n" "\nCreate a transaction spending the given inputs and creating new outputs.\n" "Outputs can be addresses or data.\n" @@ -358,24 +360,24 @@ UniValue createrawtransaction(const JSONRPCRequest& request) "it is not stored in the wallet or transmitted to the network.\n" "\nArguments:\n" - "1. \"transactions\" (string, required) A json array of json objects\n" + "1. \"inputs\" (string, required) A json array of json objects\n" " [\n" " {\n" " \"txid\":\"id\", (string, required) The transaction id\n" - " \"vout\":n (numeric, required) The output number\n" - " \"sequence\":n (numeric, optional) The sequence number\n" - " }\n" + " \"vout\":n, (numeric, required) The output number\n" + " \"sequence\":n (numeric, optional) The sequence number\n" + " } \n" " ,...\n" " ]\n" - "2. \"outputs\" (string, required) a json object with outputs\n" + "2. \"outputs\" (string, required) a json object with outputs\n" " {\n" - " \"address\": x.xxx (numeric or string, required) The key is the bitcoin address, the numeric value (can be string) is the " + CURRENCY_UNIT + " amount\n" - " \"data\": \"hex\", (string, required) The key is \"data\", the value is hex encoded data\n" - " ...\n" + " \"address\": x.xxx, (numeric or string, required) The key is the bitcoin address, the numeric value (can be string) is the " + CURRENCY_UNIT + " amount\n" + " \"data\": \"hex\" (string, required) The key is \"data\", the value is hex encoded data\n" + " ,...\n" " }\n" - "3. locktime (numeric, optional, default=0) Raw locktime. Non-0 value also locktime-activates inputs\n" + "3. locktime (numeric, optional, default=0) Raw locktime. Non-0 value also locktime-activates inputs\n" "\nResult:\n" - "\"transaction\" (string) hex string of the transaction\n" + "\"transaction\" (string) hex string of the transaction\n" "\nExamples:\n" + HelpExampleCli("createrawtransaction", "\"[{\\\"txid\\\":\\\"myid\\\",\\\"vout\\\":0}]\" \"{\\\"address\\\":0.01}\"") @@ -430,9 +432,9 @@ UniValue createrawtransaction(const JSONRPCRequest& request) rawTx.vin.push_back(in); } - set<CBitcoinAddress> setAddress; - vector<string> addrList = sendTo.getKeys(); - BOOST_FOREACH(const string& name_, addrList) { + std::set<CBitcoinAddress> setAddress; + std::vector<std::string> addrList = sendTo.getKeys(); + BOOST_FOREACH(const std::string& name_, addrList) { if (name_ == "data") { std::vector<unsigned char> data = ParseHexV(sendTo[name_].getValStr(),"Data"); @@ -442,10 +444,10 @@ UniValue createrawtransaction(const JSONRPCRequest& request) } else { CBitcoinAddress address(name_); if (!address.IsValid()) - throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, string("Invalid Bitcoin address: ")+name_); + throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, std::string("Invalid Bitcoin address: ")+name_); if (setAddress.count(address)) - throw JSONRPCError(RPC_INVALID_PARAMETER, string("Invalid parameter, duplicated address: ")+name_); + throw JSONRPCError(RPC_INVALID_PARAMETER, std::string("Invalid parameter, duplicated address: ")+name_); setAddress.insert(address); CScript scriptPubKey = GetScriptForDestination(address.Get()); @@ -462,12 +464,12 @@ UniValue createrawtransaction(const JSONRPCRequest& request) UniValue decoderawtransaction(const JSONRPCRequest& request) { if (request.fHelp || request.params.size() != 1) - throw runtime_error( + throw std::runtime_error( "decoderawtransaction \"hexstring\"\n" "\nReturn a JSON object representing the serialized, hex-encoded transaction.\n" "\nArguments:\n" - "1. \"hex\" (string, required) The transaction hex string\n" + "1. \"hexstring\" (string, required) The transaction hex string\n" "\nResult:\n" "{\n" @@ -531,11 +533,11 @@ UniValue decoderawtransaction(const JSONRPCRequest& request) UniValue decodescript(const JSONRPCRequest& request) { if (request.fHelp || request.params.size() != 1) - throw runtime_error( - "decodescript \"hex\"\n" + throw std::runtime_error( + "decodescript \"hexstring\"\n" "\nDecode a hex-encoded script.\n" "\nArguments:\n" - "1. \"hex\" (string) the hex encoded script\n" + "1. \"hexstring\" (string) the hex encoded script\n" "\nResult:\n" "{\n" " \"asm\":\"asm\", (string) Script public key\n" @@ -558,7 +560,7 @@ UniValue decodescript(const JSONRPCRequest& request) UniValue r(UniValue::VOBJ); CScript script; if (request.params[0].get_str().size() > 0){ - vector<unsigned char> scriptData(ParseHexV(request.params[0], "argument")); + std::vector<unsigned char> scriptData(ParseHexV(request.params[0], "argument")); script = CScript(scriptData.begin(), scriptData.end()); } else { // Empty scripts are valid @@ -591,8 +593,12 @@ static void TxInErrorToJSON(const CTxIn& txin, UniValue& vErrorsRet, const std:: UniValue signrawtransaction(const JSONRPCRequest& request) { +#ifdef ENABLE_WALLET + CWallet * const pwallet = GetWalletForJSONRPCRequest(request); +#endif + if (request.fHelp || request.params.size() < 1 || request.params.size() > 4) - throw runtime_error( + throw std::runtime_error( "signrawtransaction \"hexstring\" ( [{\"txid\":\"id\",\"vout\":n,\"scriptPubKey\":\"hex\",\"redeemScript\":\"hex\"},...] [\"privatekey1\",...] sighashtype )\n" "\nSign inputs for raw transaction (serialized, hex-encoded).\n" "The second optional argument (may be null) is an array of previous transaction outputs that\n" @@ -600,7 +606,7 @@ UniValue signrawtransaction(const JSONRPCRequest& request) "The third optional argument (may be null) is an array of base58-encoded private\n" "keys that, if given, will be the only keys used to sign the transaction.\n" #ifdef ENABLE_WALLET - + HelpRequiringPassphrase() + "\n" + + HelpRequiringPassphrase(pwallet) + "\n" #endif "\nArguments:\n" @@ -616,7 +622,7 @@ UniValue signrawtransaction(const JSONRPCRequest& request) " }\n" " ,...\n" " ]\n" - "3. \"privatekeys\" (string, optional) A json array of base58-encoded private keys for signing\n" + "3. \"privkeys\" (string, optional) A json array of base58-encoded private keys for signing\n" " [ (json array of strings, or 'null' if none provided)\n" " \"privatekey\" (string) private key in base58-encoding\n" " ,...\n" @@ -651,15 +657,15 @@ UniValue signrawtransaction(const JSONRPCRequest& request) ); #ifdef ENABLE_WALLET - LOCK2(cs_main, pwalletMain ? &pwalletMain->cs_wallet : NULL); + LOCK2(cs_main, pwallet ? &pwallet->cs_wallet : NULL); #else LOCK(cs_main); #endif RPCTypeCheck(request.params, boost::assign::list_of(UniValue::VSTR)(UniValue::VARR)(UniValue::VARR)(UniValue::VSTR), true); - vector<unsigned char> txData(ParseHexV(request.params[0], "argument 1")); + std::vector<unsigned char> txData(ParseHexV(request.params[0], "argument 1")); CDataStream ssData(txData, SER_NETWORK, PROTOCOL_VERSION); - vector<CMutableTransaction> txVariants; + std::vector<CMutableTransaction> txVariants; while (!ssData.empty()) { try { CMutableTransaction tx; @@ -714,8 +720,9 @@ UniValue signrawtransaction(const JSONRPCRequest& request) } } #ifdef ENABLE_WALLET - else if (pwalletMain) - EnsureWalletIsUnlocked(); + else if (pwallet) { + EnsureWalletIsUnlocked(pwallet); + } #endif // Add previous txouts given in the RPC call: @@ -741,13 +748,13 @@ UniValue signrawtransaction(const JSONRPCRequest& request) if (nOut < 0) throw JSONRPCError(RPC_DESERIALIZATION_ERROR, "vout must be positive"); - vector<unsigned char> pkData(ParseHexO(prevOut, "scriptPubKey")); + std::vector<unsigned char> pkData(ParseHexO(prevOut, "scriptPubKey")); CScript scriptPubKey(pkData.begin(), pkData.end()); { CCoinsModifier coins = view.ModifyCoins(txid); if (coins->IsAvailable(nOut) && coins->vout[nOut].scriptPubKey != scriptPubKey) { - string err("Previous output scriptPubKey mismatch:\n"); + std::string err("Previous output scriptPubKey mismatch:\n"); err = err + ScriptToAsmStr(coins->vout[nOut].scriptPubKey) + "\nvs:\n"+ ScriptToAsmStr(scriptPubKey); throw JSONRPCError(RPC_DESERIALIZATION_ERROR, err); @@ -773,7 +780,7 @@ UniValue signrawtransaction(const JSONRPCRequest& request) }); UniValue v = find_value(prevOut, "redeemScript"); if (!v.isNull()) { - vector<unsigned char> rsData(ParseHexV(v, "redeemScript")); + std::vector<unsigned char> rsData(ParseHexV(v, "redeemScript")); CScript redeemScript(rsData.begin(), rsData.end()); tempKeystore.AddCScript(redeemScript); } @@ -782,23 +789,23 @@ UniValue signrawtransaction(const JSONRPCRequest& request) } #ifdef ENABLE_WALLET - const CKeyStore& keystore = ((fGivenKeys || !pwalletMain) ? tempKeystore : *pwalletMain); + const CKeyStore& keystore = ((fGivenKeys || !pwallet) ? tempKeystore : *pwallet); #else const CKeyStore& keystore = tempKeystore; #endif int nHashType = SIGHASH_ALL; if (request.params.size() > 3 && !request.params[3].isNull()) { - static map<string, int> mapSigHashValues = + static std::map<std::string, int> mapSigHashValues = boost::assign::map_list_of - (string("ALL"), int(SIGHASH_ALL)) - (string("ALL|ANYONECANPAY"), int(SIGHASH_ALL|SIGHASH_ANYONECANPAY)) - (string("NONE"), int(SIGHASH_NONE)) - (string("NONE|ANYONECANPAY"), int(SIGHASH_NONE|SIGHASH_ANYONECANPAY)) - (string("SINGLE"), int(SIGHASH_SINGLE)) - (string("SINGLE|ANYONECANPAY"), int(SIGHASH_SINGLE|SIGHASH_ANYONECANPAY)) + (std::string("ALL"), int(SIGHASH_ALL)) + (std::string("ALL|ANYONECANPAY"), int(SIGHASH_ALL|SIGHASH_ANYONECANPAY)) + (std::string("NONE"), int(SIGHASH_NONE)) + (std::string("NONE|ANYONECANPAY"), int(SIGHASH_NONE|SIGHASH_ANYONECANPAY)) + (std::string("SINGLE"), int(SIGHASH_SINGLE)) + (std::string("SINGLE|ANYONECANPAY"), int(SIGHASH_SINGLE|SIGHASH_ANYONECANPAY)) ; - string strHashType = request.params[3].get_str(); + std::string strHashType = request.params[3].get_str(); if (mapSigHashValues.count(strHashType)) nHashType = mapSigHashValues[strHashType]; else @@ -831,7 +838,9 @@ UniValue signrawtransaction(const JSONRPCRequest& request) // ... and merge in other signatures: BOOST_FOREACH(const CMutableTransaction& txv, txVariants) { - sigdata = CombineSignatures(prevPubKey, TransactionSignatureChecker(&txConst, i, amount), sigdata, DataFromTransaction(txv, i)); + if (txv.vin.size() > i) { + sigdata = CombineSignatures(prevPubKey, TransactionSignatureChecker(&txConst, i, amount), sigdata, DataFromTransaction(txv, i)); + } } UpdateTransaction(mergedTx, i, sigdata); @@ -856,7 +865,7 @@ UniValue signrawtransaction(const JSONRPCRequest& request) UniValue sendrawtransaction(const JSONRPCRequest& request) { if (request.fHelp || request.params.size() < 1 || request.params.size() > 2) - throw runtime_error( + throw std::runtime_error( "sendrawtransaction \"hexstring\" ( allowhighfees )\n" "\nSubmits raw transaction (serialized, hex-encoded) to local node and network.\n" "\nAlso see createrawtransaction and signrawtransaction calls.\n" @@ -886,7 +895,7 @@ UniValue sendrawtransaction(const JSONRPCRequest& request) CTransactionRef tx(MakeTransactionRef(std::move(mtx))); const uint256& hashTx = tx->GetHash(); - bool fLimitFree = false; + bool fLimitFree = true; CAmount nMaxRawTxFee = maxTxFee; if (request.params.size() > 1 && request.params[1].get_bool()) nMaxRawTxFee = 0; @@ -899,7 +908,7 @@ UniValue sendrawtransaction(const JSONRPCRequest& request) // push to local node and sync with wallets CValidationState state; bool fMissingInputs; - if (!AcceptToMemoryPool(mempool, state, std::move(tx), fLimitFree, &fMissingInputs, false, nMaxRawTxFee)) { + if (!AcceptToMemoryPool(mempool, state, std::move(tx), fLimitFree, &fMissingInputs, NULL, false, nMaxRawTxFee)) { if (state.IsInvalid()) { throw JSONRPCError(RPC_TRANSACTION_REJECTED, strprintf("%i: %s", state.GetRejectCode(), state.GetRejectReason())); } else { @@ -926,15 +935,15 @@ UniValue sendrawtransaction(const JSONRPCRequest& request) static const CRPCCommand commands[] = { // category name actor (function) okSafeMode // --------------------- ------------------------ ----------------------- ---------- - { "rawtransactions", "getrawtransaction", &getrawtransaction, true }, - { "rawtransactions", "createrawtransaction", &createrawtransaction, true }, - { "rawtransactions", "decoderawtransaction", &decoderawtransaction, true }, - { "rawtransactions", "decodescript", &decodescript, true }, - { "rawtransactions", "sendrawtransaction", &sendrawtransaction, false }, - { "rawtransactions", "signrawtransaction", &signrawtransaction, false }, /* uses wallet if enabled */ - - { "blockchain", "gettxoutproof", &gettxoutproof, true }, - { "blockchain", "verifytxoutproof", &verifytxoutproof, true }, + { "rawtransactions", "getrawtransaction", &getrawtransaction, true, {"txid","verbose"} }, + { "rawtransactions", "createrawtransaction", &createrawtransaction, true, {"transactions","outputs","locktime"} }, + { "rawtransactions", "decoderawtransaction", &decoderawtransaction, true, {"hexstring"} }, + { "rawtransactions", "decodescript", &decodescript, true, {"hexstring"} }, + { "rawtransactions", "sendrawtransaction", &sendrawtransaction, false, {"hexstring","allowhighfees"} }, + { "rawtransactions", "signrawtransaction", &signrawtransaction, false, {"hexstring","prevtxs","privkeys","sighashtype"} }, /* uses wallet if enabled */ + + { "blockchain", "gettxoutproof", &gettxoutproof, true, {"txids", "blockhash"} }, + { "blockchain", "verifytxoutproof", &verifytxoutproof, true, {"proof"} }, }; void RegisterRawTransactionRPCCommands(CRPCTable &t) diff --git a/src/rpc/server.cpp b/src/rpc/server.cpp index 8a223d8aa8..9b0699afcc 100644 --- a/src/rpc/server.cpp +++ b/src/rpc/server.cpp @@ -18,17 +18,13 @@ #include <boost/bind.hpp> #include <boost/filesystem.hpp> #include <boost/foreach.hpp> -#include <boost/iostreams/concepts.hpp> -#include <boost/iostreams/stream.hpp> #include <boost/shared_ptr.hpp> #include <boost/signals2/signal.hpp> #include <boost/thread.hpp> #include <boost/algorithm/string/case_conv.hpp> // for to_upper() #include <memory> // for unique_ptr - -using namespace RPCServer; -using namespace std; +#include <unordered_map> static bool fRPCRunning = false; static bool fRPCInWarmup = true; @@ -44,7 +40,6 @@ static struct CRPCSignals boost::signals2::signal<void ()> Started; boost::signals2::signal<void ()> Stopped; boost::signals2::signal<void (const CRPCCommand&)> PreCommand; - boost::signals2::signal<void (const CRPCCommand&)> PostCommand; } g_rpcSignals; void RPCServer::OnStarted(boost::function<void ()> slot) @@ -62,13 +57,8 @@ void RPCServer::OnPreCommand(boost::function<void (const CRPCCommand&)> slot) g_rpcSignals.PreCommand.connect(boost::bind(slot, _1)); } -void RPCServer::OnPostCommand(boost::function<void (const CRPCCommand&)> slot) -{ - g_rpcSignals.PostCommand.connect(boost::bind(slot, _1)); -} - void RPCTypeCheck(const UniValue& params, - const list<UniValue::VType>& typesExpected, + const std::list<UniValue::VType>& typesExpected, bool fAllowNull) { unsigned int i = 0; @@ -78,18 +68,22 @@ void RPCTypeCheck(const UniValue& params, break; const UniValue& v = params[i]; - if (!((v.type() == t) || (fAllowNull && (v.isNull())))) - { - string err = strprintf("Expected type %s, got %s", - uvTypeName(t), uvTypeName(v.type())); - throw JSONRPCError(RPC_TYPE_ERROR, err); + if (!(fAllowNull && v.isNull())) { + RPCTypeCheckArgument(v, t); } i++; } } +void RPCTypeCheckArgument(const UniValue& value, UniValue::VType typeExpected) +{ + if (value.type() != typeExpected) { + throw JSONRPCError(RPC_TYPE_ERROR, strprintf("Expected type %s, got %s", uvTypeName(typeExpected), uvTypeName(value.type()))); + } +} + void RPCTypeCheckObj(const UniValue& o, - const map<string, UniValueType>& typesExpected, + const std::map<std::string, UniValueType>& typesExpected, bool fAllowNull, bool fStrict) { @@ -99,7 +93,7 @@ void RPCTypeCheckObj(const UniValue& o, throw JSONRPCError(RPC_TYPE_ERROR, strprintf("Missing %s", t.first)); if (!(t.second.typeAny || v.type() == t.second.type || (fAllowNull && v.isNull()))) { - string err = strprintf("Expected type %s for %s, got %s", + std::string err = strprintf("Expected type %s for %s, got %s", uvTypeName(t.second.type), t.first, uvTypeName(v.type())); throw JSONRPCError(RPC_TYPE_ERROR, err); } @@ -107,11 +101,11 @@ void RPCTypeCheckObj(const UniValue& o, if (fStrict) { - BOOST_FOREACH(const string& k, o.getKeys()) + BOOST_FOREACH(const std::string& k, o.getKeys()) { if (typesExpected.count(k) == 0) { - string err = strprintf("Unexpected key %s", k); + std::string err = strprintf("Unexpected key %s", k); throw JSONRPCError(RPC_TYPE_ERROR, err); } } @@ -140,9 +134,9 @@ UniValue ValueFromAmount(const CAmount& amount) strprintf("%s%d.%08d", sign ? "-" : "", quotient, remainder)); } -uint256 ParseHashV(const UniValue& v, string strName) +uint256 ParseHashV(const UniValue& v, std::string strName) { - string strHex; + std::string strHex; if (v.isStr()) strHex = v.get_str(); if (!IsHex(strHex)) // Note: IsHex("") is false @@ -153,20 +147,20 @@ uint256 ParseHashV(const UniValue& v, string strName) result.SetHex(strHex); return result; } -uint256 ParseHashO(const UniValue& o, string strKey) +uint256 ParseHashO(const UniValue& o, std::string strKey) { return ParseHashV(find_value(o, strKey), strKey); } -vector<unsigned char> ParseHexV(const UniValue& v, string strName) +std::vector<unsigned char> ParseHexV(const UniValue& v, std::string strName) { - string strHex; + std::string strHex; if (v.isStr()) strHex = v.get_str(); if (!IsHex(strHex)) throw JSONRPCError(RPC_INVALID_PARAMETER, strName+" must be hexadecimal string (not '"+strHex+"')"); return ParseHex(strHex); } -vector<unsigned char> ParseHexO(const UniValue& o, string strKey) +std::vector<unsigned char> ParseHexO(const UniValue& o, std::string strKey) { return ParseHexV(find_value(o, strKey), strKey); } @@ -175,30 +169,30 @@ vector<unsigned char> ParseHexO(const UniValue& o, string strKey) * Note: This interface may still be subject to change. */ -std::string CRPCTable::help(const std::string& strCommand) const +std::string CRPCTable::help(const std::string& strCommand, const JSONRPCRequest& helpreq) const { - string strRet; - string category; - set<rpcfn_type> setDone; - vector<pair<string, const CRPCCommand*> > vCommands; + std::string strRet; + std::string category; + std::set<rpcfn_type> setDone; + std::vector<std::pair<std::string, const CRPCCommand*> > vCommands; - for (map<string, const CRPCCommand*>::const_iterator mi = mapCommands.begin(); mi != mapCommands.end(); ++mi) + for (std::map<std::string, const CRPCCommand*>::const_iterator mi = mapCommands.begin(); mi != mapCommands.end(); ++mi) vCommands.push_back(make_pair(mi->second->category + mi->first, mi->second)); sort(vCommands.begin(), vCommands.end()); - BOOST_FOREACH(const PAIRTYPE(string, const CRPCCommand*)& command, vCommands) + JSONRPCRequest jreq(helpreq); + jreq.fHelp = true; + jreq.params = UniValue(); + + BOOST_FOREACH(const PAIRTYPE(std::string, const CRPCCommand*)& command, vCommands) { const CRPCCommand *pcmd = command.second; - string strMethod = pcmd->name; - // We already filter duplicates, but these deprecated screw up the sort order - if (strMethod.find("label") != string::npos) - continue; + std::string strMethod = pcmd->name; if ((strCommand != "" || pcmd->category == "hidden") && strMethod != strCommand) continue; + jreq.strMethod = strMethod; try { - JSONRPCRequest jreq; - jreq.fHelp = true; rpcfn_type pfn = pcmd->actor; if (setDone.insert(pfn).second) (*pfn)(jreq); @@ -206,10 +200,10 @@ std::string CRPCTable::help(const std::string& strCommand) const catch (const std::exception& e) { // Help text is returned in an exception - string strHelp = string(e.what()); + std::string strHelp = std::string(e.what()); if (strCommand == "") { - if (strHelp.find('\n') != string::npos) + if (strHelp.find('\n') != std::string::npos) strHelp = strHelp.substr(0, strHelp.find('\n')); if (category != pcmd->category) @@ -217,7 +211,7 @@ std::string CRPCTable::help(const std::string& strCommand) const if (!category.empty()) strRet += "\n"; category = pcmd->category; - string firstLetter = category.substr(0,1); + std::string firstLetter = category.substr(0,1); boost::to_upper(firstLetter); strRet += "== " + firstLetter + category.substr(1) + " ==\n"; } @@ -234,7 +228,7 @@ std::string CRPCTable::help(const std::string& strCommand) const UniValue help(const JSONRPCRequest& jsonRequest) { if (jsonRequest.fHelp || jsonRequest.params.size() > 1) - throw runtime_error( + throw std::runtime_error( "help ( \"command\" )\n" "\nList all commands, or get help for a specified command.\n" "\nArguments:\n" @@ -243,11 +237,11 @@ UniValue help(const JSONRPCRequest& jsonRequest) "\"text\" (string) The help text\n" ); - string strCommand; + std::string strCommand; if (jsonRequest.params.size() > 0) strCommand = jsonRequest.params[0].get_str(); - return tableRPC.help(strCommand); + return tableRPC.help(strCommand, jsonRequest); } @@ -255,7 +249,7 @@ UniValue stop(const JSONRPCRequest& jsonRequest) { // Accept the deprecated and ignored 'detach' boolean argument if (jsonRequest.fHelp || jsonRequest.params.size() > 1) - throw runtime_error( + throw std::runtime_error( "stop\n" "\nStop Bitcoin server."); // Event loop will exit after current HTTP requests have been handled, so @@ -268,11 +262,11 @@ UniValue stop(const JSONRPCRequest& jsonRequest) * Call Table */ static const CRPCCommand vRPCCommands[] = -{ // category name actor (function) okSafeMode - // --------------------- ------------------------ ----------------------- ---------- +{ // category name actor (function) okSafe argNames + // --------------------- ------------------------ ----------------------- ------ ---------- /* Overall control/query calls */ - { "control", "help", &help, true }, - { "control", "stop", &stop, true }, + { "control", "help", &help, true, {"command"} }, + { "control", "stop", &stop, true, {} }, }; CRPCTable::CRPCTable() @@ -289,7 +283,7 @@ CRPCTable::CRPCTable() const CRPCCommand *CRPCTable::operator[](const std::string &name) const { - map<string, const CRPCCommand*>::const_iterator it = mapCommands.find(name); + std::map<std::string, const CRPCCommand*>::const_iterator it = mapCommands.find(name); if (it == mapCommands.end()) return NULL; return (*it).second; @@ -301,7 +295,7 @@ bool CRPCTable::appendCommand(const std::string& name, const CRPCCommand* pcmd) return false; // don't allow overwriting for now - map<string, const CRPCCommand*>::const_iterator it = mapCommands.find(name); + std::map<std::string, const CRPCCommand*>::const_iterator it = mapCommands.find(name); if (it != mapCommands.end()) return false; @@ -379,12 +373,12 @@ void JSONRPCRequest::parse(const UniValue& valRequest) // Parse params UniValue valParams = find_value(request, "params"); - if (valParams.isArray()) - params = valParams.get_array(); + if (valParams.isArray() || valParams.isObject()) + params = valParams; else if (valParams.isNull()) params = UniValue(UniValue::VARR); else - throw JSONRPCError(RPC_INVALID_REQUEST, "Params must be an array"); + throw JSONRPCError(RPC_INVALID_REQUEST, "Params must be an array or object"); } static UniValue JSONRPCExecOne(const UniValue& req) @@ -420,6 +414,48 @@ std::string JSONRPCExecBatch(const UniValue& vReq) return ret.write() + "\n"; } +/** + * Process named arguments into a vector of positional arguments, based on the + * passed-in specification for the RPC call's arguments. + */ +static inline JSONRPCRequest transformNamedArguments(const JSONRPCRequest& in, const std::vector<std::string>& argNames) +{ + JSONRPCRequest out = in; + out.params = UniValue(UniValue::VARR); + // Build a map of parameters, and remove ones that have been processed, so that we can throw a focused error if + // there is an unknown one. + const std::vector<std::string>& keys = in.params.getKeys(); + const std::vector<UniValue>& values = in.params.getValues(); + std::unordered_map<std::string, const UniValue*> argsIn; + for (size_t i=0; i<keys.size(); ++i) { + argsIn[keys[i]] = &values[i]; + } + // Process expected parameters. + int hole = 0; + for (const std::string &argName: argNames) { + auto fr = argsIn.find(argName); + if (fr != argsIn.end()) { + for (int i = 0; i < hole; ++i) { + // Fill hole between specified parameters with JSON nulls, + // but not at the end (for backwards compatibility with calls + // that act based on number of specified parameters). + out.params.push_back(UniValue()); + } + hole = 0; + out.params.push_back(*fr->second); + argsIn.erase(fr); + } else { + hole += 1; + } + } + // If there are still arguments in the argsIn map, this is an error. + if (!argsIn.empty()) { + throw JSONRPCError(RPC_INVALID_PARAMETER, "Unknown named parameter " + argsIn.begin()->first); + } + // Return request with named arguments transformed to positional arguments + return out; +} + UniValue CRPCTable::execute(const JSONRPCRequest &request) const { // Return immediately if in warmup @@ -438,15 +474,17 @@ UniValue CRPCTable::execute(const JSONRPCRequest &request) const try { - // Execute - return pcmd->actor(request); + // Execute, convert arguments to array if necessary + if (request.params.isObject()) { + return pcmd->actor(transformNamedArguments(request, pcmd->argNames)); + } else { + return pcmd->actor(request); + } } catch (const std::exception& e) { throw JSONRPCError(RPC_MISC_ERROR, e.what()); } - - g_rpcSignals.PostCommand(*pcmd); } std::vector<std::string> CRPCTable::listCommands() const diff --git a/src/rpc/server.h b/src/rpc/server.h index f3cdf3c602..68d8a6ec96 100644 --- a/src/rpc/server.h +++ b/src/rpc/server.h @@ -78,6 +78,11 @@ bool RPCIsInWarmup(std::string *statusOut); void RPCTypeCheck(const UniValue& params, const std::list<UniValue::VType>& typesExpected, bool fAllowNull=false); +/** + * Type-check one argument; throws JSONRPCError if wrong type given. + */ +void RPCTypeCheckArgument(const UniValue& value, UniValue::VType typeExpected); + /* Check for expected keys/value types in an Object. */ @@ -136,6 +141,7 @@ public: std::string name; rpcfn_type actor; bool okSafeMode; + std::vector<std::string> argNames; }; /** @@ -148,7 +154,7 @@ private: public: CRPCTable(); const CRPCCommand* operator[](const std::string& name) const; - std::string help(const std::string& name) const; + std::string help(const std::string& name, const JSONRPCRequest& helpreq) const; /** * Execute a method. @@ -184,16 +190,12 @@ extern uint256 ParseHashO(const UniValue& o, std::string strKey); extern std::vector<unsigned char> ParseHexV(const UniValue& v, std::string strName); extern std::vector<unsigned char> ParseHexO(const UniValue& o, std::string strKey); -extern int64_t nWalletUnlockTime; extern CAmount AmountFromValue(const UniValue& value); extern UniValue ValueFromAmount(const CAmount& amount); extern double GetDifficulty(const CBlockIndex* blockindex = NULL); -extern std::string HelpRequiringPassphrase(); extern std::string HelpExampleCli(const std::string& methodname, const std::string& args); extern std::string HelpExampleRpc(const std::string& methodname, const std::string& args); -extern void EnsureWalletIsUnlocked(); - bool StartRPC(); void InterruptRPC(); void StopRPC(); diff --git a/src/scheduler.cpp b/src/scheduler.cpp index b01170074d..861c1a0220 100644 --- a/src/scheduler.cpp +++ b/src/scheduler.cpp @@ -104,20 +104,20 @@ void CScheduler::schedule(CScheduler::Function f, boost::chrono::system_clock::t newTaskScheduled.notify_one(); } -void CScheduler::scheduleFromNow(CScheduler::Function f, int64_t deltaSeconds) +void CScheduler::scheduleFromNow(CScheduler::Function f, int64_t deltaMilliSeconds) { - schedule(f, boost::chrono::system_clock::now() + boost::chrono::seconds(deltaSeconds)); + schedule(f, boost::chrono::system_clock::now() + boost::chrono::milliseconds(deltaMilliSeconds)); } -static void Repeat(CScheduler* s, CScheduler::Function f, int64_t deltaSeconds) +static void Repeat(CScheduler* s, CScheduler::Function f, int64_t deltaMilliSeconds) { f(); - s->scheduleFromNow(boost::bind(&Repeat, s, f, deltaSeconds), deltaSeconds); + s->scheduleFromNow(boost::bind(&Repeat, s, f, deltaMilliSeconds), deltaMilliSeconds); } -void CScheduler::scheduleEvery(CScheduler::Function f, int64_t deltaSeconds) +void CScheduler::scheduleEvery(CScheduler::Function f, int64_t deltaMilliSeconds) { - scheduleFromNow(boost::bind(&Repeat, this, f, deltaSeconds), deltaSeconds); + scheduleFromNow(boost::bind(&Repeat, this, f, deltaMilliSeconds), deltaMilliSeconds); } size_t CScheduler::getQueueInfo(boost::chrono::system_clock::time_point &first, diff --git a/src/scheduler.h b/src/scheduler.h index 436659e58b..613fc1653f 100644 --- a/src/scheduler.h +++ b/src/scheduler.h @@ -10,7 +10,6 @@ // boost::thread / boost::function / boost::chrono should be ported to // std::thread / std::function / std::chrono when we support C++11. // -#include <boost/function.hpp> #include <boost/chrono/chrono.hpp> #include <boost/thread.hpp> #include <map> @@ -23,7 +22,7 @@ // // CScheduler* s = new CScheduler(); // s->scheduleFromNow(doSomething, 11); // Assuming a: void doSomething() { } -// s->scheduleFromNow(boost::bind(Class::func, this, argument), 3); +// s->scheduleFromNow(std::bind(Class::func, this, argument), 3); // boost::thread* t = new boost::thread(boost::bind(CScheduler::serviceQueue, s)); // // ... then at program shutdown, clean up the thread running serviceQueue: @@ -39,20 +38,20 @@ public: CScheduler(); ~CScheduler(); - typedef boost::function<void(void)> Function; + typedef std::function<void(void)> Function; // Call func at/after time t void schedule(Function f, boost::chrono::system_clock::time_point t); // Convenience method: call f once deltaSeconds from now - void scheduleFromNow(Function f, int64_t deltaSeconds); + void scheduleFromNow(Function f, int64_t deltaMilliSeconds); // Another convenience method: call f approximately // every deltaSeconds forever, starting deltaSeconds from now. // To be more precise: every time f is finished, it // is rescheduled to run deltaSeconds later. If you // need more accurate scheduling, don't use this method. - void scheduleEvery(Function f, int64_t deltaSeconds); + void scheduleEvery(Function f, int64_t deltaMilliSeconds); // To keep things as simple as possible, there is no unschedule. diff --git a/src/script/interpreter.cpp b/src/script/interpreter.cpp index f9b7835882..8ecf0bbdac 100644 --- a/src/script/interpreter.cpp +++ b/src/script/interpreter.cpp @@ -13,9 +13,7 @@ #include "script/script.h" #include "uint256.h" -using namespace std; - -typedef vector<unsigned char> valtype; +typedef std::vector<unsigned char> valtype; namespace { @@ -56,10 +54,10 @@ bool CastToBool(const valtype& vch) */ #define stacktop(i) (stack.at(stack.size()+(i))) #define altstacktop(i) (altstack.at(altstack.size()+(i))) -static inline void popstack(vector<valtype>& stack) +static inline void popstack(std::vector<valtype>& stack) { if (stack.empty()) - throw runtime_error("popstack(): stack empty"); + throw std::runtime_error("popstack(): stack empty"); stack.pop_back(); } @@ -194,7 +192,7 @@ bool static IsDefinedHashtypeSignature(const valtype &vchSig) { return true; } -bool CheckSignatureEncoding(const vector<unsigned char> &vchSig, unsigned int flags, ScriptError* serror) { +bool CheckSignatureEncoding(const std::vector<unsigned char> &vchSig, unsigned int flags, ScriptError* serror) { // Empty signature. Not strictly DER encoded, but allowed to provide a // compact way to provide an invalid signature for use with CHECK(MULTI)SIG if (vchSig.size() == 0) { @@ -245,7 +243,7 @@ bool static CheckMinimalPush(const valtype& data, opcodetype opcode) { return true; } -bool EvalScript(vector<vector<unsigned char> >& stack, const CScript& script, unsigned int flags, const BaseSignatureChecker& checker, SigVersion sigversion, ScriptError* serror) +bool EvalScript(std::vector<std::vector<unsigned char> >& stack, const CScript& script, unsigned int flags, const BaseSignatureChecker& checker, SigVersion sigversion, ScriptError* serror) { static const CScriptNum bnZero(0); static const CScriptNum bnOne(1); @@ -260,8 +258,8 @@ bool EvalScript(vector<vector<unsigned char> >& stack, const CScript& script, un CScript::const_iterator pbegincodehash = script.begin(); opcodetype opcode; valtype vchPushValue; - vector<bool> vfExec; - vector<valtype> altstack; + std::vector<bool> vfExec; + std::vector<valtype> altstack; set_error(serror, SCRIPT_ERR_UNKNOWN_ERROR); if (script.size() > MAX_SCRIPT_SIZE) return set_error(serror, SCRIPT_ERR_SCRIPT_SIZE); @@ -1250,14 +1248,14 @@ bool TransactionSignatureChecker::VerifySignature(const std::vector<unsigned cha return pubkey.Verify(sighash, vchSig); } -bool TransactionSignatureChecker::CheckSig(const vector<unsigned char>& vchSigIn, const vector<unsigned char>& vchPubKey, const CScript& scriptCode, SigVersion sigversion) const +bool TransactionSignatureChecker::CheckSig(const std::vector<unsigned char>& vchSigIn, const std::vector<unsigned char>& vchPubKey, const CScript& scriptCode, SigVersion sigversion) const { CPubKey pubkey(vchPubKey); if (!pubkey.IsValid()) return false; // Hash type is one byte tacked on to the end of the signature - vector<unsigned char> vchSig(vchSigIn); + std::vector<unsigned char> vchSig(vchSigIn); if (vchSig.empty()) return false; int nHashType = vchSig.back(); @@ -1355,7 +1353,7 @@ bool TransactionSignatureChecker::CheckSequence(const CScriptNum& nSequence) con static bool VerifyWitnessProgram(const CScriptWitness& witness, int witversion, const std::vector<unsigned char>& program, unsigned int flags, const BaseSignatureChecker& checker, ScriptError* serror) { - vector<vector<unsigned char> > stack; + std::vector<std::vector<unsigned char> > stack; CScript scriptPubKey; if (witversion == 0) { @@ -1420,7 +1418,7 @@ bool VerifyScript(const CScript& scriptSig, const CScript& scriptPubKey, const C return set_error(serror, SCRIPT_ERR_SIG_PUSHONLY); } - vector<vector<unsigned char> > stack, stackCopy; + std::vector<std::vector<unsigned char> > stack, stackCopy; if (!EvalScript(stack, scriptSig, flags, checker, SIGVERSION_BASE, serror)) // serror is set return false; @@ -1558,7 +1556,7 @@ size_t CountWitnessSigOps(const CScript& scriptSig, const CScript& scriptPubKey, if (scriptPubKey.IsPayToScriptHash() && scriptSig.IsPushOnly()) { CScript::const_iterator pc = scriptSig.begin(); - vector<unsigned char> data; + std::vector<unsigned char> data; while (pc < scriptSig.end()) { opcodetype opcode; scriptSig.GetOp(pc, opcode, data); diff --git a/src/script/interpreter.h b/src/script/interpreter.h index 79894c5300..60f6f711e6 100644 --- a/src/script/interpreter.h +++ b/src/script/interpreter.h @@ -171,7 +171,7 @@ private: const CTransaction txTo; public: - MutableTransactionSignatureChecker(const CMutableTransaction* txToIn, unsigned int nInIn, const CAmount& amount) : TransactionSignatureChecker(&txTo, nInIn, amount), txTo(*txToIn) {} + MutableTransactionSignatureChecker(const CMutableTransaction* txToIn, unsigned int nInIn, const CAmount& amountIn) : TransactionSignatureChecker(&txTo, nInIn, amountIn), txTo(*txToIn) {} }; bool EvalScript(std::vector<std::vector<unsigned char> >& stack, const CScript& script, unsigned int flags, const BaseSignatureChecker& checker, SigVersion sigversion, ScriptError* error = NULL); diff --git a/src/script/ismine.cpp b/src/script/ismine.cpp index 608a8de8f5..a4743281b1 100644 --- a/src/script/ismine.cpp +++ b/src/script/ismine.cpp @@ -13,11 +13,9 @@ #include <boost/foreach.hpp> -using namespace std; +typedef std::vector<unsigned char> valtype; -typedef vector<unsigned char> valtype; - -unsigned int HaveKeys(const vector<valtype>& pubkeys, const CKeyStore& keystore) +unsigned int HaveKeys(const std::vector<valtype>& pubkeys, const CKeyStore& keystore) { unsigned int nResult = 0; BOOST_FOREACH(const valtype& pubkey, pubkeys) @@ -49,7 +47,7 @@ isminetype IsMine(const CKeyStore &keystore, const CTxDestination& dest, bool& i isminetype IsMine(const CKeyStore &keystore, const CScript& scriptPubKey, bool& isInvalid, SigVersion sigversion) { - vector<valtype> vSolutions; + std::vector<valtype> vSolutions; txnouttype whichType; if (!Solver(scriptPubKey, whichType, vSolutions)) { if (keystore.HaveWatchOnly(scriptPubKey)) @@ -132,7 +130,7 @@ isminetype IsMine(const CKeyStore &keystore, const CScript& scriptPubKey, bool& // partially owned (somebody else has a key that can spend // them) enable spend-out-from-under-you attacks, especially // in shared-wallet situations. - vector<valtype> keys(vSolutions.begin()+1, vSolutions.begin()+vSolutions.size()-1); + std::vector<valtype> keys(vSolutions.begin()+1, vSolutions.begin()+vSolutions.size()-1); if (sigversion != SIGVERSION_BASE) { for (size_t i = 0; i < keys.size(); i++) { if (keys[i].size() != 33) { diff --git a/src/script/script.cpp b/src/script/script.cpp index 828ce1a056..70eb8a139b 100644 --- a/src/script/script.cpp +++ b/src/script/script.cpp @@ -8,8 +8,6 @@ #include "tinyformat.h" #include "utilstrencodings.h" -using namespace std; - const char* GetOpName(opcodetype opcode) { switch (opcode) @@ -129,7 +127,7 @@ const char* GetOpName(opcodetype opcode) case OP_CHECKMULTISIG : return "OP_CHECKMULTISIG"; case OP_CHECKMULTISIGVERIFY : return "OP_CHECKMULTISIGVERIFY"; - // expanson + // expansion case OP_NOP1 : return "OP_NOP1"; case OP_CHECKLOCKTIMEVERIFY : return "OP_CHECKLOCKTIMEVERIFY"; case OP_CHECKSEQUENCEVERIFY : return "OP_CHECKSEQUENCEVERIFY"; @@ -186,18 +184,18 @@ unsigned int CScript::GetSigOpCount(const CScript& scriptSig) const // get the last item that the scriptSig // pushes onto the stack: const_iterator pc = scriptSig.begin(); - vector<unsigned char> data; + std::vector<unsigned char> vData; while (pc < scriptSig.end()) { opcodetype opcode; - if (!scriptSig.GetOp(pc, opcode, data)) + if (!scriptSig.GetOp(pc, opcode, vData)) return 0; if (opcode > OP_16) return 0; } /// ... and return its opcount: - CScript subscript(data.begin(), data.end()); + CScript subscript(vData.begin(), vData.end()); return subscript.GetSigOpCount(true); } diff --git a/src/script/script.h b/src/script/script.h index 654dff4625..d7aaa04f80 100644 --- a/src/script/script.h +++ b/src/script/script.h @@ -448,16 +448,16 @@ public: else if (b.size() <= 0xffff) { insert(end(), OP_PUSHDATA2); - uint8_t data[2]; - WriteLE16(data, b.size()); - insert(end(), data, data + sizeof(data)); + uint8_t _data[2]; + WriteLE16(_data, b.size()); + insert(end(), _data, _data + sizeof(_data)); } else { insert(end(), OP_PUSHDATA4); - uint8_t data[4]; - WriteLE32(data, b.size()); - insert(end(), data, data + sizeof(data)); + uint8_t _data[4]; + WriteLE32(_data, b.size()); + insert(end(), _data, _data + sizeof(_data)); } insert(end(), b.begin(), b.end()); return *this; diff --git a/src/script/sigcache.cpp b/src/script/sigcache.cpp index 09bedc5460..6f47b725fb 100644 --- a/src/script/sigcache.cpp +++ b/src/script/sigcache.cpp @@ -90,11 +90,13 @@ public: static CSignatureCache signatureCache; } -// To be called once in AppInit2/TestingSetup to initialize the signatureCache +// To be called once in AppInitMain/BasicTestingSetup to initialize the +// signatureCache. void InitSignatureCache() { - size_t nMaxCacheSize = GetArg("-maxsigcachesize", DEFAULT_MAX_SIG_CACHE_SIZE) * ((size_t) 1 << 20); - if (nMaxCacheSize <= 0) return; + // nMaxCacheSize is unsigned. If -maxsigcachesize is set to zero, + // setup_bytes creates the minimum possible cache (2 elements). + size_t nMaxCacheSize = std::min(std::max((int64_t)0, GetArg("-maxsigcachesize", DEFAULT_MAX_SIG_CACHE_SIZE)), MAX_MAX_SIG_CACHE_SIZE) * ((size_t) 1 << 20); size_t nElems = signatureCache.setup_bytes(nMaxCacheSize); LogPrintf("Using %zu MiB out of %zu requested for signature cache, able to store %zu elements\n", (nElems*sizeof(uint256)) >>20, nMaxCacheSize>>20, nElems); diff --git a/src/script/sigcache.h b/src/script/sigcache.h index c123a9ba0f..60690583de 100644 --- a/src/script/sigcache.h +++ b/src/script/sigcache.h @@ -14,6 +14,8 @@ // systems). Due to how we count cache size, actual memory usage is slightly // more (~32.25 MB) static const unsigned int DEFAULT_MAX_SIG_CACHE_SIZE = 32; +// Maximum sig cache size allowed +static const int64_t MAX_MAX_SIG_CACHE_SIZE = 16384; class CPubKey; @@ -23,7 +25,7 @@ private: bool store; public: - CachingTransactionSignatureChecker(const CTransaction* txToIn, unsigned int nInIn, const CAmount& amount, bool storeIn, PrecomputedTransactionData& txdataIn) : TransactionSignatureChecker(txToIn, nInIn, amount, txdataIn), store(storeIn) {} + CachingTransactionSignatureChecker(const CTransaction* txToIn, unsigned int nInIn, const CAmount& amountIn, bool storeIn, PrecomputedTransactionData& txdataIn) : TransactionSignatureChecker(txToIn, nInIn, amountIn, txdataIn), store(storeIn) {} bool VerifySignature(const std::vector<unsigned char>& vchSig, const CPubKey& vchPubKey, const uint256& sighash) const; }; diff --git a/src/script/sign.cpp b/src/script/sign.cpp index b008df2591..5682418546 100644 --- a/src/script/sign.cpp +++ b/src/script/sign.cpp @@ -14,8 +14,6 @@ #include <boost/foreach.hpp> -using namespace std; - typedef std::vector<unsigned char> valtype; TransactionSignatureCreator::TransactionSignatureCreator(const CKeyStore* keystoreIn, const CTransaction* txToIn, unsigned int nInIn, const CAmount& amountIn, int nHashTypeIn) : BaseSignatureCreator(keystoreIn), txTo(txToIn), nIn(nInIn), nHashType(nHashTypeIn), amount(amountIn), checker(txTo, nIn, amountIn) {} @@ -39,14 +37,14 @@ bool TransactionSignatureCreator::CreateSig(std::vector<unsigned char>& vchSig, static bool Sign1(const CKeyID& address, const BaseSignatureCreator& creator, const CScript& scriptCode, std::vector<valtype>& ret, SigVersion sigversion) { - vector<unsigned char> vchSig; + std::vector<unsigned char> vchSig; if (!creator.CreateSig(vchSig, address, scriptCode, sigversion)) return false; ret.push_back(vchSig); return true; } -static bool SignN(const vector<valtype>& multisigdata, const BaseSignatureCreator& creator, const CScript& scriptCode, std::vector<valtype>& ret, SigVersion sigversion) +static bool SignN(const std::vector<valtype>& multisigdata, const BaseSignatureCreator& creator, const CScript& scriptCode, std::vector<valtype>& ret, SigVersion sigversion) { int nSigned = 0; int nRequired = multisigdata.front()[0]; @@ -73,7 +71,7 @@ static bool SignStep(const BaseSignatureCreator& creator, const CScript& scriptP uint160 h160; ret.clear(); - vector<valtype> vSolutions; + std::vector<valtype> vSolutions; if (!Solver(scriptPubKey, whichTypeRet, vSolutions)) return false; @@ -125,7 +123,7 @@ static bool SignStep(const BaseSignatureCreator& creator, const CScript& scriptP } } -static CScript PushAll(const vector<valtype>& values) +static CScript PushAll(const std::vector<valtype>& values) { CScript result; BOOST_FOREACH(const valtype& v, values) { @@ -228,12 +226,12 @@ bool SignSignature(const CKeyStore &keystore, const CTransaction& txFrom, CMutab return SignSignature(keystore, txout.scriptPubKey, txTo, nIn, txout.nValue, nHashType); } -static vector<valtype> CombineMultisig(const CScript& scriptPubKey, const BaseSignatureChecker& checker, - const vector<valtype>& vSolutions, - const vector<valtype>& sigs1, const vector<valtype>& sigs2, SigVersion sigversion) +static std::vector<valtype> CombineMultisig(const CScript& scriptPubKey, const BaseSignatureChecker& checker, + const std::vector<valtype>& vSolutions, + const std::vector<valtype>& sigs1, const std::vector<valtype>& sigs2, SigVersion sigversion) { // Combine all the signatures we've got: - set<valtype> allsigs; + std::set<valtype> allsigs; BOOST_FOREACH(const valtype& v, sigs1) { if (!v.empty()) @@ -249,7 +247,7 @@ static vector<valtype> CombineMultisig(const CScript& scriptPubKey, const BaseSi assert(vSolutions.size() > 1); unsigned int nSigsRequired = vSolutions.front()[0]; unsigned int nPubKeys = vSolutions.size()-2; - map<valtype, valtype> sigs; + std::map<valtype, valtype> sigs; BOOST_FOREACH(const valtype& sig, allsigs) { for (unsigned int i = 0; i < nPubKeys; i++) @@ -306,7 +304,7 @@ struct Stacks } static Stacks CombineSignatures(const CScript& scriptPubKey, const BaseSignatureChecker& checker, - const txnouttype txType, const vector<valtype>& vSolutions, + const txnouttype txType, const std::vector<valtype>& vSolutions, Stacks sigs1, Stacks sigs2, SigVersion sigversion) { switch (txType) @@ -340,7 +338,7 @@ static Stacks CombineSignatures(const CScript& scriptPubKey, const BaseSignature CScript pubKey2(spk.begin(), spk.end()); txnouttype txType2; - vector<vector<unsigned char> > vSolutions2; + std::vector<std::vector<unsigned char> > vSolutions2; Solver(pubKey2, txType2, vSolutions2); sigs1.script.pop_back(); sigs2.script.pop_back(); @@ -360,7 +358,7 @@ static Stacks CombineSignatures(const CScript& scriptPubKey, const BaseSignature // Recur to combine: CScript pubKey2(sigs1.witness.back().begin(), sigs1.witness.back().end()); txnouttype txType2; - vector<valtype> vSolutions2; + std::vector<valtype> vSolutions2; Solver(pubKey2, txType2, vSolutions2); sigs1.witness.pop_back(); sigs1.script = sigs1.witness; @@ -383,7 +381,7 @@ SignatureData CombineSignatures(const CScript& scriptPubKey, const BaseSignature const SignatureData& scriptSig1, const SignatureData& scriptSig2) { txnouttype txType; - vector<vector<unsigned char> > vSolutions; + std::vector<std::vector<unsigned char> > vSolutions; Solver(scriptPubKey, txType, vSolutions); return CombineSignatures(scriptPubKey, checker, txType, vSolutions, Stacks(scriptSig1), Stacks(scriptSig2), SIGVERSION_BASE).Output(); diff --git a/src/script/sign.h b/src/script/sign.h index 1cfc53c6c1..f3c0be4139 100644 --- a/src/script/sign.h +++ b/src/script/sign.h @@ -48,7 +48,7 @@ class MutableTransactionSignatureCreator : public TransactionSignatureCreator { CTransaction tx; public: - MutableTransactionSignatureCreator(const CKeyStore* keystoreIn, const CMutableTransaction* txToIn, unsigned int nInIn, const CAmount& amount, int nHashTypeIn) : TransactionSignatureCreator(keystoreIn, &tx, nInIn, amount, nHashTypeIn), tx(*txToIn) {} + MutableTransactionSignatureCreator(const CKeyStore* keystoreIn, const CMutableTransaction* txToIn, unsigned int nInIn, const CAmount& amountIn, int nHashTypeIn) : TransactionSignatureCreator(keystoreIn, &tx, nInIn, amountIn, nHashTypeIn), tx(*txToIn) {} }; /** A signature creator that just produces 72-byte empty signatures. */ diff --git a/src/script/standard.cpp b/src/script/standard.cpp index 4b9bec9aa1..63f20b0993 100644 --- a/src/script/standard.cpp +++ b/src/script/standard.cpp @@ -12,9 +12,7 @@ #include <boost/foreach.hpp> -using namespace std; - -typedef vector<unsigned char> valtype; +typedef std::vector<unsigned char> valtype; bool fAcceptDatacarrier = DEFAULT_ACCEPT_DATACARRIER; unsigned nMaxDatacarrierBytes = MAX_OP_RETURN_RELAY; @@ -40,20 +38,20 @@ const char* GetTxnOutputType(txnouttype t) /** * Return public keys or hashes from scriptPubKey, for 'standard' transaction types. */ -bool Solver(const CScript& scriptPubKey, txnouttype& typeRet, vector<vector<unsigned char> >& vSolutionsRet) +bool Solver(const CScript& scriptPubKey, txnouttype& typeRet, std::vector<std::vector<unsigned char> >& vSolutionsRet) { // Templates - static multimap<txnouttype, CScript> mTemplates; + static std::multimap<txnouttype, CScript> mTemplates; if (mTemplates.empty()) { // Standard tx, sender provides pubkey, receiver adds signature - mTemplates.insert(make_pair(TX_PUBKEY, CScript() << OP_PUBKEY << OP_CHECKSIG)); + mTemplates.insert(std::make_pair(TX_PUBKEY, CScript() << OP_PUBKEY << OP_CHECKSIG)); // Bitcoin address tx, sender provides hash of pubkey, receiver provides signature and pubkey - mTemplates.insert(make_pair(TX_PUBKEYHASH, CScript() << OP_DUP << OP_HASH160 << OP_PUBKEYHASH << OP_EQUALVERIFY << OP_CHECKSIG)); + mTemplates.insert(std::make_pair(TX_PUBKEYHASH, CScript() << OP_DUP << OP_HASH160 << OP_PUBKEYHASH << OP_EQUALVERIFY << OP_CHECKSIG)); // Sender provides N pubkeys, receivers provides M signatures - mTemplates.insert(make_pair(TX_MULTISIG, CScript() << OP_SMALLINTEGER << OP_PUBKEYS << OP_SMALLINTEGER << OP_CHECKMULTISIG)); + mTemplates.insert(std::make_pair(TX_MULTISIG, CScript() << OP_SMALLINTEGER << OP_PUBKEYS << OP_SMALLINTEGER << OP_CHECKMULTISIG)); } vSolutionsRet.clear(); @@ -63,7 +61,7 @@ bool Solver(const CScript& scriptPubKey, txnouttype& typeRet, vector<vector<unsi if (scriptPubKey.IsPayToScriptHash()) { typeRet = TX_SCRIPTHASH; - vector<unsigned char> hashBytes(scriptPubKey.begin()+2, scriptPubKey.begin()+22); + std::vector<unsigned char> hashBytes(scriptPubKey.begin()+2, scriptPubKey.begin()+22); vSolutionsRet.push_back(hashBytes); return true; } @@ -102,7 +100,7 @@ bool Solver(const CScript& scriptPubKey, txnouttype& typeRet, vector<vector<unsi vSolutionsRet.clear(); opcodetype opcode1, opcode2; - vector<unsigned char> vch1, vch2; + std::vector<unsigned char> vch1, vch2; // Compare CScript::const_iterator pc1 = script1.begin(); @@ -181,7 +179,7 @@ bool Solver(const CScript& scriptPubKey, txnouttype& typeRet, vector<vector<unsi bool ExtractDestination(const CScript& scriptPubKey, CTxDestination& addressRet) { - vector<valtype> vSolutions; + std::vector<valtype> vSolutions; txnouttype whichType; if (!Solver(scriptPubKey, whichType, vSolutions)) return false; @@ -209,11 +207,11 @@ bool ExtractDestination(const CScript& scriptPubKey, CTxDestination& addressRet) return false; } -bool ExtractDestinations(const CScript& scriptPubKey, txnouttype& typeRet, vector<CTxDestination>& addressRet, int& nRequiredRet) +bool ExtractDestinations(const CScript& scriptPubKey, txnouttype& typeRet, std::vector<CTxDestination>& addressRet, int& nRequiredRet) { addressRet.clear(); typeRet = TX_NONSTANDARD; - vector<valtype> vSolutions; + std::vector<valtype> vSolutions; if (!Solver(scriptPubKey, typeRet, vSolutions)) return false; if (typeRet == TX_NULL_DATA){ diff --git a/src/streams.h b/src/streams.h index 1d3b55c91e..3c24c2c373 100644 --- a/src/streams.h +++ b/src/streams.h @@ -584,11 +584,11 @@ protected: readNow = nAvail; if (readNow == 0) return false; - size_t read = fread((void*)&vchBuf[pos], 1, readNow, src); - if (read == 0) { + size_t nBytes = fread((void*)&vchBuf[pos], 1, readNow, src); + if (nBytes == 0) { throw std::ios_base::failure(feof(src) ? "CBufferedFile::Fill: end of file" : "CBufferedFile::Fill: fread failed"); } else { - nSrcPos += read; + nSrcPos += nBytes; return true; } } diff --git a/src/support/lockedpool.cpp b/src/support/lockedpool.cpp index 01273c9791..98c1581093 100644 --- a/src/support/lockedpool.cpp +++ b/src/support/lockedpool.cpp @@ -357,8 +357,8 @@ LockedPool::LockedPageArena::~LockedPageArena() /*******************************************************************************/ // Implementation: LockedPoolManager // -LockedPoolManager::LockedPoolManager(std::unique_ptr<LockedPageAllocator> allocator): - LockedPool(std::move(allocator), &LockedPoolManager::LockingFailed) +LockedPoolManager::LockedPoolManager(std::unique_ptr<LockedPageAllocator> allocator_in): + LockedPool(std::move(allocator_in), &LockedPoolManager::LockingFailed) { } diff --git a/src/sync.cpp b/src/sync.cpp index a18d0f1485..fce57f1df9 100644 --- a/src/sync.cpp +++ b/src/sync.cpp @@ -77,52 +77,28 @@ boost::thread_specific_ptr<LockStack> lockstack; static void potential_deadlock_detected(const std::pair<void*, void*>& mismatch, const LockStack& s1, const LockStack& s2) { - // We attempt to not assert on probably-not deadlocks by assuming that - // a try lock will immediately have otherwise bailed if it had - // failed to get the lock - // We do this by, for the locks which triggered the potential deadlock, - // in either lockorder, checking that the second of the two which is locked - // is only a TRY_LOCK, ignoring locks if they are reentrant. - bool firstLocked = false; - bool secondLocked = false; - bool onlyMaybeDeadlock = false; - LogPrintf("POTENTIAL DEADLOCK DETECTED\n"); LogPrintf("Previous lock order was:\n"); BOOST_FOREACH (const PAIRTYPE(void*, CLockLocation) & i, s2) { if (i.first == mismatch.first) { LogPrintf(" (1)"); - if (!firstLocked && secondLocked && i.second.fTry) - onlyMaybeDeadlock = true; - firstLocked = true; } if (i.first == mismatch.second) { LogPrintf(" (2)"); - if (!secondLocked && firstLocked && i.second.fTry) - onlyMaybeDeadlock = true; - secondLocked = true; } LogPrintf(" %s\n", i.second.ToString()); } - firstLocked = false; - secondLocked = false; LogPrintf("Current lock order is:\n"); BOOST_FOREACH (const PAIRTYPE(void*, CLockLocation) & i, s1) { if (i.first == mismatch.first) { LogPrintf(" (1)"); - if (!firstLocked && secondLocked && i.second.fTry) - onlyMaybeDeadlock = true; - firstLocked = true; } if (i.first == mismatch.second) { LogPrintf(" (2)"); - if (!secondLocked && firstLocked && i.second.fTry) - onlyMaybeDeadlock = true; - secondLocked = true; } LogPrintf(" %s\n", i.second.ToString()); } - assert(onlyMaybeDeadlock); + assert(false); } static void push_lock(void* c, const CLockLocation& locklocation, bool fTry) @@ -134,21 +110,19 @@ static void push_lock(void* c, const CLockLocation& locklocation, bool fTry) (*lockstack).push_back(std::make_pair(c, locklocation)); - if (!fTry) { - BOOST_FOREACH (const PAIRTYPE(void*, CLockLocation) & i, (*lockstack)) { - if (i.first == c) - break; + BOOST_FOREACH (const PAIRTYPE(void*, CLockLocation) & i, (*lockstack)) { + if (i.first == c) + break; - std::pair<void*, void*> p1 = std::make_pair(i.first, c); - if (lockdata.lockorders.count(p1)) - continue; - lockdata.lockorders[p1] = (*lockstack); + std::pair<void*, void*> p1 = std::make_pair(i.first, c); + if (lockdata.lockorders.count(p1)) + continue; + lockdata.lockorders[p1] = (*lockstack); - std::pair<void*, void*> p2 = std::make_pair(c, i.first); - lockdata.invlockorders.insert(p2); - if (lockdata.lockorders.count(p2)) - potential_deadlock_detected(p1, lockdata.lockorders[p2], lockdata.lockorders[p1]); - } + std::pair<void*, void*> p2 = std::make_pair(c, i.first); + lockdata.invlockorders.insert(p2); + if (lockdata.lockorders.count(p2)) + potential_deadlock_detected(p1, lockdata.lockorders[p2], lockdata.lockorders[p1]); } } diff --git a/src/test/DoS_tests.cpp b/src/test/DoS_tests.cpp index 9345a44fb0..c62e6ae838 100644 --- a/src/test/DoS_tests.cpp +++ b/src/test/DoS_tests.cpp @@ -23,7 +23,7 @@ #include <boost/foreach.hpp> #include <boost/test/unit_test.hpp> -// Tests this internal-to-main.cpp method: +// Tests these internal-to-net_processing.cpp methods: extern bool AddOrphanTx(const CTransactionRef& tx, NodeId peer); extern void EraseOrphansFor(NodeId peer); extern unsigned int LimitOrphanTxSize(unsigned int nMaxOrphans); @@ -55,6 +55,7 @@ BOOST_AUTO_TEST_CASE(DoS_banning) dummyNode1.SetSendVersion(PROTOCOL_VERSION); GetNodeSignals().InitializeNode(&dummyNode1, *connman); dummyNode1.nVersion = 1; + dummyNode1.fSuccessfullyConnected = true; Misbehaving(dummyNode1.GetId(), 100); // Should get banned SendMessages(&dummyNode1, *connman, interruptDummy); BOOST_CHECK(connman->IsBanned(addr1)); @@ -65,6 +66,7 @@ BOOST_AUTO_TEST_CASE(DoS_banning) dummyNode2.SetSendVersion(PROTOCOL_VERSION); GetNodeSignals().InitializeNode(&dummyNode2, *connman); dummyNode2.nVersion = 1; + dummyNode2.fSuccessfullyConnected = true; Misbehaving(dummyNode2.GetId(), 50); SendMessages(&dummyNode2, *connman, interruptDummy); BOOST_CHECK(!connman->IsBanned(addr2)); // 2 not banned yet... @@ -85,6 +87,7 @@ BOOST_AUTO_TEST_CASE(DoS_banscore) dummyNode1.SetSendVersion(PROTOCOL_VERSION); GetNodeSignals().InitializeNode(&dummyNode1, *connman); dummyNode1.nVersion = 1; + dummyNode1.fSuccessfullyConnected = true; Misbehaving(dummyNode1.GetId(), 100); SendMessages(&dummyNode1, *connman, interruptDummy); BOOST_CHECK(!connman->IsBanned(addr1)); @@ -110,6 +113,7 @@ BOOST_AUTO_TEST_CASE(DoS_bantime) dummyNode.SetSendVersion(PROTOCOL_VERSION); GetNodeSignals().InitializeNode(&dummyNode, *connman); dummyNode.nVersion = 1; + dummyNode.fSuccessfullyConnected = true; Misbehaving(dummyNode.GetId(), 100); SendMessages(&dummyNode, *connman, interruptDummy); diff --git a/src/test/addrman_tests.cpp b/src/test/addrman_tests.cpp index 48313915e7..322addc9f6 100644 --- a/src/test/addrman_tests.cpp +++ b/src/test/addrman_tests.cpp @@ -297,7 +297,7 @@ BOOST_AUTO_TEST_CASE(addrman_find) // Test 18; Find does not discriminate by port number. CAddrInfo* info2 = addrman.Find(addr2); BOOST_CHECK(info2); - if (info2) + if (info2 && info1) BOOST_CHECK(info2->ToString() == info1->ToString()); // Test 19: Find returns another IP matching what we searched on. diff --git a/src/test/bctest.py b/src/test/bctest.py index adc5d0e418..c69f52afc3 100644 --- a/src/test/bctest.py +++ b/src/test/bctest.py @@ -10,6 +10,7 @@ import sys import binascii import difflib import logging +import pprint def parse_output(a, fmt): """Parse the output according to specified format. @@ -65,6 +66,7 @@ def bctest(testDir, testObj, exeext): raise if outputData: + data_mismatch, formatting_mismatch = False, False # Parse command output and expected output try: a_parsed = parse_output(outs[0], outputType) @@ -79,7 +81,7 @@ def bctest(testDir, testObj, exeext): # Compare data if a_parsed != b_parsed: logging.error("Output data mismatch for " + outputFn + " (format " + outputType + ")") - raise Exception + data_mismatch = True # Compare formatting if outs[0] != outputData: error_message = "Output formatting mismatch for " + outputFn + ":\n" @@ -88,7 +90,9 @@ def bctest(testDir, testObj, exeext): fromfile=outputFn, tofile="returned")) logging.error(error_message) - raise Exception + formatting_mismatch = True + + assert not data_mismatch and not formatting_mismatch # Compare the return code to the expected return code wantRC = 0 @@ -115,7 +119,9 @@ def bctester(testDir, input_basename, buildenv): failed_testcases.append(testObj["description"]) if failed_testcases: - logging.error("FAILED TESTCASES: [" + ", ".join(failed_testcases) + "]") + error_message = "FAILED_TESTCASES:\n" + error_message += pprint.pformat(failed_testcases, width=400) + logging.error(error_message) sys.exit(1) else: sys.exit(0) diff --git a/src/test/bip32_tests.cpp b/src/test/bip32_tests.cpp index 7f1c2a32dd..c148ad6d82 100644 --- a/src/test/bip32_tests.cpp +++ b/src/test/bip32_tests.cpp @@ -78,6 +78,15 @@ TestVector test2 = "xprvA2nrNbFZABcdryreWet9Ea4LvTJcGsqrMzxHx98MMrotbir7yrKCEXw7nadnHM8Dq38EGfSh6dqA9QWTyefMLEcBYJUuekgW4BYPJcr9E7j", 0); +TestVector test3 = + TestVector("4b381541583be4423346c643850da4b320e46a87ae3d2a4e6da11eba819cd4acba45d239319ac14f863b8d5ab5a0d0c64d2e8a1e7d1457df2e5a3c51c73235be") + ("xpub661MyMwAqRbcEZVB4dScxMAdx6d4nFc9nvyvH3v4gJL378CSRZiYmhRoP7mBy6gSPSCYk6SzXPTf3ND1cZAceL7SfJ1Z3GC8vBgp2epUt13", + "xprv9s21ZrQH143K25QhxbucbDDuQ4naNntJRi4KUfWT7xo4EKsHt2QJDu7KXp1A3u7Bi1j8ph3EGsZ9Xvz9dGuVrtHHs7pXeTzjuxBrCmmhgC6", + 0x80000000) + ("xpub68NZiKmJWnxxS6aaHmn81bvJeTESw724CRDs6HbuccFQN9Ku14VQrADWgqbhhTHBaohPX4CjNLf9fq9MYo6oDaPPLPxSb7gwQN3ih19Zm4Y", + "xprv9uPDJpEQgRQfDcW7BkF7eTya6RPxXeJCqCJGHuCJ4GiRVLzkTXBAJMu2qaMWPrS7AANYqdq6vcBcBUdJCVVFceUvJFjaPdGZ2y9WACViL4L", + 0); + void RunTest(const TestVector &test) { std::vector<unsigned char> seed = ParseHex(test.strHexMaster); CExtKey key; @@ -146,4 +155,8 @@ BOOST_AUTO_TEST_CASE(bip32_test2) { RunTest(test2); } +BOOST_AUTO_TEST_CASE(bip32_test3) { + RunTest(test3); +} + BOOST_AUTO_TEST_SUITE_END() diff --git a/src/test/bitcoin-util-test.py b/src/test/bitcoin-util-test.py index 1c090b3f3f..e2087187aa 100755 --- a/src/test/bitcoin-util-test.py +++ b/src/test/bitcoin-util-test.py @@ -5,7 +5,6 @@ # file COPYING or http://www.opensource.org/licenses/mit-license.php. from __future__ import division,print_function,unicode_literals import os -import sys import bctest import buildenv import argparse diff --git a/src/test/blockencodings_tests.cpp b/src/test/blockencodings_tests.cpp index e3876e9695..9e4a56919d 100644 --- a/src/test/blockencodings_tests.cpp +++ b/src/test/blockencodings_tests.cpp @@ -11,6 +11,8 @@ #include <boost/test/unit_test.hpp> +std::vector<std::pair<uint256, CTransactionRef>> extra_txn; + struct RegtestingSetup : public TestingSetup { RegtestingSetup() : TestingSetup(CBaseChainParams::REGTEST) {} }; @@ -55,7 +57,7 @@ static CBlock BuildBlockTestCase() { BOOST_AUTO_TEST_CASE(SimpleRoundTripTest) { - CTxMemPool pool(CFeeRate(0)); + CTxMemPool pool; TestMemPoolEntryHelper entry; CBlock block(BuildBlockTestCase()); @@ -73,7 +75,7 @@ BOOST_AUTO_TEST_CASE(SimpleRoundTripTest) stream >> shortIDs2; PartiallyDownloadedBlock partialBlock(&pool); - BOOST_CHECK(partialBlock.InitData(shortIDs2) == READ_STATUS_OK); + BOOST_CHECK(partialBlock.InitData(shortIDs2, extra_txn) == READ_STATUS_OK); BOOST_CHECK( partialBlock.IsTxAvailable(0)); BOOST_CHECK(!partialBlock.IsTxAvailable(1)); BOOST_CHECK( partialBlock.IsTxAvailable(2)); @@ -154,7 +156,7 @@ public: BOOST_AUTO_TEST_CASE(NonCoinbasePreforwardRTTest) { - CTxMemPool pool(CFeeRate(0)); + CTxMemPool pool; TestMemPoolEntryHelper entry; CBlock block(BuildBlockTestCase()); @@ -179,7 +181,7 @@ BOOST_AUTO_TEST_CASE(NonCoinbasePreforwardRTTest) stream >> shortIDs2; PartiallyDownloadedBlock partialBlock(&pool); - BOOST_CHECK(partialBlock.InitData(shortIDs2) == READ_STATUS_OK); + BOOST_CHECK(partialBlock.InitData(shortIDs2, extra_txn) == READ_STATUS_OK); BOOST_CHECK(!partialBlock.IsTxAvailable(0)); BOOST_CHECK( partialBlock.IsTxAvailable(1)); BOOST_CHECK( partialBlock.IsTxAvailable(2)); @@ -220,7 +222,7 @@ BOOST_AUTO_TEST_CASE(NonCoinbasePreforwardRTTest) BOOST_AUTO_TEST_CASE(SufficientPreforwardRTTest) { - CTxMemPool pool(CFeeRate(0)); + CTxMemPool pool; TestMemPoolEntryHelper entry; CBlock block(BuildBlockTestCase()); @@ -245,7 +247,7 @@ BOOST_AUTO_TEST_CASE(SufficientPreforwardRTTest) stream >> shortIDs2; PartiallyDownloadedBlock partialBlock(&pool); - BOOST_CHECK(partialBlock.InitData(shortIDs2) == READ_STATUS_OK); + BOOST_CHECK(partialBlock.InitData(shortIDs2, extra_txn) == READ_STATUS_OK); BOOST_CHECK( partialBlock.IsTxAvailable(0)); BOOST_CHECK( partialBlock.IsTxAvailable(1)); BOOST_CHECK( partialBlock.IsTxAvailable(2)); @@ -270,7 +272,7 @@ BOOST_AUTO_TEST_CASE(SufficientPreforwardRTTest) BOOST_AUTO_TEST_CASE(EmptyBlockRoundTripTest) { - CTxMemPool pool(CFeeRate(0)); + CTxMemPool pool; CMutableTransaction coinbase; coinbase.vin.resize(1); coinbase.vin[0].scriptSig.resize(10); @@ -300,7 +302,7 @@ BOOST_AUTO_TEST_CASE(EmptyBlockRoundTripTest) stream >> shortIDs2; PartiallyDownloadedBlock partialBlock(&pool); - BOOST_CHECK(partialBlock.InitData(shortIDs2) == READ_STATUS_OK); + BOOST_CHECK(partialBlock.InitData(shortIDs2, extra_txn) == READ_STATUS_OK); BOOST_CHECK(partialBlock.IsTxAvailable(0)); CBlock block2; diff --git a/src/test/coins_tests.cpp b/src/test/coins_tests.cpp index b25c7ccc51..31ed1a50b9 100644 --- a/src/test/coins_tests.cpp +++ b/src/test/coins_tests.cpp @@ -72,7 +72,7 @@ public: class CCoinsViewCacheTest : public CCoinsViewCache { public: - CCoinsViewCacheTest(CCoinsView* base) : CCoinsViewCache(base) {} + CCoinsViewCacheTest(CCoinsView* _base) : CCoinsViewCache(_base) {} void SelfTest() const { diff --git a/src/test/cuckoocache_tests.cpp b/src/test/cuckoocache_tests.cpp index 1bc50d5ea9..00446aa11e 100644 --- a/src/test/cuckoocache_tests.cpp +++ b/src/test/cuckoocache_tests.cpp @@ -15,7 +15,7 @@ * with deterministic seeds) * 2) Some test methods are templated to allow for easier testing * against new versions / comparing - * 3) Results should be treated as a regression test, ie, did the behavior + * 3) Results should be treated as a regression test, i.e., did the behavior * change significantly from what was expected. This can be OK, depending on * the nature of the change, but requires updating the tests to reflect the new * expected behavior. For example improving the hit rate may cause some tests diff --git a/src/test/data/bitcoin-util-test.json b/src/test/data/bitcoin-util-test.json index d001b2056f..a80ab51901 100644 --- a/src/test/data/bitcoin-util-test.json +++ b/src/test/data/bitcoin-util-test.json @@ -118,6 +118,46 @@ "description": "Parses a transation with no inputs and a single output script (output in json)" }, { "exec": "./bitcoin-tx", + "args": ["-create", "outscript=0:OP_DROP", "nversion=1"], + "output_cmp": "txcreatescript1.hex", + "description": "Create a new transaction with a single output script (OP_DROP)" + }, + { "exec": "./bitcoin-tx", + "args": ["-json", "-create", "outscript=0:OP_DROP", "nversion=1"], + "output_cmp": "txcreatescript1.json", + "description": "Create a new transaction with a single output script (OP_DROP) (output as json)" + }, + { "exec": "./bitcoin-tx", + "args": ["-create", "outscript=0:OP_DROP:S", "nversion=1"], + "output_cmp": "txcreatescript2.hex", + "description": "Create a new transaction with a single output script (OP_DROP) in a P2SH" + }, + { "exec": "./bitcoin-tx", + "args": ["-json", "-create", "outscript=0:OP_DROP:S", "nversion=1"], + "output_cmp": "txcreatescript2.json", + "description": "Create a new transaction with a single output script (OP_DROP) in a P2SH (output as json)" + }, + { "exec": "./bitcoin-tx", + "args": ["-create", "outscript=0:OP_DROP:W", "nversion=1"], + "output_cmp": "txcreatescript3.hex", + "description": "Create a new transaction with a single output script (OP_DROP) in a P2WSH" + }, + { "exec": "./bitcoin-tx", + "args": ["-json", "-create", "outscript=0:OP_DROP:W", "nversion=1"], + "output_cmp": "txcreatescript3.json", + "description": "Create a new transaction with a single output script (OP_DROP) in a P2WSH (output as json)" + }, + { "exec": "./bitcoin-tx", + "args": ["-create", "outscript=0:OP_DROP:WS", "nversion=1"], + "output_cmp": "txcreatescript4.hex", + "description": "Create a new transaction with a single output script (OP_DROP) in a P2WSH, wrapped in a P2SH" + }, + { "exec": "./bitcoin-tx", + "args": ["-json", "-create", "outscript=0:OP_DROP:WS", "nversion=1"], + "output_cmp": "txcreatescript4.json", + "description": "Create a new transaction with a single output script (OP_DROP) in a P2SH, wrapped in a P2SH (output as json)" + }, + { "exec": "./bitcoin-tx", "args": ["-create", "nversion=1", "in=4d49a71ec9da436f71ec4ee231d04f292a29cd316f598bb7068feccabdc59485:0", @@ -153,6 +193,42 @@ }, { "exec": "./bitcoin-tx", "args": + ["-create", "outpubkey=0:02a5613bd857b7048924264d1e70e08fb2a7e6527d32b7ab1bb993ac59964ff397", "nversion=1"], + "output_cmp": "txcreateoutpubkey1.hex", + "description": "Creates a new transaction with a single pay-to-pubkey output" + }, + { "exec": "./bitcoin-tx", + "args": + ["-json", "-create", "outpubkey=0:02a5613bd857b7048924264d1e70e08fb2a7e6527d32b7ab1bb993ac59964ff397", "nversion=1"], + "output_cmp": "txcreateoutpubkey1.json", + "description": "Creates a new transaction with a single pay-to-pubkey output (output as json)" + }, + { "exec": "./bitcoin-tx", + "args": + ["-create", "outpubkey=0:02a5613bd857b7048924264d1e70e08fb2a7e6527d32b7ab1bb993ac59964ff397:W", "nversion=1"], + "output_cmp": "txcreateoutpubkey2.hex", + "description": "Creates a new transaction with a single pay-to-witness-pubkey output" + }, + { "exec": "./bitcoin-tx", + "args": + ["-json", "-create", "outpubkey=0:02a5613bd857b7048924264d1e70e08fb2a7e6527d32b7ab1bb993ac59964ff397:W", "nversion=1"], + "output_cmp": "txcreateoutpubkey2.json", + "description": "Creates a new transaction with a single pay-to-witness-pubkey output (output as json)" + }, + { "exec": "./bitcoin-tx", + "args": + ["-create", "outpubkey=0:02a5613bd857b7048924264d1e70e08fb2a7e6527d32b7ab1bb993ac59964ff397:WS", "nversion=1"], + "output_cmp": "txcreateoutpubkey3.hex", + "description": "Creates a new transaction with a single pay-to-witness-pubkey, wrapped in P2SH output" + }, + { "exec": "./bitcoin-tx", + "args": + ["-json", "-create", "outpubkey=0:02a5613bd857b7048924264d1e70e08fb2a7e6527d32b7ab1bb993ac59964ff397:WS", "nversion=1"], + "output_cmp": "txcreateoutpubkey3.json", + "description": "Creates a new transaction with a single pay-to-pub-key output, wrapped in P2SH (output as json)" + }, + { "exec": "./bitcoin-tx", + "args": ["-create", "in=5897de6bd6027a475eadd57019d4e6872c396d0716c4875a5f1a6fcfdf385c1f:0", "outdata=4:badhexdata"], @@ -236,5 +312,45 @@ "in=5897de6bd6027a475eadd57019d4e6872c396d0716c4875a5f1a6fcfdf385c1f:0:1"], "output_cmp": "txcreatedata_seq1.json", "description": "Adds a new input with sequence number to a transaction (output in json)" + }, + { "exec": "./bitcoin-tx", + "args": ["-create", "outmultisig=1:2:3:02a5613bd857b7048924264d1e70e08fb2a7e6527d32b7ab1bb993ac59964ff397:021ac43c7ff740014c3b33737ede99c967e4764553d1b2b83db77c83b8715fa72d:02df2089105c77f266fa11a9d33f05c735234075f2e8780824c6b709415f9fb485", "nversion=1"], + "output_cmp": "txcreatemultisig1.hex", + "description": "Creates a new transaction with a single 2-of-3 multisig output" + }, + { "exec": "./bitcoin-tx", + "args": ["-json", "-create", "outmultisig=1:2:3:02a5613bd857b7048924264d1e70e08fb2a7e6527d32b7ab1bb993ac59964ff397:021ac43c7ff740014c3b33737ede99c967e4764553d1b2b83db77c83b8715fa72d:02df2089105c77f266fa11a9d33f05c735234075f2e8780824c6b709415f9fb485", "nversion=1"], + "output_cmp": "txcreatemultisig1.json", + "description": "Creates a new transaction with a single 2-of-3 multisig output (output in json)" + }, + { "exec": "./bitcoin-tx", + "args": ["-create", "outmultisig=1:2:3:02a5613bd857b7048924264d1e70e08fb2a7e6527d32b7ab1bb993ac59964ff397:021ac43c7ff740014c3b33737ede99c967e4764553d1b2b83db77c83b8715fa72d:02df2089105c77f266fa11a9d33f05c735234075f2e8780824c6b709415f9fb485:S", "nversion=1"], + "output_cmp": "txcreatemultisig2.hex", + "description": "Creates a new transaction with a single 2-of-3 multisig in a P2SH output" + }, + { "exec": "./bitcoin-tx", + "args": ["-json", "-create", "outmultisig=1:2:3:02a5613bd857b7048924264d1e70e08fb2a7e6527d32b7ab1bb993ac59964ff397:021ac43c7ff740014c3b33737ede99c967e4764553d1b2b83db77c83b8715fa72d:02df2089105c77f266fa11a9d33f05c735234075f2e8780824c6b709415f9fb485:S", "nversion=1"], + "output_cmp": "txcreatemultisig2.json", + "description": "Creates a new transaction with a single 2-of-3 multisig in a P2SH output (output in json)" + }, + { "exec": "./bitcoin-tx", + "args": ["-create", "outmultisig=1:2:3:02a5613bd857b7048924264d1e70e08fb2a7e6527d32b7ab1bb993ac59964ff397:021ac43c7ff740014c3b33737ede99c967e4764553d1b2b83db77c83b8715fa72d:02df2089105c77f266fa11a9d33f05c735234075f2e8780824c6b709415f9fb485:W", "nversion=1"], + "output_cmp": "txcreatemultisig3.hex", + "description": "Creates a new transaction with a single 2-of-3 multisig in a P2WSH output" + }, + { "exec": "./bitcoin-tx", + "args": ["-json", "-create", "outmultisig=1:2:3:02a5613bd857b7048924264d1e70e08fb2a7e6527d32b7ab1bb993ac59964ff397:021ac43c7ff740014c3b33737ede99c967e4764553d1b2b83db77c83b8715fa72d:02df2089105c77f266fa11a9d33f05c735234075f2e8780824c6b709415f9fb485:W", "nversion=1"], + "output_cmp": "txcreatemultisig3.json", + "description": "Creates a new transaction with a single 2-of-3 multisig in a P2WSH output (output in json)" + }, + { "exec": "./bitcoin-tx", + "args": ["-create", "outmultisig=1:2:3:02a5613bd857b7048924264d1e70e08fb2a7e6527d32b7ab1bb993ac59964ff397:021ac43c7ff740014c3b33737ede99c967e4764553d1b2b83db77c83b8715fa72d:02df2089105c77f266fa11a9d33f05c735234075f2e8780824c6b709415f9fb485:WS", "nversion=1"], + "output_cmp": "txcreatemultisig4.hex", + "description": "Creates a new transaction with a single 2-of-3 multisig in a P2WSH output, wrapped in P2SH" + }, + { "exec": "./bitcoin-tx", + "args": ["-json", "-create", "outmultisig=1:2:3:02a5613bd857b7048924264d1e70e08fb2a7e6527d32b7ab1bb993ac59964ff397:021ac43c7ff740014c3b33737ede99c967e4764553d1b2b83db77c83b8715fa72d:02df2089105c77f266fa11a9d33f05c735234075f2e8780824c6b709415f9fb485:WS", "nversion=1"], + "output_cmp": "txcreatemultisig4.json", + "description": "Creates a new transaction with a single 2-of-3 multisig in a P2WSH output, wrapped in P2SH (output in json)" } ] diff --git a/src/test/data/tx_invalid.json b/src/test/data/tx_invalid.json index f7d9e1847f..2235bd0ae7 100644 --- a/src/test/data/tx_invalid.json +++ b/src/test/data/tx_invalid.json @@ -1,7 +1,7 @@ [ ["The following are deserialized transactions which are invalid."], ["They are in the form"], -["[[[prevout hash, prevout index, prevout scriptPubKey], [input 2], ...],"], +["[[[prevout hash, prevout index, prevout scriptPubKey, amount?], [input 2], ...],"], ["serializedTransaction, verifyFlags]"], ["Objects that are only a single string (like this one) are ignored"], diff --git a/src/test/data/tx_valid.json b/src/test/data/tx_valid.json index a3f47fcee2..d70fa54333 100644 --- a/src/test/data/tx_valid.json +++ b/src/test/data/tx_valid.json @@ -1,7 +1,7 @@ [ ["The following are deserialized transactions which are valid."], ["They are in the form"], -["[[[prevout hash, prevout index, prevout scriptPubKey], [input 2], ...],"], +["[[[prevout hash, prevout index, prevout scriptPubKey, amount?], [input 2], ...],"], ["serializedTransaction, verifyFlags]"], ["Objects that are only a single string (like this one) are ignored"], diff --git a/src/test/data/txcreatemultisig1.hex b/src/test/data/txcreatemultisig1.hex new file mode 100644 index 0000000000..9c00004d38 --- /dev/null +++ b/src/test/data/txcreatemultisig1.hex @@ -0,0 +1 @@ +01000000000100e1f5050000000069522102a5613bd857b7048924264d1e70e08fb2a7e6527d32b7ab1bb993ac59964ff39721021ac43c7ff740014c3b33737ede99c967e4764553d1b2b83db77c83b8715fa72d2102df2089105c77f266fa11a9d33f05c735234075f2e8780824c6b709415f9fb48553ae00000000 diff --git a/src/test/data/txcreatemultisig1.json b/src/test/data/txcreatemultisig1.json new file mode 100644 index 0000000000..f6ce43c202 --- /dev/null +++ b/src/test/data/txcreatemultisig1.json @@ -0,0 +1,26 @@ +{ + "txid": "0d1d4edfc217d9db3ab6a9298f26a52eae3c52f55a6cb8ccbc14f7c727572894", + "hash": "0d1d4edfc217d9db3ab6a9298f26a52eae3c52f55a6cb8ccbc14f7c727572894", + "version": 1, + "locktime": 0, + "vin": [ + ], + "vout": [ + { + "value": 1.00, + "n": 0, + "scriptPubKey": { + "asm": "2 02a5613bd857b7048924264d1e70e08fb2a7e6527d32b7ab1bb993ac59964ff397 021ac43c7ff740014c3b33737ede99c967e4764553d1b2b83db77c83b8715fa72d 02df2089105c77f266fa11a9d33f05c735234075f2e8780824c6b709415f9fb485 3 OP_CHECKMULTISIG", + "hex": "522102a5613bd857b7048924264d1e70e08fb2a7e6527d32b7ab1bb993ac59964ff39721021ac43c7ff740014c3b33737ede99c967e4764553d1b2b83db77c83b8715fa72d2102df2089105c77f266fa11a9d33f05c735234075f2e8780824c6b709415f9fb48553ae", + "reqSigs": 2, + "type": "multisig", + "addresses": [ + "1FoG2386FG2tAJS9acMuiDsKy67aGg9MKz", + "1FXtz9KU8JNmQDyHdiEm5HDiALuP3zdHvV", + "14LuavcBbXZYJ6Tsz3cAUQj9SuQoL2xCQX" + ] + } + } + ], + "hex": "01000000000100e1f5050000000069522102a5613bd857b7048924264d1e70e08fb2a7e6527d32b7ab1bb993ac59964ff39721021ac43c7ff740014c3b33737ede99c967e4764553d1b2b83db77c83b8715fa72d2102df2089105c77f266fa11a9d33f05c735234075f2e8780824c6b709415f9fb48553ae00000000" +} diff --git a/src/test/data/txcreatemultisig2.hex b/src/test/data/txcreatemultisig2.hex new file mode 100644 index 0000000000..07835c54d3 --- /dev/null +++ b/src/test/data/txcreatemultisig2.hex @@ -0,0 +1 @@ +01000000000100e1f5050000000017a9141c6fbaf46d64221e80cbae182c33ddf81b9294ac8700000000 diff --git a/src/test/data/txcreatemultisig2.json b/src/test/data/txcreatemultisig2.json new file mode 100644 index 0000000000..e09d22060f --- /dev/null +++ b/src/test/data/txcreatemultisig2.json @@ -0,0 +1,24 @@ +{ + "txid": "0d861f278a3b7bce7cb5a88d71e6e6a903336f95ad5a2c29b295b63835b6eee3", + "hash": "0d861f278a3b7bce7cb5a88d71e6e6a903336f95ad5a2c29b295b63835b6eee3", + "version": 1, + "locktime": 0, + "vin": [ + ], + "vout": [ + { + "value": 1.00, + "n": 0, + "scriptPubKey": { + "asm": "OP_HASH160 1c6fbaf46d64221e80cbae182c33ddf81b9294ac OP_EQUAL", + "hex": "a9141c6fbaf46d64221e80cbae182c33ddf81b9294ac87", + "reqSigs": 1, + "type": "scripthash", + "addresses": [ + "34HNh57oBCRKkxNyjTuWAJkTbuGh6jg2Ms" + ] + } + } + ], + "hex": "01000000000100e1f5050000000017a9141c6fbaf46d64221e80cbae182c33ddf81b9294ac8700000000" +} diff --git a/src/test/data/txcreatemultisig3.hex b/src/test/data/txcreatemultisig3.hex new file mode 100644 index 0000000000..8d34f28f87 --- /dev/null +++ b/src/test/data/txcreatemultisig3.hex @@ -0,0 +1 @@ +01000000000100e1f50500000000220020e15a86a23178f433d514dbbce042e87d72662b8b5edcacfd2e37ab7a2d135f0500000000 diff --git a/src/test/data/txcreatemultisig3.json b/src/test/data/txcreatemultisig3.json new file mode 100644 index 0000000000..88e32bd310 --- /dev/null +++ b/src/test/data/txcreatemultisig3.json @@ -0,0 +1,20 @@ +{ + "txid": "ccc552220b46a3b5140048b03395987ce4f0fa1ddf8c635bba1fa44e0f8c1d7f", + "hash": "ccc552220b46a3b5140048b03395987ce4f0fa1ddf8c635bba1fa44e0f8c1d7f", + "version": 1, + "locktime": 0, + "vin": [ + ], + "vout": [ + { + "value": 1.00, + "n": 0, + "scriptPubKey": { + "asm": "0 e15a86a23178f433d514dbbce042e87d72662b8b5edcacfd2e37ab7a2d135f05", + "hex": "0020e15a86a23178f433d514dbbce042e87d72662b8b5edcacfd2e37ab7a2d135f05", + "type": "witness_v0_scripthash" + } + } + ], + "hex": "01000000000100e1f50500000000220020e15a86a23178f433d514dbbce042e87d72662b8b5edcacfd2e37ab7a2d135f0500000000" +} diff --git a/src/test/data/txcreatemultisig4.hex b/src/test/data/txcreatemultisig4.hex new file mode 100644 index 0000000000..7da54366c7 --- /dev/null +++ b/src/test/data/txcreatemultisig4.hex @@ -0,0 +1 @@ +01000000000100e1f5050000000017a9146edf12858999f0dae74f9c692e6694ee3621b2ac8700000000 diff --git a/src/test/data/txcreatemultisig4.json b/src/test/data/txcreatemultisig4.json new file mode 100644 index 0000000000..fc69c7269c --- /dev/null +++ b/src/test/data/txcreatemultisig4.json @@ -0,0 +1,24 @@ +{ + "txid": "5e8b1cc73234e208d4b7ca9075f136b908c34101be7a048df4ba9ac758b61567", + "hash": "5e8b1cc73234e208d4b7ca9075f136b908c34101be7a048df4ba9ac758b61567", + "version": 1, + "locktime": 0, + "vin": [ + ], + "vout": [ + { + "value": 1.00, + "n": 0, + "scriptPubKey": { + "asm": "OP_HASH160 6edf12858999f0dae74f9c692e6694ee3621b2ac OP_EQUAL", + "hex": "a9146edf12858999f0dae74f9c692e6694ee3621b2ac87", + "reqSigs": 1, + "type": "scripthash", + "addresses": [ + "3BoFUz1StqcNcgUTZE5cC1eFhuYFzj3fGH" + ] + } + } + ], + "hex": "01000000000100e1f5050000000017a9146edf12858999f0dae74f9c692e6694ee3621b2ac8700000000" +} diff --git a/src/test/data/txcreateoutpubkey1.hex b/src/test/data/txcreateoutpubkey1.hex new file mode 100644 index 0000000000..4a08244b2f --- /dev/null +++ b/src/test/data/txcreateoutpubkey1.hex @@ -0,0 +1 @@ +0100000000010000000000000000232102a5613bd857b7048924264d1e70e08fb2a7e6527d32b7ab1bb993ac59964ff397ac00000000 diff --git a/src/test/data/txcreateoutpubkey1.json b/src/test/data/txcreateoutpubkey1.json new file mode 100644 index 0000000000..6019fa2dcd --- /dev/null +++ b/src/test/data/txcreateoutpubkey1.json @@ -0,0 +1,24 @@ +{ + "txid": "f42b38ac12e3fafc96ba1a9ba70cbfe326744aef75df5fb9db5d6e2855ca415f", + "hash": "f42b38ac12e3fafc96ba1a9ba70cbfe326744aef75df5fb9db5d6e2855ca415f", + "version": 1, + "locktime": 0, + "vin": [ + ], + "vout": [ + { + "value": 0.00, + "n": 0, + "scriptPubKey": { + "asm": "02a5613bd857b7048924264d1e70e08fb2a7e6527d32b7ab1bb993ac59964ff397 OP_CHECKSIG", + "hex": "2102a5613bd857b7048924264d1e70e08fb2a7e6527d32b7ab1bb993ac59964ff397ac", + "reqSigs": 1, + "type": "pubkey", + "addresses": [ + "1FoG2386FG2tAJS9acMuiDsKy67aGg9MKz" + ] + } + } + ], + "hex": "0100000000010000000000000000232102a5613bd857b7048924264d1e70e08fb2a7e6527d32b7ab1bb993ac59964ff397ac00000000" +} diff --git a/src/test/data/txcreateoutpubkey2.hex b/src/test/data/txcreateoutpubkey2.hex new file mode 100644 index 0000000000..8283c722ab --- /dev/null +++ b/src/test/data/txcreateoutpubkey2.hex @@ -0,0 +1 @@ +0100000000010000000000000000160014a2516e770582864a6a56ed21a102044e388c62e300000000 diff --git a/src/test/data/txcreateoutpubkey2.json b/src/test/data/txcreateoutpubkey2.json new file mode 100644 index 0000000000..6fc3d57527 --- /dev/null +++ b/src/test/data/txcreateoutpubkey2.json @@ -0,0 +1,20 @@ +{ + "txid": "70f2a088cde460e677415fa1fb71895e90c231e6ed38ed203a35b6f848e9cc73", + "hash": "70f2a088cde460e677415fa1fb71895e90c231e6ed38ed203a35b6f848e9cc73", + "version": 1, + "locktime": 0, + "vin": [ + ], + "vout": [ + { + "value": 0.00, + "n": 0, + "scriptPubKey": { + "asm": "0 a2516e770582864a6a56ed21a102044e388c62e3", + "hex": "0014a2516e770582864a6a56ed21a102044e388c62e3", + "type": "witness_v0_keyhash" + } + } + ], + "hex": "0100000000010000000000000000160014a2516e770582864a6a56ed21a102044e388c62e300000000" +} diff --git a/src/test/data/txcreateoutpubkey3.hex b/src/test/data/txcreateoutpubkey3.hex new file mode 100644 index 0000000000..84adff4d89 --- /dev/null +++ b/src/test/data/txcreateoutpubkey3.hex @@ -0,0 +1 @@ +010000000001000000000000000017a914a5ab14c9804d0d8bf02f1aea4e82780733ad0a838700000000 diff --git a/src/test/data/txcreateoutpubkey3.json b/src/test/data/txcreateoutpubkey3.json new file mode 100644 index 0000000000..a1a25fc834 --- /dev/null +++ b/src/test/data/txcreateoutpubkey3.json @@ -0,0 +1,24 @@ +{ + "txid": "bfc7e898ee9f6a9652d7b8cca147e2da134502e2ada0f279ed634fc8cf833f8c", + "hash": "bfc7e898ee9f6a9652d7b8cca147e2da134502e2ada0f279ed634fc8cf833f8c", + "version": 1, + "locktime": 0, + "vin": [ + ], + "vout": [ + { + "value": 0.00, + "n": 0, + "scriptPubKey": { + "asm": "OP_HASH160 a5ab14c9804d0d8bf02f1aea4e82780733ad0a83 OP_EQUAL", + "hex": "a914a5ab14c9804d0d8bf02f1aea4e82780733ad0a8387", + "reqSigs": 1, + "type": "scripthash", + "addresses": [ + "3GnzN8FqgvYGYdhj8NW6UNxxVv3Uj1ApQn" + ] + } + } + ], + "hex": "010000000001000000000000000017a914a5ab14c9804d0d8bf02f1aea4e82780733ad0a838700000000" +} diff --git a/src/test/data/txcreatescript1.hex b/src/test/data/txcreatescript1.hex new file mode 100644 index 0000000000..0adce270fb --- /dev/null +++ b/src/test/data/txcreatescript1.hex @@ -0,0 +1 @@ +0100000000010000000000000000017500000000 diff --git a/src/test/data/txcreatescript1.json b/src/test/data/txcreatescript1.json new file mode 100644 index 0000000000..8ffecba411 --- /dev/null +++ b/src/test/data/txcreatescript1.json @@ -0,0 +1,20 @@ +{ + "txid": "f0851b68202f736b792649cfc960259c2374badcb644ab20cac726b5f72f61c9", + "hash": "f0851b68202f736b792649cfc960259c2374badcb644ab20cac726b5f72f61c9", + "version": 1, + "locktime": 0, + "vin": [ + ], + "vout": [ + { + "value": 0.00, + "n": 0, + "scriptPubKey": { + "asm": "OP_DROP", + "hex": "75", + "type": "nonstandard" + } + } + ], + "hex": "0100000000010000000000000000017500000000" +} diff --git a/src/test/data/txcreatescript2.hex b/src/test/data/txcreatescript2.hex new file mode 100644 index 0000000000..5afe8786e3 --- /dev/null +++ b/src/test/data/txcreatescript2.hex @@ -0,0 +1 @@ +010000000001000000000000000017a91471ed53322d470bb96657deb786b94f97dd46fb158700000000 diff --git a/src/test/data/txcreatescript2.json b/src/test/data/txcreatescript2.json new file mode 100644 index 0000000000..41eb69f1af --- /dev/null +++ b/src/test/data/txcreatescript2.json @@ -0,0 +1,24 @@ +{ + "txid": "6e07a7cc075e0703f32ee8c4e5373fe654bfbc315148fda364e1be286ff290d0", + "hash": "6e07a7cc075e0703f32ee8c4e5373fe654bfbc315148fda364e1be286ff290d0", + "version": 1, + "locktime": 0, + "vin": [ + ], + "vout": [ + { + "value": 0.00, + "n": 0, + "scriptPubKey": { + "asm": "OP_HASH160 71ed53322d470bb96657deb786b94f97dd46fb15 OP_EQUAL", + "hex": "a91471ed53322d470bb96657deb786b94f97dd46fb1587", + "reqSigs": 1, + "type": "scripthash", + "addresses": [ + "3C5QarEGh9feKbDJ3QbMf2YNjnMoiPDhNp" + ] + } + } + ], + "hex": "010000000001000000000000000017a91471ed53322d470bb96657deb786b94f97dd46fb158700000000" +} diff --git a/src/test/data/txcreatescript3.hex b/src/test/data/txcreatescript3.hex new file mode 100644 index 0000000000..8a2b973bf0 --- /dev/null +++ b/src/test/data/txcreatescript3.hex @@ -0,0 +1 @@ +01000000000100000000000000002200200bfe935e70c321c7ca3afc75ce0d0ca2f98b5422e008bb31c00c6d7f1f1c0ad600000000 diff --git a/src/test/data/txcreatescript3.json b/src/test/data/txcreatescript3.json new file mode 100644 index 0000000000..90e7e27f9f --- /dev/null +++ b/src/test/data/txcreatescript3.json @@ -0,0 +1,20 @@ +{ + "txid": "8a234037b088e987c877030efc83374a07441c321bf9dc6dd2f206bc26507df8", + "hash": "8a234037b088e987c877030efc83374a07441c321bf9dc6dd2f206bc26507df8", + "version": 1, + "locktime": 0, + "vin": [ + ], + "vout": [ + { + "value": 0.00, + "n": 0, + "scriptPubKey": { + "asm": "0 0bfe935e70c321c7ca3afc75ce0d0ca2f98b5422e008bb31c00c6d7f1f1c0ad6", + "hex": "00200bfe935e70c321c7ca3afc75ce0d0ca2f98b5422e008bb31c00c6d7f1f1c0ad6", + "type": "witness_v0_scripthash" + } + } + ], + "hex": "01000000000100000000000000002200200bfe935e70c321c7ca3afc75ce0d0ca2f98b5422e008bb31c00c6d7f1f1c0ad600000000" +} diff --git a/src/test/data/txcreatescript4.hex b/src/test/data/txcreatescript4.hex new file mode 100644 index 0000000000..b4cfe58f42 --- /dev/null +++ b/src/test/data/txcreatescript4.hex @@ -0,0 +1 @@ +010000000001000000000000000017a9146a2c482f4985f57e702f325816c90e3723ca81ae8700000000 diff --git a/src/test/data/txcreatescript4.json b/src/test/data/txcreatescript4.json new file mode 100644 index 0000000000..11783751a4 --- /dev/null +++ b/src/test/data/txcreatescript4.json @@ -0,0 +1,24 @@ +{ + "txid": "24225cf5e9391100d6b218134b9f03383ca4c880a1f634ac12990cf28b66adbc", + "hash": "24225cf5e9391100d6b218134b9f03383ca4c880a1f634ac12990cf28b66adbc", + "version": 1, + "locktime": 0, + "vin": [ + ], + "vout": [ + { + "value": 0.00, + "n": 0, + "scriptPubKey": { + "asm": "OP_HASH160 6a2c482f4985f57e702f325816c90e3723ca81ae OP_EQUAL", + "hex": "a9146a2c482f4985f57e702f325816c90e3723ca81ae87", + "reqSigs": 1, + "type": "scripthash", + "addresses": [ + "3BNQbeFeJJGMAyDxPwWPuqxPMrjsFLjk3f" + ] + } + } + ], + "hex": "010000000001000000000000000017a9146a2c482f4985f57e702f325816c90e3723ca81ae8700000000" +} diff --git a/src/test/dbwrapper_tests.cpp b/src/test/dbwrapper_tests.cpp index e5cb48ffcf..22c90bd95b 100644 --- a/src/test/dbwrapper_tests.cpp +++ b/src/test/dbwrapper_tests.cpp @@ -76,7 +76,7 @@ BOOST_AUTO_TEST_CASE(dbwrapper_batch) BOOST_CHECK(dbw.Read(key2, res)); BOOST_CHECK_EQUAL(res.ToString(), in2.ToString()); - // key3 never should've been written + // key3 should've never been written BOOST_CHECK(dbw.Read(key3, res) == false); } } @@ -277,7 +277,7 @@ BOOST_AUTO_TEST_CASE(iterator_string_ordering) CDBWrapper dbw(ph, (1 << 20), true, false, false); for (int x=0x00; x<10; ++x) { for (int y = 0; y < 10; y++) { - sprintf(buf, "%d", x); + snprintf(buf, sizeof(buf), "%d", x); StringContentsSerializer key(buf); for (int z = 0; z < y; z++) key += key; @@ -293,12 +293,12 @@ BOOST_AUTO_TEST_CASE(iterator_string_ordering) seek_start = 0; else seek_start = 5; - sprintf(buf, "%d", seek_start); + snprintf(buf, sizeof(buf), "%d", seek_start); StringContentsSerializer seek_key(buf); it->Seek(seek_key); for (int x=seek_start; x<10; ++x) { for (int y = 0; y < 10; y++) { - sprintf(buf, "%d", x); + snprintf(buf, sizeof(buf), "%d", x); std::string exp_key(buf); for (int z = 0; z < y; z++) exp_key += exp_key; diff --git a/src/test/limitedmap_tests.cpp b/src/test/limitedmap_tests.cpp index 55b9be5b00..b071ab117b 100644 --- a/src/test/limitedmap_tests.cpp +++ b/src/test/limitedmap_tests.cpp @@ -27,7 +27,7 @@ BOOST_AUTO_TEST_CASE(limitedmap_test) // make sure that the size is updated BOOST_CHECK(map.size() == 1); - // make sure that the new items is in the map + // make sure that the new item is in the map BOOST_CHECK(map.count(-1) == 1); // insert 10 new items diff --git a/src/test/mempool_tests.cpp b/src/test/mempool_tests.cpp index 91f549fe48..51b28d09fa 100644 --- a/src/test/mempool_tests.cpp +++ b/src/test/mempool_tests.cpp @@ -54,7 +54,7 @@ BOOST_AUTO_TEST_CASE(MempoolRemoveTest) } - CTxMemPool testPool(CFeeRate(0)); + CTxMemPool testPool; // Nothing in pool, remove should do nothing: unsigned int poolSize = testPool.size(); @@ -118,7 +118,7 @@ void CheckSort(CTxMemPool &pool, std::vector<std::string> &sortedOrder) BOOST_AUTO_TEST_CASE(MempoolIndexingTest) { - CTxMemPool pool(CFeeRate(0)); + CTxMemPool pool; TestMemPoolEntryHelper entry; /* 3rd highest fee */ @@ -126,28 +126,28 @@ BOOST_AUTO_TEST_CASE(MempoolIndexingTest) tx1.vout.resize(1); tx1.vout[0].scriptPubKey = CScript() << OP_11 << OP_EQUAL; tx1.vout[0].nValue = 10 * COIN; - pool.addUnchecked(tx1.GetHash(), entry.Fee(10000LL).Priority(10.0).FromTx(tx1)); + pool.addUnchecked(tx1.GetHash(), entry.Fee(10000LL).FromTx(tx1)); /* highest fee */ CMutableTransaction tx2 = CMutableTransaction(); tx2.vout.resize(1); tx2.vout[0].scriptPubKey = CScript() << OP_11 << OP_EQUAL; tx2.vout[0].nValue = 2 * COIN; - pool.addUnchecked(tx2.GetHash(), entry.Fee(20000LL).Priority(9.0).FromTx(tx2)); + pool.addUnchecked(tx2.GetHash(), entry.Fee(20000LL).FromTx(tx2)); /* lowest fee */ CMutableTransaction tx3 = CMutableTransaction(); tx3.vout.resize(1); tx3.vout[0].scriptPubKey = CScript() << OP_11 << OP_EQUAL; tx3.vout[0].nValue = 5 * COIN; - pool.addUnchecked(tx3.GetHash(), entry.Fee(0LL).Priority(100.0).FromTx(tx3)); + pool.addUnchecked(tx3.GetHash(), entry.Fee(0LL).FromTx(tx3)); /* 2nd highest fee */ CMutableTransaction tx4 = CMutableTransaction(); tx4.vout.resize(1); tx4.vout[0].scriptPubKey = CScript() << OP_11 << OP_EQUAL; tx4.vout[0].nValue = 6 * COIN; - pool.addUnchecked(tx4.GetHash(), entry.Fee(15000LL).Priority(1.0).FromTx(tx4)); + pool.addUnchecked(tx4.GetHash(), entry.Fee(15000LL).FromTx(tx4)); /* equal fee rate to tx1, but newer */ CMutableTransaction tx5 = CMutableTransaction(); @@ -155,7 +155,6 @@ BOOST_AUTO_TEST_CASE(MempoolIndexingTest) tx5.vout[0].scriptPubKey = CScript() << OP_11 << OP_EQUAL; tx5.vout[0].nValue = 11 * COIN; entry.nTime = 1; - entry.dPriority = 10.0; pool.addUnchecked(tx5.GetHash(), entry.Fee(10000LL).FromTx(tx5)); BOOST_CHECK_EQUAL(pool.size(), 5); @@ -320,7 +319,7 @@ BOOST_AUTO_TEST_CASE(MempoolIndexingTest) BOOST_AUTO_TEST_CASE(MempoolAncestorIndexingTest) { - CTxMemPool pool(CFeeRate(0)); + CTxMemPool pool; TestMemPoolEntryHelper entry; /* 3rd highest fee */ @@ -328,14 +327,14 @@ BOOST_AUTO_TEST_CASE(MempoolAncestorIndexingTest) tx1.vout.resize(1); tx1.vout[0].scriptPubKey = CScript() << OP_11 << OP_EQUAL; tx1.vout[0].nValue = 10 * COIN; - pool.addUnchecked(tx1.GetHash(), entry.Fee(10000LL).Priority(10.0).FromTx(tx1)); + pool.addUnchecked(tx1.GetHash(), entry.Fee(10000LL).FromTx(tx1)); /* highest fee */ CMutableTransaction tx2 = CMutableTransaction(); tx2.vout.resize(1); tx2.vout[0].scriptPubKey = CScript() << OP_11 << OP_EQUAL; tx2.vout[0].nValue = 2 * COIN; - pool.addUnchecked(tx2.GetHash(), entry.Fee(20000LL).Priority(9.0).FromTx(tx2)); + pool.addUnchecked(tx2.GetHash(), entry.Fee(20000LL).FromTx(tx2)); uint64_t tx2Size = GetVirtualTransactionSize(tx2); /* lowest fee */ @@ -343,14 +342,14 @@ BOOST_AUTO_TEST_CASE(MempoolAncestorIndexingTest) tx3.vout.resize(1); tx3.vout[0].scriptPubKey = CScript() << OP_11 << OP_EQUAL; tx3.vout[0].nValue = 5 * COIN; - pool.addUnchecked(tx3.GetHash(), entry.Fee(0LL).Priority(100.0).FromTx(tx3)); + pool.addUnchecked(tx3.GetHash(), entry.Fee(0LL).FromTx(tx3)); /* 2nd highest fee */ CMutableTransaction tx4 = CMutableTransaction(); tx4.vout.resize(1); tx4.vout[0].scriptPubKey = CScript() << OP_11 << OP_EQUAL; tx4.vout[0].nValue = 6 * COIN; - pool.addUnchecked(tx4.GetHash(), entry.Fee(15000LL).Priority(1.0).FromTx(tx4)); + pool.addUnchecked(tx4.GetHash(), entry.Fee(15000LL).FromTx(tx4)); /* equal fee rate to tx1, but newer */ CMutableTransaction tx5 = CMutableTransaction(); @@ -408,7 +407,6 @@ BOOST_AUTO_TEST_CASE(MempoolAncestorIndexingTest) /* set the fee to just below tx2's feerate when including ancestor */ CAmount fee = (20000/tx2Size)*(tx7Size + tx6Size) - 1; - //CTxMemPoolEntry entry7(tx7, fee, 2, 10.0, 1, true); pool.addUnchecked(tx7.GetHash(), entry.Fee(fee).FromTx(tx7)); BOOST_CHECK_EQUAL(pool.size(), 7); sortedOrder.insert(sortedOrder.begin()+1, tx7.GetHash().ToString()); @@ -432,9 +430,8 @@ BOOST_AUTO_TEST_CASE(MempoolAncestorIndexingTest) BOOST_AUTO_TEST_CASE(MempoolSizeLimitTest) { - CTxMemPool pool(CFeeRate(1000)); + CTxMemPool pool; TestMemPoolEntryHelper entry; - entry.dPriority = 10.0; CMutableTransaction tx1 = CMutableTransaction(); tx1.vin.resize(1); @@ -442,7 +439,7 @@ BOOST_AUTO_TEST_CASE(MempoolSizeLimitTest) tx1.vout.resize(1); tx1.vout[0].scriptPubKey = CScript() << OP_1 << OP_EQUAL; tx1.vout[0].nValue = 10 * COIN; - pool.addUnchecked(tx1.GetHash(), entry.Fee(10000LL).FromTx(tx1, &pool)); + pool.addUnchecked(tx1.GetHash(), entry.Fee(10000LL).FromTx(tx1)); CMutableTransaction tx2 = CMutableTransaction(); tx2.vin.resize(1); @@ -450,7 +447,7 @@ BOOST_AUTO_TEST_CASE(MempoolSizeLimitTest) tx2.vout.resize(1); tx2.vout[0].scriptPubKey = CScript() << OP_2 << OP_EQUAL; tx2.vout[0].nValue = 10 * COIN; - pool.addUnchecked(tx2.GetHash(), entry.Fee(5000LL).FromTx(tx2, &pool)); + pool.addUnchecked(tx2.GetHash(), entry.Fee(5000LL).FromTx(tx2)); pool.TrimToSize(pool.DynamicMemoryUsage()); // should do nothing BOOST_CHECK(pool.exists(tx1.GetHash())); @@ -460,7 +457,7 @@ BOOST_AUTO_TEST_CASE(MempoolSizeLimitTest) BOOST_CHECK(pool.exists(tx1.GetHash())); BOOST_CHECK(!pool.exists(tx2.GetHash())); - pool.addUnchecked(tx2.GetHash(), entry.FromTx(tx2, &pool)); + pool.addUnchecked(tx2.GetHash(), entry.FromTx(tx2)); CMutableTransaction tx3 = CMutableTransaction(); tx3.vin.resize(1); tx3.vin[0].prevout = COutPoint(tx2.GetHash(), 0); @@ -468,7 +465,7 @@ BOOST_AUTO_TEST_CASE(MempoolSizeLimitTest) tx3.vout.resize(1); tx3.vout[0].scriptPubKey = CScript() << OP_3 << OP_EQUAL; tx3.vout[0].nValue = 10 * COIN; - pool.addUnchecked(tx3.GetHash(), entry.Fee(20000LL).FromTx(tx3, &pool)); + pool.addUnchecked(tx3.GetHash(), entry.Fee(20000LL).FromTx(tx3)); pool.TrimToSize(pool.DynamicMemoryUsage() * 3 / 4); // tx3 should pay for tx2 (CPFP) BOOST_CHECK(!pool.exists(tx1.GetHash())); @@ -531,10 +528,10 @@ BOOST_AUTO_TEST_CASE(MempoolSizeLimitTest) tx7.vout[1].scriptPubKey = CScript() << OP_7 << OP_EQUAL; tx7.vout[1].nValue = 10 * COIN; - pool.addUnchecked(tx4.GetHash(), entry.Fee(7000LL).FromTx(tx4, &pool)); - pool.addUnchecked(tx5.GetHash(), entry.Fee(1000LL).FromTx(tx5, &pool)); - pool.addUnchecked(tx6.GetHash(), entry.Fee(1100LL).FromTx(tx6, &pool)); - pool.addUnchecked(tx7.GetHash(), entry.Fee(9000LL).FromTx(tx7, &pool)); + pool.addUnchecked(tx4.GetHash(), entry.Fee(7000LL).FromTx(tx4)); + pool.addUnchecked(tx5.GetHash(), entry.Fee(1000LL).FromTx(tx5)); + pool.addUnchecked(tx6.GetHash(), entry.Fee(1100LL).FromTx(tx6)); + pool.addUnchecked(tx7.GetHash(), entry.Fee(9000LL).FromTx(tx7)); // we only require this remove, at max, 2 txn, because its not clear what we're really optimizing for aside from that pool.TrimToSize(pool.DynamicMemoryUsage() - 1); @@ -543,8 +540,8 @@ BOOST_AUTO_TEST_CASE(MempoolSizeLimitTest) BOOST_CHECK(!pool.exists(tx7.GetHash())); if (!pool.exists(tx5.GetHash())) - pool.addUnchecked(tx5.GetHash(), entry.Fee(1000LL).FromTx(tx5, &pool)); - pool.addUnchecked(tx7.GetHash(), entry.Fee(9000LL).FromTx(tx7, &pool)); + pool.addUnchecked(tx5.GetHash(), entry.Fee(1000LL).FromTx(tx5)); + pool.addUnchecked(tx7.GetHash(), entry.Fee(9000LL).FromTx(tx7)); pool.TrimToSize(pool.DynamicMemoryUsage() / 2); // should maximize mempool size by only removing 5/7 BOOST_CHECK(pool.exists(tx4.GetHash())); @@ -552,8 +549,8 @@ BOOST_AUTO_TEST_CASE(MempoolSizeLimitTest) BOOST_CHECK(pool.exists(tx6.GetHash())); BOOST_CHECK(!pool.exists(tx7.GetHash())); - pool.addUnchecked(tx5.GetHash(), entry.Fee(1000LL).FromTx(tx5, &pool)); - pool.addUnchecked(tx7.GetHash(), entry.Fee(9000LL).FromTx(tx7, &pool)); + pool.addUnchecked(tx5.GetHash(), entry.Fee(1000LL).FromTx(tx5)); + pool.addUnchecked(tx7.GetHash(), entry.Fee(9000LL).FromTx(tx7)); std::vector<CTransactionRef> vtx; SetMockTime(42); diff --git a/src/test/miner_tests.cpp b/src/test/miner_tests.cpp index 2f74f57d00..41f42c7b88 100644 --- a/src/test/miner_tests.cpp +++ b/src/test/miner_tests.cpp @@ -9,6 +9,7 @@ #include "consensus/validation.h" #include "validation.h" #include "miner.h" +#include "policy/policy.h" #include "pubkey.h" #include "script/standard.h" #include "txmempool.h" @@ -24,6 +25,17 @@ BOOST_FIXTURE_TEST_SUITE(miner_tests, TestingSetup) +static CFeeRate blockMinFeeRate = CFeeRate(DEFAULT_BLOCK_MIN_TX_FEE); + +static BlockAssembler AssemblerForTest(const CChainParams& params) { + BlockAssembler::Options options; + + options.nBlockMaxWeight = MAX_BLOCK_WEIGHT; + options.nBlockMaxSize = MAX_BLOCK_SERIALIZED_SIZE; + options.blockMinFeeRate = blockMinFeeRate; + return BlockAssembler(params, options); +} + static struct { unsigned char extranonce; @@ -76,7 +88,6 @@ bool TestSequenceLocks(const CTransaction &tx, int flags) // Test suite for ancestor feerate transaction selection. // Implemented as an additional function, rather than a separate test case, // to allow reusing the blockchain created in CreateNewBlock_validity. -// Note that this test assumes blockprioritysize is 0. void TestPackageSelection(const CChainParams& chainparams, CScript scriptPubKey, std::vector<CTransactionRef>& txFirst) { // Test the ancestor feerate transaction selection. @@ -107,12 +118,12 @@ void TestPackageSelection(const CChainParams& chainparams, CScript scriptPubKey, uint256 hashHighFeeTx = tx.GetHash(); mempool.addUnchecked(hashHighFeeTx, entry.Fee(50000).Time(GetTime()).SpendsCoinbase(false).FromTx(tx)); - std::unique_ptr<CBlockTemplate> pblocktemplate = BlockAssembler(chainparams).CreateNewBlock(scriptPubKey); + std::unique_ptr<CBlockTemplate> pblocktemplate = AssemblerForTest(chainparams).CreateNewBlock(scriptPubKey); BOOST_CHECK(pblocktemplate->block.vtx[1]->GetHash() == hashParentTx); BOOST_CHECK(pblocktemplate->block.vtx[2]->GetHash() == hashHighFeeTx); BOOST_CHECK(pblocktemplate->block.vtx[3]->GetHash() == hashMediumFeeTx); - // Test that a package below the min relay fee doesn't get included + // Test that a package below the block min tx fee doesn't get included tx.vin[0].prevout.hash = hashHighFeeTx; tx.vout[0].nValue = 5000000000LL - 1000 - 50000; // 0 fee uint256 hashFreeTx = tx.GetHash(); @@ -120,14 +131,14 @@ void TestPackageSelection(const CChainParams& chainparams, CScript scriptPubKey, size_t freeTxSize = ::GetSerializeSize(tx, SER_NETWORK, PROTOCOL_VERSION); // Calculate a fee on child transaction that will put the package just - // below the min relay fee (assuming 1 child tx of the same size). - CAmount feeToUse = minRelayTxFee.GetFee(2*freeTxSize) - 1; + // below the block min tx fee (assuming 1 child tx of the same size). + CAmount feeToUse = blockMinFeeRate.GetFee(2*freeTxSize) - 1; tx.vin[0].prevout.hash = hashFreeTx; tx.vout[0].nValue = 5000000000LL - 1000 - 50000 - feeToUse; uint256 hashLowFeeTx = tx.GetHash(); mempool.addUnchecked(hashLowFeeTx, entry.Fee(feeToUse).FromTx(tx)); - pblocktemplate = BlockAssembler(chainparams).CreateNewBlock(scriptPubKey); + pblocktemplate = AssemblerForTest(chainparams).CreateNewBlock(scriptPubKey); // Verify that the free tx and the low fee tx didn't get selected for (size_t i=0; i<pblocktemplate->block.vtx.size(); ++i) { BOOST_CHECK(pblocktemplate->block.vtx[i]->GetHash() != hashFreeTx); @@ -141,7 +152,7 @@ void TestPackageSelection(const CChainParams& chainparams, CScript scriptPubKey, tx.vout[0].nValue -= 2; // Now we should be just over the min relay fee hashLowFeeTx = tx.GetHash(); mempool.addUnchecked(hashLowFeeTx, entry.Fee(feeToUse+2).FromTx(tx)); - pblocktemplate = BlockAssembler(chainparams).CreateNewBlock(scriptPubKey); + pblocktemplate = AssemblerForTest(chainparams).CreateNewBlock(scriptPubKey); BOOST_CHECK(pblocktemplate->block.vtx[4]->GetHash() == hashFreeTx); BOOST_CHECK(pblocktemplate->block.vtx[5]->GetHash() == hashLowFeeTx); @@ -158,11 +169,11 @@ void TestPackageSelection(const CChainParams& chainparams, CScript scriptPubKey, // This tx can't be mined by itself tx.vin[0].prevout.hash = hashFreeTx2; tx.vout.resize(1); - feeToUse = minRelayTxFee.GetFee(freeTxSize); + feeToUse = blockMinFeeRate.GetFee(freeTxSize); tx.vout[0].nValue = 5000000000LL - 100000000 - feeToUse; uint256 hashLowFeeTx2 = tx.GetHash(); mempool.addUnchecked(hashLowFeeTx2, entry.Fee(feeToUse).SpendsCoinbase(false).FromTx(tx)); - pblocktemplate = BlockAssembler(chainparams).CreateNewBlock(scriptPubKey); + pblocktemplate = AssemblerForTest(chainparams).CreateNewBlock(scriptPubKey); // Verify that this tx isn't selected. for (size_t i=0; i<pblocktemplate->block.vtx.size(); ++i) { @@ -175,7 +186,7 @@ void TestPackageSelection(const CChainParams& chainparams, CScript scriptPubKey, tx.vin[0].prevout.n = 1; tx.vout[0].nValue = 100000000 - 10000; // 10k satoshi fee mempool.addUnchecked(tx.GetHash(), entry.Fee(10000).FromTx(tx)); - pblocktemplate = BlockAssembler(chainparams).CreateNewBlock(scriptPubKey); + pblocktemplate = AssemblerForTest(chainparams).CreateNewBlock(scriptPubKey); BOOST_CHECK(pblocktemplate->block.vtx[8]->GetHash() == hashLowFeeTx2); } @@ -191,14 +202,13 @@ BOOST_AUTO_TEST_CASE(CreateNewBlock_validity) uint256 hash; TestMemPoolEntryHelper entry; entry.nFee = 11; - entry.dPriority = 111.0; entry.nHeight = 11; LOCK(cs_main); fCheckpointsEnabled = false; // Simple block creation, nothing special yet: - BOOST_CHECK(pblocktemplate = BlockAssembler(chainparams).CreateNewBlock(scriptPubKey)); + BOOST_CHECK(pblocktemplate = AssemblerForTest(chainparams).CreateNewBlock(scriptPubKey)); // We can't make transactions until we have inputs // Therefore, load 100 blocks :) @@ -229,7 +239,7 @@ BOOST_AUTO_TEST_CASE(CreateNewBlock_validity) } // Just to make sure we can still make simple blocks - BOOST_CHECK(pblocktemplate = BlockAssembler(chainparams).CreateNewBlock(scriptPubKey)); + BOOST_CHECK(pblocktemplate = AssemblerForTest(chainparams).CreateNewBlock(scriptPubKey)); const CAmount BLOCKSUBSIDY = 50*COIN; const CAmount LOWFEE = CENT; @@ -253,7 +263,7 @@ BOOST_AUTO_TEST_CASE(CreateNewBlock_validity) mempool.addUnchecked(hash, entry.Fee(LOWFEE).Time(GetTime()).SpendsCoinbase(spendsCoinbase).FromTx(tx)); tx.vin[0].prevout.hash = hash; } - BOOST_CHECK_THROW(BlockAssembler(chainparams).CreateNewBlock(scriptPubKey), std::runtime_error); + BOOST_CHECK_THROW(AssemblerForTest(chainparams).CreateNewBlock(scriptPubKey), std::runtime_error); mempool.clear(); tx.vin[0].prevout.hash = txFirst[0]->GetHash(); @@ -267,7 +277,7 @@ BOOST_AUTO_TEST_CASE(CreateNewBlock_validity) mempool.addUnchecked(hash, entry.Fee(LOWFEE).Time(GetTime()).SpendsCoinbase(spendsCoinbase).SigOpsCost(80).FromTx(tx)); tx.vin[0].prevout.hash = hash; } - BOOST_CHECK(pblocktemplate = BlockAssembler(chainparams).CreateNewBlock(scriptPubKey)); + BOOST_CHECK(pblocktemplate = AssemblerForTest(chainparams).CreateNewBlock(scriptPubKey)); mempool.clear(); // block size > limit @@ -287,16 +297,16 @@ BOOST_AUTO_TEST_CASE(CreateNewBlock_validity) mempool.addUnchecked(hash, entry.Fee(LOWFEE).Time(GetTime()).SpendsCoinbase(spendsCoinbase).FromTx(tx)); tx.vin[0].prevout.hash = hash; } - BOOST_CHECK(pblocktemplate = BlockAssembler(chainparams).CreateNewBlock(scriptPubKey)); + BOOST_CHECK(pblocktemplate = AssemblerForTest(chainparams).CreateNewBlock(scriptPubKey)); mempool.clear(); // orphan in mempool, template creation fails hash = tx.GetHash(); mempool.addUnchecked(hash, entry.Fee(LOWFEE).Time(GetTime()).FromTx(tx)); - BOOST_CHECK_THROW(BlockAssembler(chainparams).CreateNewBlock(scriptPubKey), std::runtime_error); + BOOST_CHECK_THROW(AssemblerForTest(chainparams).CreateNewBlock(scriptPubKey), std::runtime_error); mempool.clear(); - // child with higher priority than parent + // child with higher feerate than parent tx.vin[0].scriptSig = CScript() << OP_1; tx.vin[0].prevout.hash = txFirst[1]->GetHash(); tx.vout[0].nValue = BLOCKSUBSIDY-HIGHFEE; @@ -310,7 +320,7 @@ BOOST_AUTO_TEST_CASE(CreateNewBlock_validity) tx.vout[0].nValue = tx.vout[0].nValue+BLOCKSUBSIDY-HIGHERFEE; //First txn output + fresh coinbase - new txn fee hash = tx.GetHash(); mempool.addUnchecked(hash, entry.Fee(HIGHERFEE).Time(GetTime()).SpendsCoinbase(true).FromTx(tx)); - BOOST_CHECK(pblocktemplate = BlockAssembler(chainparams).CreateNewBlock(scriptPubKey)); + BOOST_CHECK(pblocktemplate = AssemblerForTest(chainparams).CreateNewBlock(scriptPubKey)); mempool.clear(); // coinbase in mempool, template creation fails @@ -321,7 +331,7 @@ BOOST_AUTO_TEST_CASE(CreateNewBlock_validity) hash = tx.GetHash(); // give it a fee so it'll get mined mempool.addUnchecked(hash, entry.Fee(LOWFEE).Time(GetTime()).SpendsCoinbase(false).FromTx(tx)); - BOOST_CHECK_THROW(BlockAssembler(chainparams).CreateNewBlock(scriptPubKey), std::runtime_error); + BOOST_CHECK_THROW(AssemblerForTest(chainparams).CreateNewBlock(scriptPubKey), std::runtime_error); mempool.clear(); // invalid (pre-p2sh) txn in mempool, template creation fails @@ -338,7 +348,7 @@ BOOST_AUTO_TEST_CASE(CreateNewBlock_validity) tx.vout[0].nValue -= LOWFEE; hash = tx.GetHash(); mempool.addUnchecked(hash, entry.Fee(LOWFEE).Time(GetTime()).SpendsCoinbase(false).FromTx(tx)); - BOOST_CHECK_THROW(BlockAssembler(chainparams).CreateNewBlock(scriptPubKey), std::runtime_error); + BOOST_CHECK_THROW(AssemblerForTest(chainparams).CreateNewBlock(scriptPubKey), std::runtime_error); mempool.clear(); // double spend txn pair in mempool, template creation fails @@ -351,7 +361,7 @@ BOOST_AUTO_TEST_CASE(CreateNewBlock_validity) tx.vout[0].scriptPubKey = CScript() << OP_2; hash = tx.GetHash(); mempool.addUnchecked(hash, entry.Fee(HIGHFEE).Time(GetTime()).SpendsCoinbase(true).FromTx(tx)); - BOOST_CHECK_THROW(BlockAssembler(chainparams).CreateNewBlock(scriptPubKey), std::runtime_error); + BOOST_CHECK_THROW(AssemblerForTest(chainparams).CreateNewBlock(scriptPubKey), std::runtime_error); mempool.clear(); // subsidy changing @@ -367,7 +377,7 @@ BOOST_AUTO_TEST_CASE(CreateNewBlock_validity) next->BuildSkip(); chainActive.SetTip(next); } - BOOST_CHECK(pblocktemplate = BlockAssembler(chainparams).CreateNewBlock(scriptPubKey)); + BOOST_CHECK(pblocktemplate = AssemblerForTest(chainparams).CreateNewBlock(scriptPubKey)); // Extend to a 210000-long block chain. while (chainActive.Tip()->nHeight < 210000) { CBlockIndex* prev = chainActive.Tip(); @@ -379,7 +389,7 @@ BOOST_AUTO_TEST_CASE(CreateNewBlock_validity) next->BuildSkip(); chainActive.SetTip(next); } - BOOST_CHECK(pblocktemplate = BlockAssembler(chainparams).CreateNewBlock(scriptPubKey)); + BOOST_CHECK(pblocktemplate = AssemblerForTest(chainparams).CreateNewBlock(scriptPubKey)); // Delete the dummy blocks again. while (chainActive.Tip()->nHeight > nHeight) { CBlockIndex* del = chainActive.Tip(); @@ -465,7 +475,7 @@ BOOST_AUTO_TEST_CASE(CreateNewBlock_validity) tx.vin[0].nSequence = CTxIn::SEQUENCE_LOCKTIME_TYPE_FLAG | 1; BOOST_CHECK(!TestSequenceLocks(tx, flags)); // Sequence locks fail - BOOST_CHECK(pblocktemplate = BlockAssembler(chainparams).CreateNewBlock(scriptPubKey)); + BOOST_CHECK(pblocktemplate = AssemblerForTest(chainparams).CreateNewBlock(scriptPubKey)); // None of the of the absolute height/time locked tx should have made // it into the template because we still check IsFinalTx in CreateNewBlock, @@ -478,7 +488,7 @@ BOOST_AUTO_TEST_CASE(CreateNewBlock_validity) chainActive.Tip()->nHeight++; SetMockTime(chainActive.Tip()->GetMedianTimePast() + 1); - BOOST_CHECK(pblocktemplate = BlockAssembler(chainparams).CreateNewBlock(scriptPubKey)); + BOOST_CHECK(pblocktemplate = AssemblerForTest(chainparams).CreateNewBlock(scriptPubKey)); BOOST_CHECK_EQUAL(pblocktemplate->block.vtx.size(), 5); chainActive.Tip()->nHeight--; diff --git a/src/test/net_tests.cpp b/src/test/net_tests.cpp index 0bd7869f32..b9ed4952bb 100644 --- a/src/test/net_tests.cpp +++ b/src/test/net_tests.cpp @@ -162,12 +162,12 @@ BOOST_AUTO_TEST_CASE(cnode_simple_test) bool fInboundIn = false; // Test that fFeeler is false by default. - CNode* pnode1 = new CNode(id++, NODE_NETWORK, height, hSocket, addr, 0, 0, pszDest, fInboundIn); + std::unique_ptr<CNode> pnode1(new CNode(id++, NODE_NETWORK, height, hSocket, addr, 0, 0, pszDest, fInboundIn)); BOOST_CHECK(pnode1->fInbound == false); BOOST_CHECK(pnode1->fFeeler == false); fInboundIn = true; - CNode* pnode2 = new CNode(id++, NODE_NETWORK, height, hSocket, addr, 1, 1, pszDest, fInboundIn); + std::unique_ptr<CNode> pnode2(new CNode(id++, NODE_NETWORK, height, hSocket, addr, 1, 1, pszDest, fInboundIn)); BOOST_CHECK(pnode2->fInbound == true); BOOST_CHECK(pnode2->fFeeler == false); } diff --git a/src/test/policyestimator_tests.cpp b/src/test/policyestimator_tests.cpp index 0c060801bc..bc2f49ef3f 100644 --- a/src/test/policyestimator_tests.cpp +++ b/src/test/policyestimator_tests.cpp @@ -16,7 +16,7 @@ BOOST_FIXTURE_TEST_SUITE(policyestimator_tests, BasicTestingSetup) BOOST_AUTO_TEST_CASE(BlockPolicyEstimates) { - CTxMemPool mpool(CFeeRate(1000)); + CTxMemPool mpool; TestMemPoolEntryHelper entry; CAmount basefee(2000); CAmount deltaFee(100); @@ -56,7 +56,7 @@ BOOST_AUTO_TEST_CASE(BlockPolicyEstimates) for (int k = 0; k < 4; k++) { // add 4 fee txs tx.vin[0].prevout.n = 10000*blocknum+100*j+k; // make transaction unique uint256 hash = tx.GetHash(); - mpool.addUnchecked(hash, entry.Fee(feeV[j]).Time(GetTime()).Priority(0).Height(blocknum).FromTx(tx, &mpool)); + mpool.addUnchecked(hash, entry.Fee(feeV[j]).Time(GetTime()).Height(blocknum).FromTx(tx)); txHashes[j].push_back(hash); } } @@ -132,7 +132,7 @@ BOOST_AUTO_TEST_CASE(BlockPolicyEstimates) for (int k = 0; k < 4; k++) { // add 4 fee txs tx.vin[0].prevout.n = 10000*blocknum+100*j+k; uint256 hash = tx.GetHash(); - mpool.addUnchecked(hash, entry.Fee(feeV[j]).Time(GetTime()).Priority(0).Height(blocknum).FromTx(tx, &mpool)); + mpool.addUnchecked(hash, entry.Fee(feeV[j]).Time(GetTime()).Height(blocknum).FromTx(tx)); txHashes[j].push_back(hash); } } @@ -169,7 +169,7 @@ BOOST_AUTO_TEST_CASE(BlockPolicyEstimates) for (int k = 0; k < 4; k++) { // add 4 fee txs tx.vin[0].prevout.n = 10000*blocknum+100*j+k; uint256 hash = tx.GetHash(); - mpool.addUnchecked(hash, entry.Fee(feeV[j]).Time(GetTime()).Priority(0).Height(blocknum).FromTx(tx, &mpool)); + mpool.addUnchecked(hash, entry.Fee(feeV[j]).Time(GetTime()).Height(blocknum).FromTx(tx)); CTransactionRef ptx = mpool.get(hash); if (ptx) block.push_back(ptx); @@ -185,15 +185,13 @@ BOOST_AUTO_TEST_CASE(BlockPolicyEstimates) } // Test that if the mempool is limited, estimateSmartFee won't return a value below the mempool min fee - // and that estimateSmartPriority returns essentially an infinite value - mpool.addUnchecked(tx.GetHash(), entry.Fee(feeV[5]).Time(GetTime()).Priority(0).Height(blocknum).FromTx(tx, &mpool)); + mpool.addUnchecked(tx.GetHash(), entry.Fee(feeV[5]).Time(GetTime()).Height(blocknum).FromTx(tx)); // evict that transaction which should set a mempool min fee of minRelayTxFee + feeV[5] mpool.TrimToSize(1); BOOST_CHECK(mpool.GetMinFee(1).GetFeePerK() > feeV[5]); for (int i = 1; i < 10; i++) { BOOST_CHECK(mpool.estimateSmartFee(i).GetFeePerK() >= mpool.estimateFee(i).GetFeePerK()); BOOST_CHECK(mpool.estimateSmartFee(i).GetFeePerK() >= mpool.GetMinFee(1).GetFeePerK()); - BOOST_CHECK(mpool.estimateSmartPriority(i) == INF_PRIORITY); } } diff --git a/src/test/raii_event_tests.cpp b/src/test/raii_event_tests.cpp index 87d25c0e2c..0f40874f55 100644 --- a/src/test/raii_event_tests.cpp +++ b/src/test/raii_event_tests.cpp @@ -3,6 +3,10 @@ // file COPYING or http://www.opensource.org/licenses/mit-license.php. #include <event2/event.h> + +#ifdef EVENT_SET_MEM_FUNCTIONS_IMPLEMENTED +// It would probably be ideal to define dummy test(s) that report skipped, but boost::test doesn't seem to make that practical (at least not in versions available with common distros) + #include <map> #include <stdlib.h> @@ -86,3 +90,5 @@ BOOST_AUTO_TEST_CASE(raii_event_order) } BOOST_AUTO_TEST_SUITE_END() + +#endif // EVENT_SET_MEM_FUNCTIONS_IMPLEMENTED diff --git a/src/test/random_tests.cpp b/src/test/random_tests.cpp new file mode 100644 index 0000000000..d2c46c0daa --- /dev/null +++ b/src/test/random_tests.cpp @@ -0,0 +1,19 @@ +// Copyright (c) 2017 The Bitcoin Core developers +// Distributed under the MIT software license, see the accompanying +// file COPYING or http://www.opensource.org/licenses/mit-license.php. + +#include "random.h" + +#include "test/test_bitcoin.h" + +#include <boost/test/unit_test.hpp> + +BOOST_FIXTURE_TEST_SUITE(random_tests, BasicTestingSetup) + +BOOST_AUTO_TEST_CASE(osrandom_tests) +{ + BOOST_CHECK(Random_SanityCheck()); +} + +BOOST_AUTO_TEST_SUITE_END() + diff --git a/src/test/scheduler_tests.cpp b/src/test/scheduler_tests.cpp index e1b0ab9258..e4ddf9d618 100644 --- a/src/test/scheduler_tests.cpp +++ b/src/test/scheduler_tests.cpp @@ -47,8 +47,8 @@ BOOST_AUTO_TEST_CASE(manythreads) // // So... ten shared counters, which if all the tasks execute // properly will sum to the number of tasks done. - // Each task adds or subtracts from one of the counters a - // random amount, and then schedules another task 0-1000 + // Each task adds or subtracts a random amount from one of the + // counters, and then schedules another task 0-1000 // microseconds in the future to subtract or add from // the counter -random_amount+1, so in the end the shared // counters should sum to the number of initial tasks performed. diff --git a/src/test/script_tests.cpp b/src/test/script_tests.cpp index 6f057f43b4..32184165f7 100644 --- a/src/test/script_tests.cpp +++ b/src/test/script_tests.cpp @@ -465,7 +465,7 @@ public: std::string JSONPrettyPrint(const UniValue& univalue) { std::string ret = univalue.write(4); - // Workaround for libunivalue pretty printer, which puts a space between comma's and newlines + // Workaround for libunivalue pretty printer, which puts a space between commas and newlines size_t pos = 0; while ((pos = ret.find(" \n", pos)) != std::string::npos) { ret.replace(pos, 2, "\n"); diff --git a/src/test/scriptnum_tests.cpp b/src/test/scriptnum_tests.cpp index 6b6689c7d3..1d5893bdc3 100644 --- a/src/test/scriptnum_tests.cpp +++ b/src/test/scriptnum_tests.cpp @@ -12,8 +12,10 @@ BOOST_FIXTURE_TEST_SUITE(scriptnum_tests, BasicTestingSetup) -static const int64_t values[] = \ -{ 0, 1, CHAR_MIN, CHAR_MAX, UCHAR_MAX, SHRT_MIN, USHRT_MAX, INT_MIN, INT_MAX, UINT_MAX, LONG_MIN, LONG_MAX }; +/** A selection of numbers that do not trigger int64_t overflow + * when added/subtracted. */ +static const int64_t values[] = { 0, 1, -2, 127, 128, -255, 256, (1LL << 15) - 1, -(1LL << 16), (1LL << 24) - 1, (1LL << 31), 1 - (1LL << 32), 1LL << 40 }; + static const int64_t offsets[] = { 1, 0x79, 0x80, 0x81, 0xFF, 0x7FFF, 0x8000, 0xFFFF, 0x10000}; static bool verify(const CScriptNum10& bignum, const CScriptNum& scriptnum) diff --git a/src/test/serialize_tests.cpp b/src/test/serialize_tests.cpp index 2d54668eaf..9661a66514 100644 --- a/src/test/serialize_tests.cpp +++ b/src/test/serialize_tests.cpp @@ -90,7 +90,7 @@ BOOST_AUTO_TEST_CASE(sizes) BOOST_AUTO_TEST_CASE(floats_conversion) { - // Choose values that map unambigiously to binary floating point to avoid + // Choose values that map unambiguously to binary floating point to avoid // rounding issues at the compiler side. BOOST_CHECK_EQUAL(ser_uint32_to_float(0x00000000), 0.0F); BOOST_CHECK_EQUAL(ser_uint32_to_float(0x3f000000), 0.5F); @@ -109,7 +109,7 @@ BOOST_AUTO_TEST_CASE(floats_conversion) BOOST_AUTO_TEST_CASE(doubles_conversion) { - // Choose values that map unambigiously to binary floating point to avoid + // Choose values that map unambiguously to binary floating point to avoid // rounding issues at the compiler side. BOOST_CHECK_EQUAL(ser_uint64_to_double(0x0000000000000000ULL), 0.0); BOOST_CHECK_EQUAL(ser_uint64_to_double(0x3fe0000000000000ULL), 0.5); diff --git a/src/test/skiplist_tests.cpp b/src/test/skiplist_tests.cpp index 5b4ef3fe7d..0b2fe0ef9d 100644 --- a/src/test/skiplist_tests.cpp +++ b/src/test/skiplist_tests.cpp @@ -100,4 +100,47 @@ BOOST_AUTO_TEST_CASE(getlocator_test) } } +BOOST_AUTO_TEST_CASE(findearliestatleast_test) +{ + std::vector<uint256> vHashMain(100000); + std::vector<CBlockIndex> vBlocksMain(100000); + for (unsigned int i=0; i<vBlocksMain.size(); i++) { + vHashMain[i] = ArithToUint256(i); // Set the hash equal to the height + vBlocksMain[i].nHeight = i; + vBlocksMain[i].pprev = i ? &vBlocksMain[i - 1] : NULL; + vBlocksMain[i].phashBlock = &vHashMain[i]; + vBlocksMain[i].BuildSkip(); + if (i < 10) { + vBlocksMain[i].nTime = i; + vBlocksMain[i].nTimeMax = i; + } else { + // randomly choose something in the range [MTP, MTP*2] + int64_t medianTimePast = vBlocksMain[i].GetMedianTimePast(); + int r = insecure_rand() % medianTimePast; + vBlocksMain[i].nTime = r + medianTimePast; + vBlocksMain[i].nTimeMax = std::max(vBlocksMain[i].nTime, vBlocksMain[i-1].nTimeMax); + } + } + // Check that we set nTimeMax up correctly. + unsigned int curTimeMax = 0; + for (unsigned int i=0; i<vBlocksMain.size(); ++i) { + curTimeMax = std::max(curTimeMax, vBlocksMain[i].nTime); + BOOST_CHECK(curTimeMax == vBlocksMain[i].nTimeMax); + } + + // Build a CChain for the main branch. + CChain chain; + chain.SetTip(&vBlocksMain.back()); + + // Verify that FindEarliestAtLeast is correct. + for (unsigned int i=0; i<10000; ++i) { + // Pick a random element in vBlocksMain. + int r = insecure_rand() % vBlocksMain.size(); + int64_t test_time = vBlocksMain[r].nTime; + CBlockIndex *ret = chain.FindEarliestAtLeast(test_time); + BOOST_CHECK(ret->nTimeMax >= test_time); + BOOST_CHECK((ret->pprev==NULL) || ret->pprev->nTimeMax < test_time); + BOOST_CHECK(vBlocksMain[r].GetAncestor(ret->nHeight) == ret); + } +} BOOST_AUTO_TEST_SUITE_END() diff --git a/src/test/test_bitcoin.cpp b/src/test/test_bitcoin.cpp index f0eaab2217..2297644c0b 100644 --- a/src/test/test_bitcoin.cpp +++ b/src/test/test_bitcoin.cpp @@ -69,11 +69,11 @@ TestingSetup::TestingSetup(const std::string& chainName) : BasicTestingSetup(cha pblocktree = new CBlockTreeDB(1 << 20, true); pcoinsdbview = new CCoinsViewDB(1 << 23, true); pcoinsTip = new CCoinsViewCache(pcoinsdbview); - InitBlockIndex(chainparams); + BOOST_REQUIRE(InitBlockIndex(chainparams)); { CValidationState state; bool ok = ActivateBestChain(state, chainparams); - BOOST_CHECK(ok); + BOOST_REQUIRE(ok); } nScriptCheckThreads = 3; for (int i=0; i < nScriptCheckThreads-1; i++) @@ -141,27 +141,24 @@ TestChain100Setup::~TestChain100Setup() } -CTxMemPoolEntry TestMemPoolEntryHelper::FromTx(const CMutableTransaction &tx, CTxMemPool *pool) { +CTxMemPoolEntry TestMemPoolEntryHelper::FromTx(const CMutableTransaction &tx) { CTransaction txn(tx); - return FromTx(txn, pool); + return FromTx(txn); } -CTxMemPoolEntry TestMemPoolEntryHelper::FromTx(const CTransaction &txn, CTxMemPool *pool) { - // Hack to assume either its completely dependent on other mempool txs or not at all - CAmount inChainValue = pool && pool->HasNoInputsOf(txn) ? txn.GetValueOut() : 0; - - return CTxMemPoolEntry(MakeTransactionRef(txn), nFee, nTime, dPriority, nHeight, - inChainValue, spendsCoinbase, sigOpCost, lp); +CTxMemPoolEntry TestMemPoolEntryHelper::FromTx(const CTransaction &txn) { + return CTxMemPoolEntry(MakeTransactionRef(txn), nFee, nTime, nHeight, + spendsCoinbase, sigOpCost, lp); } void Shutdown(void* parg) { - exit(0); + exit(EXIT_SUCCESS); } void StartShutdown() { - exit(0); + exit(EXIT_SUCCESS); } bool ShutdownRequested() diff --git a/src/test/test_bitcoin.h b/src/test/test_bitcoin.h index 5ef6fa764f..a593f136eb 100644 --- a/src/test/test_bitcoin.h +++ b/src/test/test_bitcoin.h @@ -61,30 +61,27 @@ struct TestChain100Setup : public TestingSetup { }; class CTxMemPoolEntry; -class CTxMemPool; struct TestMemPoolEntryHelper { // Default values CAmount nFee; int64_t nTime; - double dPriority; unsigned int nHeight; bool spendsCoinbase; unsigned int sigOpCost; LockPoints lp; TestMemPoolEntryHelper() : - nFee(0), nTime(0), dPriority(0.0), nHeight(1), + nFee(0), nTime(0), nHeight(1), spendsCoinbase(false), sigOpCost(4) { } - CTxMemPoolEntry FromTx(const CMutableTransaction &tx, CTxMemPool *pool = NULL); - CTxMemPoolEntry FromTx(const CTransaction &tx, CTxMemPool *pool = NULL); + CTxMemPoolEntry FromTx(const CMutableTransaction &tx); + CTxMemPoolEntry FromTx(const CTransaction &tx); // Change the default value TestMemPoolEntryHelper &Fee(CAmount _fee) { nFee = _fee; return *this; } TestMemPoolEntryHelper &Time(int64_t _time) { nTime = _time; return *this; } - TestMemPoolEntryHelper &Priority(double _priority) { dPriority = _priority; return *this; } TestMemPoolEntryHelper &Height(unsigned int _height) { nHeight = _height; return *this; } TestMemPoolEntryHelper &SpendsCoinbase(bool _flag) { spendsCoinbase = _flag; return *this; } TestMemPoolEntryHelper &SigOpsCost(unsigned int _sigopsCost) { sigOpCost = _sigopsCost; return *this; } diff --git a/src/test/test_bitcoin_fuzzy.cpp b/src/test/test_bitcoin_fuzzy.cpp index 376d8e428a..c4983f6f5c 100644 --- a/src/test/test_bitcoin_fuzzy.cpp +++ b/src/test/test_bitcoin_fuzzy.cpp @@ -18,6 +18,7 @@ #include "streams.h" #include "undo.h" #include "version.h" +#include "pubkey.h" #include <stdint.h> #include <unistd.h> @@ -60,6 +61,7 @@ bool read_stdin(std::vector<char> &data) { int main(int argc, char **argv) { + ECCVerifyHandle globalVerifyHandle; std::vector<char> buffer; if (!read_stdin(buffer)) return 0; diff --git a/src/test/testutil.cpp b/src/test/testutil.cpp index 304cffb798..e6d8622979 100644 --- a/src/test/testutil.cpp +++ b/src/test/testutil.cpp @@ -11,23 +11,5 @@ #include <boost/filesystem.hpp> boost::filesystem::path GetTempPath() { -#if BOOST_FILESYSTEM_VERSION == 3 return boost::filesystem::temp_directory_path(); -#else - // TODO: remove when we don't support filesystem v2 anymore - boost::filesystem::path path; -#ifdef WIN32 - char pszPath[MAX_PATH] = ""; - - if (GetTempPathA(MAX_PATH, pszPath)) - path = boost::filesystem::path(pszPath); -#else - path = boost::filesystem::path("/tmp"); -#endif - if (path.empty() || !boost::filesystem::is_directory(path)) { - LogPrintf("GetTempPath(): failed to find temp path\n"); - return boost::filesystem::path(""); - } - return path; -#endif } diff --git a/src/test/transaction_tests.cpp b/src/test/transaction_tests.cpp index 8c9aaef02f..3b5da4980b 100644 --- a/src/test/transaction_tests.cpp +++ b/src/test/transaction_tests.cpp @@ -189,7 +189,9 @@ BOOST_AUTO_TEST_CASE(tx_invalid) // verifyFlags is a comma separated list of script verification flags to apply, or "NONE" UniValue tests = read_json(std::string(json_tests::tx_invalid, json_tests::tx_invalid + sizeof(json_tests::tx_invalid))); - ScriptError err; + // Initialize to SCRIPT_ERR_OK. The tests expect err to be changed to a + // value other than SCRIPT_ERR_OK. + ScriptError err = SCRIPT_ERR_OK; for (unsigned int idx = 0; idx < tests.size(); idx++) { UniValue test = tests[idx]; std::string strTest = test.write(); @@ -690,7 +692,7 @@ BOOST_AUTO_TEST_CASE(test_IsStandard) BOOST_CHECK(IsStandardTx(t, reason)); // Check dust with default relay fee: - CAmount nDustThreshold = 182 * minRelayTxFee.GetFeePerK()/1000 * 3; + CAmount nDustThreshold = 182 * dustRelayFee.GetFeePerK()/1000 * 3; BOOST_CHECK_EQUAL(nDustThreshold, 546); // dust: t.vout[0].nValue = nDustThreshold - 1; @@ -701,14 +703,14 @@ BOOST_AUTO_TEST_CASE(test_IsStandard) // Check dust with odd relay fee to verify rounding: // nDustThreshold = 182 * 1234 / 1000 * 3 - minRelayTxFee = CFeeRate(1234); + dustRelayFee = CFeeRate(1234); // dust: t.vout[0].nValue = 672 - 1; BOOST_CHECK(!IsStandardTx(t, reason)); // not dust: t.vout[0].nValue = 672; BOOST_CHECK(IsStandardTx(t, reason)); - minRelayTxFee = CFeeRate(DEFAULT_MIN_RELAY_TX_FEE); + dustRelayFee = CFeeRate(DUST_RELAY_TX_FEE); t.vout[0].scriptPubKey = CScript() << OP_1; BOOST_CHECK(!IsStandardTx(t, reason)); diff --git a/src/test/txvalidationcache_tests.cpp b/src/test/txvalidationcache_tests.cpp index acccaee98c..c5367208ba 100644 --- a/src/test/txvalidationcache_tests.cpp +++ b/src/test/txvalidationcache_tests.cpp @@ -23,7 +23,7 @@ ToMemPool(CMutableTransaction& tx) LOCK(cs_main); CValidationState state; - return AcceptToMemoryPool(mempool, state, MakeTransactionRef(tx), false, NULL, true, 0); + return AcceptToMemoryPool(mempool, state, MakeTransactionRef(tx), false, NULL, NULL, true, 0); } BOOST_FIXTURE_TEST_CASE(tx_mempool_block_doublespend, TestChain100Setup) diff --git a/src/test/util_tests.cpp b/src/test/util_tests.cpp index 641655621c..79d02257fa 100644 --- a/src/test/util_tests.cpp +++ b/src/test/util_tests.cpp @@ -321,7 +321,7 @@ BOOST_AUTO_TEST_CASE(test_ParseInt32) BOOST_CHECK(ParseInt32("1234", &n) && n == 1234); BOOST_CHECK(ParseInt32("01234", &n) && n == 1234); // no octal BOOST_CHECK(ParseInt32("2147483647", &n) && n == 2147483647); - BOOST_CHECK(ParseInt32("-2147483648", &n) && n == -2147483648); + BOOST_CHECK(ParseInt32("-2147483648", &n) && n == (-2147483647 - 1)); // (-2147483647 - 1) equals INT_MIN BOOST_CHECK(ParseInt32("-1234", &n) && n == -1234); // Invalid values BOOST_CHECK(!ParseInt32("", &n)); diff --git a/src/test/versionbits_tests.cpp b/src/test/versionbits_tests.cpp index bae0eff7e5..e2b5573abd 100644 --- a/src/test/versionbits_tests.cpp +++ b/src/test/versionbits_tests.cpp @@ -292,7 +292,7 @@ BOOST_AUTO_TEST_CASE(versionbits_computeblockversion) blocksToMine--; nTime += 600; nHeight += 1; - }; + } nTime = nTimeout; // FAILED is only triggered at the end of a period, so CBV should be setting diff --git a/src/timedata.cpp b/src/timedata.cpp index c72252e6d8..2ff6437c73 100644 --- a/src/timedata.cpp +++ b/src/timedata.cpp @@ -17,8 +17,6 @@ #include <boost/foreach.hpp> -using namespace std; - static CCriticalSection cs_nTimeOffset; static int64_t nTimeOffset = 0; @@ -51,7 +49,7 @@ void AddTimeData(const CNetAddr& ip, int64_t nOffsetSample) { LOCK(cs_nTimeOffset); // Ignore duplicates - static set<CNetAddr> setKnown; + static std::set<CNetAddr> setKnown; if (setKnown.size() == BITCOIN_TIMEDATA_MAX_SAMPLES) return; if (!setKnown.insert(ip).second) diff --git a/src/timedata.h b/src/timedata.h index 4a2eab3487..bc5451b19b 100644 --- a/src/timedata.h +++ b/src/timedata.h @@ -27,9 +27,9 @@ private: unsigned int nSize; public: - CMedianFilter(unsigned int size, T initial_value) : nSize(size) + CMedianFilter(unsigned int _size, T initial_value) : nSize(_size) { - vValues.reserve(size); + vValues.reserve(_size); vValues.push_back(initial_value); vSorted = vValues; } @@ -48,14 +48,14 @@ public: T median() const { - int size = vSorted.size(); - assert(size > 0); - if (size & 1) // Odd number of elements + int vSortedSize = vSorted.size(); + assert(vSortedSize > 0); + if (vSortedSize & 1) // Odd number of elements { - return vSorted[size / 2]; + return vSorted[vSortedSize / 2]; } else // Even number of elements { - return (vSorted[size / 2 - 1] + vSorted[size / 2]) / 2; + return (vSorted[vSortedSize / 2 - 1] + vSorted[vSortedSize / 2]) / 2; } } diff --git a/src/tinyformat.h b/src/tinyformat.h index 17f0360c42..5022d46809 100644 --- a/src/tinyformat.h +++ b/src/tinyformat.h @@ -123,7 +123,7 @@ namespace tinyformat {} namespace tfm = tinyformat; // Error handling; calls assert() by default. -#define TINYFORMAT_ERROR(reasonString) throw std::runtime_error(reasonString) +#define TINYFORMAT_ERROR(reasonString) throw tinyformat::format_error(reasonString) // Define for C++11 variadic templates which make the code shorter & more // general. If you don't define this, C++11 support is autodetected below. @@ -164,6 +164,13 @@ namespace tfm = tinyformat; namespace tinyformat { +class format_error: public std::runtime_error +{ +public: + format_error(const std::string &what): std::runtime_error(what) { + } +}; + //------------------------------------------------------------------------------ namespace detail { diff --git a/src/torcontrol.cpp b/src/torcontrol.cpp index 5571b7de44..c49c5d9eb2 100644 --- a/src/torcontrol.cpp +++ b/src/torcontrol.cpp @@ -372,7 +372,7 @@ private: struct event *reconnect_ev; float reconnect_timeout; CService service; - /** Cooie for SAFECOOKIE auth */ + /** Cookie for SAFECOOKIE auth */ std::vector<uint8_t> cookie; /** ClientNonce for SAFECOOKIE auth */ std::vector<uint8_t> clientNonce; diff --git a/src/txdb.cpp b/src/txdb.cpp index c223abd590..1a30bb58ad 100644 --- a/src/txdb.cpp +++ b/src/txdb.cpp @@ -14,8 +14,6 @@ #include <boost/thread.hpp> -using namespace std; - static const char DB_COINS = 'c'; static const char DB_BLOCK_FILES = 'f'; static const char DB_TXINDEX = 't'; @@ -32,11 +30,11 @@ CCoinsViewDB::CCoinsViewDB(size_t nCacheSize, bool fMemory, bool fWipe) : db(Get } bool CCoinsViewDB::GetCoins(const uint256 &txid, CCoins &coins) const { - return db.Read(make_pair(DB_COINS, txid), coins); + return db.Read(std::make_pair(DB_COINS, txid), coins); } bool CCoinsViewDB::HaveCoins(const uint256 &txid) const { - return db.Exists(make_pair(DB_COINS, txid)); + return db.Exists(std::make_pair(DB_COINS, txid)); } uint256 CCoinsViewDB::GetBestBlock() const { @@ -53,9 +51,9 @@ bool CCoinsViewDB::BatchWrite(CCoinsMap &mapCoins, const uint256 &hashBlock) { for (CCoinsMap::iterator it = mapCoins.begin(); it != mapCoins.end();) { if (it->second.flags & CCoinsCacheEntry::DIRTY) { if (it->second.coins.IsPruned()) - batch.Erase(make_pair(DB_COINS, it->first)); + batch.Erase(std::make_pair(DB_COINS, it->first)); else - batch.Write(make_pair(DB_COINS, it->first), it->second.coins); + batch.Write(std::make_pair(DB_COINS, it->first), it->second.coins); changed++; } count++; @@ -73,7 +71,7 @@ CBlockTreeDB::CBlockTreeDB(size_t nCacheSize, bool fMemory, bool fWipe) : CDBWra } bool CBlockTreeDB::ReadBlockFileInfo(int nFile, CBlockFileInfo &info) { - return Read(make_pair(DB_BLOCK_FILES, nFile), info); + return Read(std::make_pair(DB_BLOCK_FILES, nFile), info); } bool CBlockTreeDB::WriteReindexing(bool fReindexing) { @@ -139,23 +137,23 @@ void CCoinsViewDBCursor::Next() bool CBlockTreeDB::WriteBatchSync(const std::vector<std::pair<int, const CBlockFileInfo*> >& fileInfo, int nLastFile, const std::vector<const CBlockIndex*>& blockinfo) { CDBBatch batch(*this); for (std::vector<std::pair<int, const CBlockFileInfo*> >::const_iterator it=fileInfo.begin(); it != fileInfo.end(); it++) { - batch.Write(make_pair(DB_BLOCK_FILES, it->first), *it->second); + batch.Write(std::make_pair(DB_BLOCK_FILES, it->first), *it->second); } batch.Write(DB_LAST_BLOCK, nLastFile); for (std::vector<const CBlockIndex*>::const_iterator it=blockinfo.begin(); it != blockinfo.end(); it++) { - batch.Write(make_pair(DB_BLOCK_INDEX, (*it)->GetBlockHash()), CDiskBlockIndex(*it)); + batch.Write(std::make_pair(DB_BLOCK_INDEX, (*it)->GetBlockHash()), CDiskBlockIndex(*it)); } return WriteBatch(batch, true); } bool CBlockTreeDB::ReadTxIndex(const uint256 &txid, CDiskTxPos &pos) { - return Read(make_pair(DB_TXINDEX, txid), pos); + return Read(std::make_pair(DB_TXINDEX, txid), pos); } bool CBlockTreeDB::WriteTxIndex(const std::vector<std::pair<uint256, CDiskTxPos> >&vect) { CDBBatch batch(*this); for (std::vector<std::pair<uint256,CDiskTxPos> >::const_iterator it=vect.begin(); it!=vect.end(); it++) - batch.Write(make_pair(DB_TXINDEX, it->first), it->second); + batch.Write(std::make_pair(DB_TXINDEX, it->first), it->second); return WriteBatch(batch); } @@ -175,7 +173,7 @@ bool CBlockTreeDB::LoadBlockIndexGuts(boost::function<CBlockIndex*(const uint256 { std::unique_ptr<CDBIterator> pcursor(NewIterator()); - pcursor->Seek(make_pair(DB_BLOCK_INDEX, uint256())); + pcursor->Seek(std::make_pair(DB_BLOCK_INDEX, uint256())); // Load mapBlockIndex while (pcursor->Valid()) { diff --git a/src/txmempool.cpp b/src/txmempool.cpp index 4f4540a1fc..fb58208774 100644 --- a/src/txmempool.cpp +++ b/src/txmempool.cpp @@ -18,25 +18,18 @@ #include "utiltime.h" #include "version.h" -using namespace std; - CTxMemPoolEntry::CTxMemPoolEntry(const CTransactionRef& _tx, const CAmount& _nFee, - int64_t _nTime, double _entryPriority, unsigned int _entryHeight, - CAmount _inChainInputValue, + int64_t _nTime, unsigned int _entryHeight, bool _spendsCoinbase, int64_t _sigOpsCost, LockPoints lp): - tx(_tx), nFee(_nFee), nTime(_nTime), entryPriority(_entryPriority), entryHeight(_entryHeight), - inChainInputValue(_inChainInputValue), + tx(_tx), nFee(_nFee), nTime(_nTime), entryHeight(_entryHeight), spendsCoinbase(_spendsCoinbase), sigOpCost(_sigOpsCost), lockPoints(lp) { nTxWeight = GetTransactionWeight(*tx); - nModSize = tx->CalculateModifiedSize(GetTxSize()); nUsageSize = RecursiveDynamicUsage(*tx) + memusage::DynamicUsage(tx); nCountWithDescendants = 1; nSizeWithDescendants = GetTxSize(); nModFeesWithDescendants = nFee; - CAmount nValueIn = tx->GetValueOut()+nFee; - assert(inChainInputValue <= nValueIn); feeDelta = 0; @@ -51,16 +44,6 @@ CTxMemPoolEntry::CTxMemPoolEntry(const CTxMemPoolEntry& other) *this = other; } -double -CTxMemPoolEntry::GetPriority(unsigned int currentHeight) const -{ - double deltaPriority = ((double)(currentHeight-entryHeight)*inChainInputValue)/nModSize; - double dResult = entryPriority + deltaPriority; - if (dResult < 0) // This should only happen if it was called with a height below entry height - dResult = 0; - return dResult; -} - void CTxMemPoolEntry::UpdateFeeDelta(int64_t newFeeDelta) { nModFeesWithDescendants += newFeeDelta - feeDelta; @@ -173,6 +156,8 @@ void CTxMemPool::UpdateTransactionsFromBlock(const std::vector<uint256> &vHashes bool CTxMemPool::CalculateMemPoolAncestors(const CTxMemPoolEntry &entry, setEntries &setAncestors, uint64_t limitAncestorCount, uint64_t limitAncestorSize, uint64_t limitDescendantCount, uint64_t limitDescendantSize, std::string &errString, bool fSearchForParents /* = true */) const { + LOCK(cs); + setEntries parentHashes; const CTransaction &tx = entry.GetTx(); @@ -348,7 +333,7 @@ void CTxMemPoolEntry::UpdateAncestorState(int64_t modifySize, CAmount modifyFee, assert(int(nSigOpCostWithAncestors) >= 0); } -CTxMemPool::CTxMemPool(const CFeeRate& _minReasonableRelayFee) : +CTxMemPool::CTxMemPool() : nTransactionsUpdated(0) { _clear(); //lock free clear @@ -358,8 +343,7 @@ CTxMemPool::CTxMemPool(const CFeeRate& _minReasonableRelayFee) : // of transactions in the pool nCheckFrequency = 0; - minerPolicyEstimator = new CBlockPolicyEstimator(_minReasonableRelayFee); - minReasonableRelayFee = _minReasonableRelayFee; + minerPolicyEstimator = new CBlockPolicyEstimator(); } CTxMemPool::~CTxMemPool() @@ -394,8 +378,9 @@ void CTxMemPool::AddTransactionsUpdated(unsigned int n) bool CTxMemPool::addUnchecked(const uint256& hash, const CTxMemPoolEntry &entry, setEntries &setAncestors, bool validFeeEstimate) { + NotifyEntryAdded(entry.GetSharedTx()); // Add to memory pool without checking anything. - // Used by main.cpp AcceptToMemoryPool(), which DOES do + // Used by AcceptToMemoryPool(), which DOES do // all the appropriate checks. LOCK(cs); indexed_transaction_set::iterator newit = mapTx.insert(entry).first; @@ -404,11 +389,11 @@ bool CTxMemPool::addUnchecked(const uint256& hash, const CTxMemPoolEntry &entry, // Update transaction for any feeDelta created by PrioritiseTransaction // TODO: refactor so that the fee delta is calculated before inserting // into mapTx. - std::map<uint256, std::pair<double, CAmount> >::const_iterator pos = mapDeltas.find(hash); + std::map<uint256, CAmount>::const_iterator pos = mapDeltas.find(hash); if (pos != mapDeltas.end()) { - const std::pair<double, CAmount> &deltas = pos->second; - if (deltas.second) { - mapTx.modify(newit, update_fee_delta(deltas.second)); + const CAmount &delta = pos->second; + if (delta) { + mapTx.modify(newit, update_fee_delta(delta)); } } @@ -450,8 +435,9 @@ bool CTxMemPool::addUnchecked(const uint256& hash, const CTxMemPoolEntry &entry, return true; } -void CTxMemPool::removeUnchecked(txiter it) +void CTxMemPool::removeUnchecked(txiter it, MemPoolRemovalReason reason) { + NotifyEntryRemoved(it->GetSharedTx(), reason); const uint256 hash = it->GetTx().GetHash(); BOOST_FOREACH(const CTxIn& txin, it->GetTx().vin) mapNextTx.erase(txin.prevout); @@ -503,7 +489,7 @@ void CTxMemPool::CalculateDescendants(txiter entryit, setEntries &setDescendants } } -void CTxMemPool::removeRecursive(const CTransaction &origTx) +void CTxMemPool::removeRecursive(const CTransaction &origTx, MemPoolRemovalReason reason) { // Remove transaction from memory pool { @@ -530,7 +516,8 @@ void CTxMemPool::removeRecursive(const CTransaction &origTx) BOOST_FOREACH(txiter it, txToRemove) { CalculateDescendants(it, setAllRemoves); } - RemoveStaged(setAllRemoves, false); + + RemoveStaged(setAllRemoves, false, reason); } } @@ -568,7 +555,7 @@ void CTxMemPool::removeForReorg(const CCoinsViewCache *pcoins, unsigned int nMem for (txiter it : txToRemove) { CalculateDescendants(it, setAllRemoves); } - RemoveStaged(setAllRemoves, false); + RemoveStaged(setAllRemoves, false, MemPoolRemovalReason::REORG); } void CTxMemPool::removeConflicts(const CTransaction &tx) @@ -581,8 +568,8 @@ void CTxMemPool::removeConflicts(const CTransaction &tx) const CTransaction &txConflict = *it->second; if (txConflict != tx) { - removeRecursive(txConflict); ClearPrioritisation(txConflict.GetHash()); + removeRecursive(txConflict, MemPoolRemovalReason::CONFLICT); } } } @@ -611,7 +598,7 @@ void CTxMemPool::removeForBlock(const std::vector<CTransactionRef>& vtx, unsigne if (it != mapTx.end()) { setEntries stage; stage.insert(it); - RemoveStaged(stage, true); + RemoveStaged(stage, true, MemPoolRemovalReason::BLOCK); } removeConflicts(*tx); ClearPrioritisation(tx->GetHash()); @@ -656,7 +643,7 @@ void CTxMemPool::check(const CCoinsViewCache *pcoins) const const int64_t nSpendHeight = GetSpendHeight(mempoolDuplicate); LOCK(cs); - list<const CTxMemPoolEntry*> waitingOnDependants; + std::list<const CTxMemPoolEntry*> waitingOnDependants; for (indexed_transaction_set::const_iterator it = mapTx.begin(); it != mapTx.end(); it++) { unsigned int i = 0; checkTotal += it->GetTxSize(); @@ -814,7 +801,7 @@ std::vector<CTxMemPool::indexed_transaction_set::const_iterator> CTxMemPool::Get return iters; } -void CTxMemPool::queryHashes(vector<uint256>& vtxid) +void CTxMemPool::queryHashes(std::vector<uint256>& vtxid) { LOCK(cs); auto iters = GetSortedDepthAndScore(); @@ -873,16 +860,6 @@ CFeeRate CTxMemPool::estimateSmartFee(int nBlocks, int *answerFoundAtBlocks) con LOCK(cs); return minerPolicyEstimator->estimateSmartFee(nBlocks, answerFoundAtBlocks, *this); } -double CTxMemPool::estimatePriority(int nBlocks) const -{ - LOCK(cs); - return minerPolicyEstimator->estimatePriority(nBlocks); -} -double CTxMemPool::estimateSmartPriority(int nBlocks, int *answerFoundAtBlocks) const -{ - LOCK(cs); - return minerPolicyEstimator->estimateSmartPriority(nBlocks, answerFoundAtBlocks, *this); -} bool CTxMemPool::WriteFeeEstimates(CAutoFile& fileout) const @@ -918,16 +895,15 @@ CTxMemPool::ReadFeeEstimates(CAutoFile& filein) return true; } -void CTxMemPool::PrioritiseTransaction(const uint256 hash, const string strHash, double dPriorityDelta, const CAmount& nFeeDelta) +void CTxMemPool::PrioritiseTransaction(const uint256& hash, const CAmount& nFeeDelta) { { LOCK(cs); - std::pair<double, CAmount> &deltas = mapDeltas[hash]; - deltas.first += dPriorityDelta; - deltas.second += nFeeDelta; + CAmount &delta = mapDeltas[hash]; + delta += nFeeDelta; txiter it = mapTx.find(hash); if (it != mapTx.end()) { - mapTx.modify(it, update_fee_delta(deltas.second)); + mapTx.modify(it, update_fee_delta(delta)); // Now update all ancestors' modified fees with descendants setEntries setAncestors; uint64_t nNoLimit = std::numeric_limits<uint64_t>::max(); @@ -938,18 +914,17 @@ void CTxMemPool::PrioritiseTransaction(const uint256 hash, const string strHash, } } } - LogPrintf("PrioritiseTransaction: %s priority += %f, fee += %d\n", strHash, dPriorityDelta, FormatMoney(nFeeDelta)); + LogPrintf("PrioritiseTransaction: %s feerate += %s\n", hash.ToString(), FormatMoney(nFeeDelta)); } -void CTxMemPool::ApplyDeltas(const uint256 hash, double &dPriorityDelta, CAmount &nFeeDelta) const +void CTxMemPool::ApplyDelta(const uint256 hash, CAmount &nFeeDelta) const { LOCK(cs); - std::map<uint256, std::pair<double, CAmount> >::const_iterator pos = mapDeltas.find(hash); + std::map<uint256, CAmount>::const_iterator pos = mapDeltas.find(hash); if (pos == mapDeltas.end()) return; - const std::pair<double, CAmount> &deltas = pos->second; - dPriorityDelta += deltas.first; - nFeeDelta += deltas.second; + const CAmount &delta = pos->second; + nFeeDelta += delta; } void CTxMemPool::ClearPrioritisation(const uint256 hash) @@ -990,11 +965,11 @@ size_t CTxMemPool::DynamicMemoryUsage() const { return memusage::MallocUsage(sizeof(CTxMemPoolEntry) + 15 * sizeof(void*)) * mapTx.size() + memusage::DynamicUsage(mapNextTx) + memusage::DynamicUsage(mapDeltas) + memusage::DynamicUsage(mapLinks) + memusage::DynamicUsage(vTxHashes) + cachedInnerUsage; } -void CTxMemPool::RemoveStaged(setEntries &stage, bool updateDescendants) { +void CTxMemPool::RemoveStaged(setEntries &stage, bool updateDescendants, MemPoolRemovalReason reason) { AssertLockHeld(cs); UpdateForRemoveFromMempool(stage, updateDescendants); BOOST_FOREACH(const txiter& it, stage) { - removeUnchecked(it); + removeUnchecked(it, reason); } } @@ -1010,7 +985,7 @@ int CTxMemPool::Expire(int64_t time) { BOOST_FOREACH(txiter removeit, toremove) { CalculateDescendants(removeit, stage); } - RemoveStaged(stage, false); + RemoveStaged(stage, false, MemPoolRemovalReason::EXPIRY); return stage.size(); } @@ -1076,12 +1051,12 @@ CFeeRate CTxMemPool::GetMinFee(size_t sizelimit) const { rollingMinimumFeeRate = rollingMinimumFeeRate / pow(2.0, (time - lastRollingFeeUpdate) / halflife); lastRollingFeeUpdate = time; - if (rollingMinimumFeeRate < (double)minReasonableRelayFee.GetFeePerK() / 2) { + if (rollingMinimumFeeRate < (double)incrementalRelayFee.GetFeePerK() / 2) { rollingMinimumFeeRate = 0; return CFeeRate(0); } } - return std::max(CFeeRate(rollingMinimumFeeRate), minReasonableRelayFee); + return std::max(CFeeRate(rollingMinimumFeeRate), incrementalRelayFee); } void CTxMemPool::trackPackageRemoved(const CFeeRate& rate) { @@ -1105,7 +1080,7 @@ void CTxMemPool::TrimToSize(size_t sizelimit, std::vector<uint256>* pvNoSpendsRe // to have 0 fee). This way, we don't allow txn to enter mempool with feerate // equal to txn which were removed with no block in between. CFeeRate removed(it->GetModFeesWithDescendants(), it->GetSizeWithDescendants()); - removed += minReasonableRelayFee; + removed += incrementalRelayFee; trackPackageRemoved(removed); maxFeeRateRemoved = std::max(maxFeeRateRemoved, removed); @@ -1119,7 +1094,7 @@ void CTxMemPool::TrimToSize(size_t sizelimit, std::vector<uint256>* pvNoSpendsRe BOOST_FOREACH(txiter iter, stage) txn.push_back(iter->GetTx()); } - RemoveStaged(stage, false); + RemoveStaged(stage, false, MemPoolRemovalReason::SIZELIMIT); if (pvNoSpendsRemaining) { BOOST_FOREACH(const CTransaction& tx, txn) { BOOST_FOREACH(const CTxIn& txin, tx.vin) { diff --git a/src/txmempool.h b/src/txmempool.h index 6a00b540a5..f9a9d088d0 100644 --- a/src/txmempool.h +++ b/src/txmempool.h @@ -20,26 +20,15 @@ #include "sync.h" #include "random.h" -#undef foreach #include "boost/multi_index_container.hpp" #include "boost/multi_index/ordered_index.hpp" #include "boost/multi_index/hashed_index.hpp" +#include <boost/signals2/signal.hpp> + class CAutoFile; class CBlockIndex; -inline double AllowFreeThreshold() -{ - return COIN * 144 / 250; -} - -inline bool AllowFree(double dPriority) -{ - // Large (in bytes) low-priority (new, small-coin) transactions - // need a fee. - return dPriority > AllowFreeThreshold(); -} - /** Fake height value used in CCoins to signify they are only in the memory pool (since 0.8) */ static const unsigned int MEMPOOL_HEIGHT = 0x7FFFFFFF; @@ -83,12 +72,9 @@ private: CTransactionRef tx; CAmount nFee; //!< Cached to avoid expensive parent-transaction lookups size_t nTxWeight; //!< ... and avoid recomputing tx weight (also used for GetTxSize()) - size_t nModSize; //!< ... and modified size for priority size_t nUsageSize; //!< ... and total memory usage int64_t nTime; //!< Local time when entering the mempool - double entryPriority; //!< Priority when entering the mempool unsigned int entryHeight; //!< Chain height when entering the mempool - CAmount inChainInputValue; //!< Sum of all txin values that are already in blockchain bool spendsCoinbase; //!< keep track of transactions that spend a coinbase int64_t sigOpCost; //!< Total sigop cost int64_t feeDelta; //!< Used for determining the priority of the transaction for mining in a block @@ -111,19 +97,14 @@ private: public: CTxMemPoolEntry(const CTransactionRef& _tx, const CAmount& _nFee, - int64_t _nTime, double _entryPriority, unsigned int _entryHeight, - CAmount _inChainInputValue, bool spendsCoinbase, + int64_t _nTime, unsigned int _entryHeight, + bool spendsCoinbase, int64_t nSigOpsCost, LockPoints lp); CTxMemPoolEntry(const CTxMemPoolEntry& other); const CTransaction& GetTx() const { return *this->tx; } CTransactionRef GetSharedTx() const { return this->tx; } - /** - * Fast calculation of lower bound of current priority as update - * from entry priority. Only inputs that were originally in-chain will age. - */ - double GetPriority(unsigned int currentHeight) const; const CAmount& GetFee() const { return nFee; } size_t GetTxSize() const; size_t GetTxWeight() const { return nTxWeight; } @@ -333,6 +314,19 @@ struct TxMempoolInfo int64_t nFeeDelta; }; +/** Reason why a transaction was removed from the mempool, + * this is passed to the notification signal. + */ +enum class MemPoolRemovalReason { + UNKNOWN = 0, //! Manually removed or unknown reason + EXPIRY, //! Expired from mempool + SIZELIMIT, //! Removed in size limiting + REORG, //! Removed for reorganization + BLOCK, //! Removed for block + CONFLICT, //! Removed for conflict with in-block transaction + REPLACED //! Removed for replacement +}; + /** * CTxMemPool stores valid-according-to-the-current-best-chain transactions * that may be included in the next block. @@ -340,7 +334,7 @@ struct TxMempoolInfo * Transactions are added when they are seen on the network (or created by the * local node), but not all transactions seen are added to the pool. For * example, the following new transactions will not be added to the mempool: - * - a transaction which doesn't make the mimimum fee requirements. + * - a transaction which doesn't meet the minimum fee requirements. * - a new transaction that double-spends an input of a transaction already in * the pool where the new transaction does not meet the Replace-By-Fee * requirements as defined in BIP 125. @@ -423,8 +417,6 @@ private: uint64_t totalTxSize; //!< sum of all mempool tx's virtual sizes. Differs from serialized tx size since witness data is discounted. Defined in BIP 141. uint64_t cachedInnerUsage; //!< sum of dynamic memory usage of all the map elements (NOT the maps themselves) - CFeeRate minReasonableRelayFee; - mutable int64_t lastRollingFeeUpdate; mutable bool blockSinceLastRollingFeeBump; mutable double rollingMinimumFeeRate; //!< minimum fee to get into the pool, decreases exponentially @@ -500,14 +492,11 @@ private: public: indirectmap<COutPoint, const CTransaction*> mapNextTx; - std::map<uint256, std::pair<double, CAmount> > mapDeltas; + std::map<uint256, CAmount> mapDeltas; /** Create a new CTxMemPool. - * minReasonableRelayFee should be a feerate which is, roughly, somewhere - * around what it "costs" to relay a transaction around the network and - * below which we would reasonably say a transaction has 0-effective-fee. */ - CTxMemPool(const CFeeRate& _minReasonableRelayFee); + CTxMemPool(); ~CTxMemPool(); /** @@ -526,10 +515,11 @@ public: bool addUnchecked(const uint256& hash, const CTxMemPoolEntry &entry, bool validFeeEstimate = true); bool addUnchecked(const uint256& hash, const CTxMemPoolEntry &entry, setEntries &setAncestors, bool validFeeEstimate = true); - void removeRecursive(const CTransaction &tx); + void removeRecursive(const CTransaction &tx, MemPoolRemovalReason reason = MemPoolRemovalReason::UNKNOWN); void removeForReorg(const CCoinsViewCache *pcoins, unsigned int nMemPoolHeight, int flags); void removeConflicts(const CTransaction &tx); void removeForBlock(const std::vector<CTransactionRef>& vtx, unsigned int nBlockHeight); + void clear(); void _clear(); //lock free bool CompareDepthAndScore(const uint256& hasha, const uint256& hashb); @@ -544,8 +534,8 @@ public: bool HasNoInputsOf(const CTransaction& tx) const; /** Affect CreateNewBlock prioritisation of transactions */ - void PrioritiseTransaction(const uint256 hash, const std::string strHash, double dPriorityDelta, const CAmount& nFeeDelta); - void ApplyDeltas(const uint256 hash, double &dPriorityDelta, CAmount &nFeeDelta) const; + void PrioritiseTransaction(const uint256& hash, const CAmount& nFeeDelta); + void ApplyDelta(const uint256 hash, CAmount &nFeeDelta) const; void ClearPrioritisation(const uint256 hash); public: @@ -556,7 +546,7 @@ public: * Set updateDescendants to true when removing a tx that was in a block, so * that any in-mempool descendants have their ancestor state updated. */ - void RemoveStaged(setEntries &stage, bool updateDescendants); + void RemoveStaged(setEntries &stage, bool updateDescendants, MemPoolRemovalReason reason = MemPoolRemovalReason::UNKNOWN); /** When adding transactions from a disconnected block back to the mempool, * new mempool entries may have children in the mempool (which is generally @@ -588,7 +578,7 @@ public: /** The minimum fee to get into the mempool, which may itself not be enough * for larger-sized transactions. - * The minReasonableRelayFee constructor arg is used to bound the time it + * The incrementalRelayFee policy variable is used to bound the time it * takes the fee rate to go back down all the way to 0. When the feerate * would otherwise be half of this, it is set to 0 instead. */ @@ -637,21 +627,15 @@ public: /** Estimate fee rate needed to get into the next nBlocks */ CFeeRate estimateFee(int nBlocks) const; - /** Estimate priority needed to get into the next nBlocks - * If no answer can be given at nBlocks, return an estimate - * at the lowest number of blocks where one can be given - */ - double estimateSmartPriority(int nBlocks, int *answerFoundAtBlocks = NULL) const; - - /** Estimate priority needed to get into the next nBlocks */ - double estimatePriority(int nBlocks) const; - /** Write/Read estimates to disk */ bool WriteFeeEstimates(CAutoFile& fileout) const; bool ReadFeeEstimates(CAutoFile& filein); size_t DynamicMemoryUsage() const; + boost::signals2::signal<void (CTransactionRef)> NotifyEntryAdded; + boost::signals2::signal<void (CTransactionRef, MemPoolRemovalReason)> NotifyEntryRemoved; + private: /** UpdateForDescendants is used by UpdateTransactionsFromBlock to update * the descendants for a single transaction that has been added to the @@ -688,7 +672,7 @@ private: * transactions in a chain before we've updated all the state for the * removal. */ - void removeUnchecked(txiter entry); + void removeUnchecked(txiter entry, MemPoolRemovalReason reason = MemPoolRemovalReason::UNKNOWN); }; /** @@ -706,17 +690,4 @@ public: bool HaveCoins(const uint256 &txid) const; }; -// We want to sort transactions by coin age priority -typedef std::pair<double, CTxMemPool::txiter> TxCoinAgePriority; - -struct TxCoinAgePriorityCompare -{ - bool operator()(const TxCoinAgePriority& a, const TxCoinAgePriority& b) - { - if (a.first == b.first) - return CompareTxMemPoolEntryByScore()(*(b.second), *(a.second)); //Reverse order to make sort less than - return a.first < b.first; - } -}; - #endif // BITCOIN_TXMEMPOOL_H diff --git a/src/uint256.cpp b/src/uint256.cpp index bd3d017085..c4c7b716fe 100644 --- a/src/uint256.cpp +++ b/src/uint256.cpp @@ -20,10 +20,7 @@ base_blob<BITS>::base_blob(const std::vector<unsigned char>& vch) template <unsigned int BITS> std::string base_blob<BITS>::GetHex() const { - char psz[sizeof(data) * 2 + 1]; - for (unsigned int i = 0; i < sizeof(data); i++) - sprintf(psz + i * 2, "%02x", data[sizeof(data) - i - 1]); - return std::string(psz, psz + sizeof(data) * 2); + return HexStr(std::reverse_iterator<const uint8_t*>(data + sizeof(data)), std::reverse_iterator<const uint8_t*>(data)); } template <unsigned int BITS> diff --git a/src/util.cpp b/src/util.cpp index 08ee6b8b87..486df772fb 100644 --- a/src/util.cpp +++ b/src/util.cpp @@ -97,15 +97,15 @@ namespace boost { } // namespace boost -using namespace std; + const char * const BITCOIN_CONF_FILENAME = "bitcoin.conf"; const char * const BITCOIN_PID_FILENAME = "bitcoind.pid"; CCriticalSection cs_args; -map<string, string> mapArgs; -static map<string, vector<string> > _mapMultiArgs; -const map<string, vector<string> >& mapMultiArgs = _mapMultiArgs; +std::map<std::string, std::string> mapArgs; +static std::map<std::string, std::vector<std::string> > _mapMultiArgs; +const std::map<std::string, std::vector<std::string> >& mapMultiArgs = _mapMultiArgs; bool fDebug = false; bool fPrintToConsole = false; bool fPrintToDebugLog = true; @@ -191,7 +191,7 @@ static boost::once_flag debugPrintInitFlag = BOOST_ONCE_INIT; */ static FILE* fileout = NULL; static boost::mutex* mutexDebugLog = NULL; -static list<string> *vMsgsBeforeOpenLog; +static std::list<std::string>* vMsgsBeforeOpenLog; static int FileWriteStr(const std::string &str, FILE *fp) { @@ -202,7 +202,7 @@ static void DebugPrintInit() { assert(mutexDebugLog == NULL); mutexDebugLog = new boost::mutex(); - vMsgsBeforeOpenLog = new list<string>; + vMsgsBeforeOpenLog = new std::list<std::string>; } void OpenDebugLog() @@ -214,12 +214,13 @@ void OpenDebugLog() assert(vMsgsBeforeOpenLog); boost::filesystem::path pathDebug = GetDataDir() / "debug.log"; fileout = fopen(pathDebug.string().c_str(), "a"); - if (fileout) setbuf(fileout, NULL); // unbuffered - - // dump buffered messages from before we opened the log - while (!vMsgsBeforeOpenLog->empty()) { - FileWriteStr(vMsgsBeforeOpenLog->front(), fileout); - vMsgsBeforeOpenLog->pop_front(); + if (fileout) { + setbuf(fileout, NULL); // unbuffered + // dump buffered messages from before we opened the log + while (!vMsgsBeforeOpenLog->empty()) { + FileWriteStr(vMsgsBeforeOpenLog->front(), fileout); + vMsgsBeforeOpenLog->pop_front(); + } } delete vMsgsBeforeOpenLog; @@ -237,22 +238,22 @@ bool LogAcceptCategory(const char* category) // This helps prevent issues debugging global destructors, // where mapMultiArgs might be deleted before another // global destructor calls LogPrint() - static boost::thread_specific_ptr<set<string> > ptrCategory; + static boost::thread_specific_ptr<std::set<std::string> > ptrCategory; if (ptrCategory.get() == NULL) { if (mapMultiArgs.count("-debug")) { - const vector<string>& categories = mapMultiArgs.at("-debug"); - ptrCategory.reset(new set<string>(categories.begin(), categories.end())); + const std::vector<std::string>& categories = mapMultiArgs.at("-debug"); + ptrCategory.reset(new std::set<std::string>(categories.begin(), categories.end())); // thread_specific_ptr automatically deletes the set when the thread ends. } else - ptrCategory.reset(new set<string>()); + ptrCategory.reset(new std::set<std::string>()); } - const set<string>& setCategories = *ptrCategory.get(); + const std::set<std::string>& setCategories = *ptrCategory; // if not debugging everything and not debugging specific category, LogPrint does nothing. - if (setCategories.count(string("")) == 0 && - setCategories.count(string("1")) == 0 && - setCategories.count(string(category)) == 0) + if (setCategories.count(std::string("")) == 0 && + setCategories.count(std::string("1")) == 0 && + setCategories.count(std::string(category)) == 0) return false; } return true; @@ -265,7 +266,7 @@ bool LogAcceptCategory(const char* category) */ static std::string LogTimestampStr(const std::string &str, std::atomic_bool *fStartedNewLine) { - string strStamped; + std::string strStamped; if (!fLogTimestamps) return str; @@ -292,7 +293,7 @@ int LogPrintStr(const std::string &str) int ret = 0; // Returns total number of characters written static std::atomic_bool fStartedNewLine(true); - string strTimestamped = LogTimestampStr(str, &fStartedNewLine); + std::string strTimestamped = LogTimestampStr(str, &fStartedNewLine); if (fPrintToConsole) { @@ -560,14 +561,14 @@ void ReadConfigFile(const std::string& confPath) { LOCK(cs_args); - set<string> setOptions; + std::set<std::string> setOptions; setOptions.insert("*"); for (boost::program_options::detail::config_file_iterator it(streamConfig, setOptions), end; it != end; ++it) { // Don't overwrite existing settings so command line settings override bitcoin.conf - string strKey = string("-") + it->string_key; - string strValue = it->value[0]; + std::string strKey = std::string("-") + it->string_key; + std::string strValue = it->value[0]; InterpretNegativeSetting(strKey, strValue); if (mapArgs.count(strKey) == 0) mapArgs[strKey] = strValue; @@ -723,13 +724,17 @@ void AllocateFileRange(FILE *file, unsigned int offset, unsigned int length) { void ShrinkDebugFile() { + // Amount of debug.log to save at end when shrinking (must fit in memory) + constexpr size_t RECENT_DEBUG_HISTORY_SIZE = 10 * 1000000; // Scroll debug.log if it's getting too big boost::filesystem::path pathLog = GetDataDir() / "debug.log"; FILE* file = fopen(pathLog.string().c_str(), "r"); - if (file && boost::filesystem::file_size(pathLog) > 10 * 1000000) + // If debug.log file is more than 10% bigger the RECENT_DEBUG_HISTORY_SIZE + // trim it down by saving only the last RECENT_DEBUG_HISTORY_SIZE bytes + if (file && boost::filesystem::file_size(pathLog) > 11 * (RECENT_DEBUG_HISTORY_SIZE / 10)) { // Restart the file with some of the end - std::vector <char> vch(200000,0); + std::vector<char> vch(RECENT_DEBUG_HISTORY_SIZE, 0); fseek(file, -((long)vch.size()), SEEK_END); int nBytes = fread(vch.data(), 1, vch.size(), file); fclose(file); diff --git a/src/util.h b/src/util.h index e27ce121c8..87eb16c91b 100644 --- a/src/util.h +++ b/src/util.h @@ -73,14 +73,24 @@ bool LogAcceptCategory(const char* category); /** Send a string to the log output */ int LogPrintStr(const std::string &str); -#define LogPrint(category, ...) do { \ - if (LogAcceptCategory((category))) { \ - LogPrintStr(tfm::format(__VA_ARGS__)); \ +/** Get format string from VA_ARGS for error reporting */ +template<typename... Args> std::string FormatStringFromLogArgs(const char *fmt, const Args&... args) { return fmt; } + +#define LogPrintf(...) do { \ + std::string _log_msg_; /* Unlikely name to avoid shadowing variables */ \ + try { \ + _log_msg_ = tfm::format(__VA_ARGS__); \ + } catch (tinyformat::format_error &e) { \ + /* Original format string will have newline so don't add one here */ \ + _log_msg_ = "Error \"" + std::string(e.what()) + "\" while formatting log message: " + FormatStringFromLogArgs(__VA_ARGS__); \ } \ + LogPrintStr(_log_msg_); \ } while(0) -#define LogPrintf(...) do { \ - LogPrintStr(tfm::format(__VA_ARGS__)); \ +#define LogPrint(category, ...) do { \ + if (LogAcceptCategory((category))) { \ + LogPrintf(__VA_ARGS__); \ + } \ } while(0) template<typename... Args> diff --git a/src/utilmoneystr.cpp b/src/utilmoneystr.cpp index bebe56130d..6e6e33184e 100644 --- a/src/utilmoneystr.cpp +++ b/src/utilmoneystr.cpp @@ -9,8 +9,6 @@ #include "tinyformat.h" #include "utilstrencodings.h" -using namespace std; - std::string FormatMoney(const CAmount& n) { // Note: not using straight sprintf here because we do NOT want @@ -18,7 +16,7 @@ std::string FormatMoney(const CAmount& n) int64_t n_abs = (n > 0 ? n : -n); int64_t quotient = n_abs/COIN; int64_t remainder = n_abs%COIN; - string str = strprintf("%d.%08d", quotient, remainder); + std::string str = strprintf("%d.%08d", quotient, remainder); // Right-trim excess zeros before the decimal point: int nTrim = 0; @@ -33,14 +31,14 @@ std::string FormatMoney(const CAmount& n) } -bool ParseMoney(const string& str, CAmount& nRet) +bool ParseMoney(const std::string& str, CAmount& nRet) { return ParseMoney(str.c_str(), nRet); } bool ParseMoney(const char* pszIn, CAmount& nRet) { - string strWhole; + std::string strWhole; int64_t nUnits = 0; const char* p = pszIn; while (isspace(*p)) diff --git a/src/utilstrencodings.cpp b/src/utilstrencodings.cpp index 025040c43a..74bf66fbf6 100644 --- a/src/utilstrencodings.cpp +++ b/src/utilstrencodings.cpp @@ -12,19 +12,18 @@ #include <errno.h> #include <limits> -using namespace std; +static const std::string CHARS_ALPHA_NUM = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"; -static const string CHARS_ALPHA_NUM = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"; - -static const string SAFE_CHARS[] = +static const std::string SAFE_CHARS[] = { CHARS_ALPHA_NUM + " .,;-_/:?@()", // SAFE_CHARS_DEFAULT - CHARS_ALPHA_NUM + " .,;-_?@" // SAFE_CHARS_UA_COMMENT + CHARS_ALPHA_NUM + " .,;-_?@", // SAFE_CHARS_UA_COMMENT + CHARS_ALPHA_NUM + ".-_", // SAFE_CHARS_FILENAME }; -string SanitizeString(const string& str, int rule) +std::string SanitizeString(const std::string& str, int rule) { - string strResult; + std::string strResult; for (std::string::size_type i = 0; i < str.size(); i++) { if (SAFE_CHARS[rule].find(str[i]) != std::string::npos) @@ -56,7 +55,7 @@ signed char HexDigit(char c) return p_util_hexdigit[(unsigned char)c]; } -bool IsHex(const string& str) +bool IsHex(const std::string& str) { for(std::string::const_iterator it(str.begin()); it != str.end(); ++it) { @@ -66,10 +65,10 @@ bool IsHex(const string& str) return (str.size() > 0) && (str.size()%2 == 0); } -vector<unsigned char> ParseHex(const char* psz) +std::vector<unsigned char> ParseHex(const char* psz) { // convert hex dump to vector - vector<unsigned char> vch; + std::vector<unsigned char> vch; while (true) { while (isspace(*psz)) @@ -87,16 +86,16 @@ vector<unsigned char> ParseHex(const char* psz) return vch; } -vector<unsigned char> ParseHex(const string& str) +std::vector<unsigned char> ParseHex(const std::string& str) { return ParseHex(str.c_str()); } -string EncodeBase64(const unsigned char* pch, size_t len) +std::string EncodeBase64(const unsigned char* pch, size_t len) { static const char *pbase64 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; - string strRet=""; + std::string strRet = ""; strRet.reserve((len+2)/3*4); int mode=0, left=0; @@ -138,12 +137,12 @@ string EncodeBase64(const unsigned char* pch, size_t len) return strRet; } -string EncodeBase64(const string& str) +std::string EncodeBase64(const std::string& str) { return EncodeBase64((const unsigned char*)str.c_str(), str.size()); } -vector<unsigned char> DecodeBase64(const char* p, bool* pfInvalid) +std::vector<unsigned char> DecodeBase64(const char* p, bool* pfInvalid) { static const int decode64_table[256] = { @@ -165,7 +164,7 @@ vector<unsigned char> DecodeBase64(const char* p, bool* pfInvalid) if (pfInvalid) *pfInvalid = false; - vector<unsigned char> vchRet; + std::vector<unsigned char> vchRet; vchRet.reserve(strlen(p)*3/4); int mode = 0; @@ -226,17 +225,17 @@ vector<unsigned char> DecodeBase64(const char* p, bool* pfInvalid) return vchRet; } -string DecodeBase64(const string& str) +std::string DecodeBase64(const std::string& str) { - vector<unsigned char> vchRet = DecodeBase64(str.c_str()); - return (vchRet.size() == 0) ? string() : string((const char*)&vchRet[0], vchRet.size()); + std::vector<unsigned char> vchRet = DecodeBase64(str.c_str()); + return (vchRet.size() == 0) ? std::string() : std::string((const char*)&vchRet[0], vchRet.size()); } -string EncodeBase32(const unsigned char* pch, size_t len) +std::string EncodeBase32(const unsigned char* pch, size_t len) { static const char *pbase32 = "abcdefghijklmnopqrstuvwxyz234567"; - string strRet=""; + std::string strRet=""; strRet.reserve((len+4)/5*8); int mode=0, left=0; @@ -291,12 +290,12 @@ string EncodeBase32(const unsigned char* pch, size_t len) return strRet; } -string EncodeBase32(const string& str) +std::string EncodeBase32(const std::string& str) { return EncodeBase32((const unsigned char*)str.c_str(), str.size()); } -vector<unsigned char> DecodeBase32(const char* p, bool* pfInvalid) +std::vector<unsigned char> DecodeBase32(const char* p, bool* pfInvalid) { static const int decode32_table[256] = { @@ -318,7 +317,7 @@ vector<unsigned char> DecodeBase32(const char* p, bool* pfInvalid) if (pfInvalid) *pfInvalid = false; - vector<unsigned char> vchRet; + std::vector<unsigned char> vchRet; vchRet.reserve((strlen(p))*5/8); int mode = 0; @@ -413,10 +412,10 @@ vector<unsigned char> DecodeBase32(const char* p, bool* pfInvalid) return vchRet; } -string DecodeBase32(const string& str) +std::string DecodeBase32(const std::string& str) { - vector<unsigned char> vchRet = DecodeBase32(str.c_str()); - return (vchRet.size() == 0) ? string() : string((const char*)&vchRet[0], vchRet.size()); + std::vector<unsigned char> vchRet = DecodeBase32(str.c_str()); + return (vchRet.size() == 0) ? std::string() : std::string((const char*)&vchRet[0], vchRet.size()); } static bool ParsePrechecks(const std::string& str) diff --git a/src/utilstrencodings.h b/src/utilstrencodings.h index cb6f014fc2..e2a1b9bef9 100644 --- a/src/utilstrencodings.h +++ b/src/utilstrencodings.h @@ -26,7 +26,8 @@ enum SafeChars { SAFE_CHARS_DEFAULT, //!< The full set of allowed chars - SAFE_CHARS_UA_COMMENT //!< BIP-0014 subset + SAFE_CHARS_UA_COMMENT, //!< BIP-0014 subset + SAFE_CHARS_FILENAME, //!< Chars allowed in filenames }; /** diff --git a/src/utiltime.cpp b/src/utiltime.cpp index 7c5ee77265..a9936a645a 100644 --- a/src/utiltime.cpp +++ b/src/utiltime.cpp @@ -12,8 +12,6 @@ #include <boost/date_time/posix_time/posix_time.hpp> #include <boost/thread.hpp> -using namespace std; - static int64_t nMockTime = 0; //!< For unit testing int64_t GetTime() @@ -46,6 +44,11 @@ int64_t GetTimeMicros() return now; } +int64_t GetSystemTimeInSeconds() +{ + return GetTimeMicros()/1000000; +} + /** Return a time useful for the debug log */ int64_t GetLogTimeMicros() { @@ -58,7 +61,7 @@ void MilliSleep(int64_t n) { /** - * Boost's sleep_for was uninterruptable when backed by nanosleep from 1.50 + * Boost's sleep_for was uninterruptible when backed by nanosleep from 1.50 * until fixed in 1.52. Use the deprecated sleep method for the broken case. * See: https://svn.boost.org/trac/boost/ticket/7238 */ diff --git a/src/utiltime.h b/src/utiltime.h index b2807267db..cc3290c631 100644 --- a/src/utiltime.h +++ b/src/utiltime.h @@ -9,9 +9,20 @@ #include <stdint.h> #include <string> +/** + * GetTimeMicros() and GetTimeMillis() both return the system time, but in + * different units. GetTime() returns the system time in seconds, but also + * supports mocktime, where the time can be specified by the user, eg for + * testing (eg with the setmocktime rpc, or -mocktime argument). + * + * TODO: Rework these functions to be type-safe (so that we don't inadvertently + * compare numbers with different units, or compare a mocktime to system time). + */ + int64_t GetTime(); int64_t GetTimeMillis(); int64_t GetTimeMicros(); +int64_t GetSystemTimeInSeconds(); // Like GetTime(), but not mockable int64_t GetLogTimeMicros(); void SetMockTime(int64_t nMockTimeIn); void MilliSleep(int64_t n); diff --git a/src/validation.cpp b/src/validation.cpp index 37a4186e0a..be82026b3c 100644 --- a/src/validation.cpp +++ b/src/validation.cpp @@ -46,8 +46,6 @@ #include <boost/math/distributions/poisson.hpp> #include <boost/thread.hpp> -using namespace std; - #if defined(NDEBUG) # error "Bitcoin cannot be compiled without assertions." #endif @@ -78,18 +76,19 @@ uint64_t nPruneTarget = 0; int64_t nMaxTipAge = DEFAULT_MAX_TIP_AGE; bool fEnableReplacement = DEFAULT_ENABLE_REPLACEMENT; +uint256 hashAssumeValid; CFeeRate minRelayTxFee = CFeeRate(DEFAULT_MIN_RELAY_TX_FEE); CAmount maxTxFee = DEFAULT_TRANSACTION_MAXFEE; -CTxMemPool mempool(::minRelayTxFee); +CTxMemPool mempool; static void CheckBlockIndex(const Consensus::Params& consensusParams); /** Constant stuff for coinbase transactions we create: */ CScript COINBASE_FLAGS; -const string strMessageMagic = "Bitcoin Signed Message:\n"; +const std::string strMessageMagic = "Bitcoin Signed Message:\n"; // Internal stuff namespace { @@ -122,11 +121,11 @@ namespace { * as good as our current tip or better. Entries may be failed, though, and pruning nodes may be * missing the data for the block. */ - set<CBlockIndex*, CBlockIndexWorkComparator> setBlockIndexCandidates; + std::set<CBlockIndex*, CBlockIndexWorkComparator> setBlockIndexCandidates; /** All pairs A->B, where A (or one of its ancestors) misses transactions, but B has transactions. * Pruned nodes may have entries where B is missing data. */ - multimap<CBlockIndex*, CBlockIndex*> mapBlocksUnlinked; + std::multimap<CBlockIndex*, CBlockIndex*> mapBlocksUnlinked; CCriticalSection cs_LastBlockFile; std::vector<CBlockFileInfo> vinfoBlockFile; @@ -150,12 +149,45 @@ namespace { arith_uint256 nLastPreciousChainwork = 0; /** Dirty block index entries. */ - set<CBlockIndex*> setDirtyBlockIndex; + std::set<CBlockIndex*> setDirtyBlockIndex; /** Dirty block file entries. */ - set<int> setDirtyFileInfo; + std::set<int> setDirtyFileInfo; } // anon namespace +/* Use this class to start tracking transactions that are removed from the + * mempool and pass all those transactions through SyncTransaction when the + * object goes out of scope. This is currently only used to call SyncTransaction + * on conflicts removed from the mempool during block connection. Applied in + * ActivateBestChain around ActivateBestStep which in turn calls: + * ConnectTip->removeForBlock->removeConflicts + */ +class MemPoolConflictRemovalTracker +{ +private: + std::vector<CTransactionRef> conflictedTxs; + CTxMemPool &pool; + +public: + MemPoolConflictRemovalTracker(CTxMemPool &_pool) : pool(_pool) { + pool.NotifyEntryRemoved.connect(boost::bind(&MemPoolConflictRemovalTracker::NotifyEntryRemoved, this, _1, _2)); + } + + void NotifyEntryRemoved(CTransactionRef txRemoved, MemPoolRemovalReason reason) { + if (reason == MemPoolRemovalReason::CONFLICT) { + conflictedTxs.push_back(txRemoved); + } + } + + ~MemPoolConflictRemovalTracker() { + pool.NotifyEntryRemoved.disconnect(boost::bind(&MemPoolConflictRemovalTracker::NotifyEntryRemoved, this, _1, _2)); + for (const auto& tx : conflictedTxs) { + GetMainSignals().SyncTransaction(*tx, NULL, CMainSignals::SYNC_TRANSACTION_NOT_IN_BLOCK); + } + conflictedTxs.clear(); + } +}; + CBlockIndex* FindForkInGlobalIndex(const CChain& chain, const CBlockLocator& locator) { // Find the first block the caller has in the main chain @@ -185,7 +217,8 @@ enum FlushStateMode { }; // See definition for documentation -bool static FlushStateToDisk(CValidationState &state, FlushStateMode mode); +bool static FlushStateToDisk(CValidationState &state, FlushStateMode mode, int nManualPruneHeight=0); +void FindFilesToPruneManual(std::set<int>& setFilesToPrune, int nManualPruneHeight); bool IsFinalTx(const CTransaction &tx, int nBlockHeight, int64_t nBlockTime) { @@ -482,7 +515,7 @@ bool CheckTransaction(const CTransaction& tx, CValidationState &state, bool fChe // Check for duplicate inputs - note that this check is slow so we skip it in CheckBlock if (fCheckDuplicateInputs) { - set<COutPoint> vInOutPoints; + std::set<COutPoint> vInOutPoints; for (const auto& txin : tx.vin) { if (!vInOutPoints.insert(txin.prevout).second) @@ -538,8 +571,8 @@ static bool IsCurrentForFeeEstimation() } bool AcceptToMemoryPoolWorker(CTxMemPool& pool, CValidationState& state, const CTransactionRef& ptx, bool fLimitFree, - bool* pfMissingInputs, int64_t nAcceptTime, bool fOverrideMempoolLimit, const CAmount& nAbsurdFee, - std::vector<uint256>& vHashTxnToUncache) + bool* pfMissingInputs, int64_t nAcceptTime, std::list<CTransactionRef>* plTxnReplaced, + bool fOverrideMempoolLimit, const CAmount& nAbsurdFee, std::vector<uint256>& vHashTxnToUncache) { const CTransaction& tx = *ptx; const uint256 hash = tx.GetHash(); @@ -561,7 +594,7 @@ bool AcceptToMemoryPoolWorker(CTxMemPool& pool, CValidationState& state, const C } // Rather not work on nonstandard transactions (unless -testnet/-regtest) - string reason; + std::string reason; if (fRequireStandard && !IsStandardTx(tx, reason, witnessEnabled)) return state.DoS(0, false, REJECT_NONSTANDARD, reason); @@ -576,7 +609,7 @@ bool AcceptToMemoryPoolWorker(CTxMemPool& pool, CValidationState& state, const C return state.Invalid(false, REJECT_ALREADY_KNOWN, "txn-already-in-mempool"); // Check for conflicts with in-memory transactions - set<uint256> setConflicts; + std::set<uint256> setConflicts; { LOCK(pool.cs); // protect pool.mapNextTx BOOST_FOREACH(const CTxIn &txin, tx.vin) @@ -687,11 +720,7 @@ bool AcceptToMemoryPoolWorker(CTxMemPool& pool, CValidationState& state, const C CAmount nFees = nValueIn-nValueOut; // nModifiedFees includes any fee deltas from PrioritiseTransaction CAmount nModifiedFees = nFees; - double nPriorityDummy = 0; - pool.ApplyDeltas(hash, nPriorityDummy, nModifiedFees); - - CAmount inChainInputValue; - double dPriority = view.GetPriority(tx, chainActive.Height(), inChainInputValue); + pool.ApplyDelta(hash, nModifiedFees); // Keep track of transactions that spend a coinbase, which we re-scan // during reorgs to ensure COINBASE_MATURITY is still met. @@ -704,8 +733,8 @@ bool AcceptToMemoryPoolWorker(CTxMemPool& pool, CValidationState& state, const C } } - CTxMemPoolEntry entry(ptx, nFees, nAcceptTime, dPriority, chainActive.Height(), - inChainInputValue, fSpendsCoinbase, nSigOpsCost, lp); + CTxMemPoolEntry entry(ptx, nFees, nAcceptTime, chainActive.Height(), + fSpendsCoinbase, nSigOpsCost, lp); unsigned int nSize = entry.GetTxSize(); // Check that the transaction doesn't have an excessive number of @@ -720,32 +749,11 @@ bool AcceptToMemoryPoolWorker(CTxMemPool& pool, CValidationState& state, const C CAmount mempoolRejectFee = pool.GetMinFee(GetArg("-maxmempool", DEFAULT_MAX_MEMPOOL_SIZE) * 1000000).GetFee(nSize); if (mempoolRejectFee > 0 && nModifiedFees < mempoolRejectFee) { return state.DoS(0, false, REJECT_INSUFFICIENTFEE, "mempool min fee not met", false, strprintf("%d < %d", nFees, mempoolRejectFee)); - } else if (GetBoolArg("-relaypriority", DEFAULT_RELAYPRIORITY) && nModifiedFees < ::minRelayTxFee.GetFee(nSize) && !AllowFree(entry.GetPriority(chainActive.Height() + 1))) { - // Require that free transactions have sufficient priority to be mined in the next block. - return state.DoS(0, false, REJECT_INSUFFICIENTFEE, "insufficient priority"); } - // Continuously rate-limit free (really, very-low-fee) transactions - // This mitigates 'penny-flooding' -- sending thousands of free transactions just to - // be annoying or make others' transactions take longer to confirm. - if (fLimitFree && nModifiedFees < ::minRelayTxFee.GetFee(nSize)) - { - static CCriticalSection csFreeLimiter; - static double dFreeCount; - static int64_t nLastTime; - int64_t nNow = GetTime(); - - LOCK(csFreeLimiter); - - // Use an exponentially decaying ~10-minute window: - dFreeCount *= pow(1.0 - 1.0/600.0, (double)(nNow - nLastTime)); - nLastTime = nNow; - // -limitfreerelay unit is thousand-bytes-per-minute - // At default rate it would take over a month to fill 1GB - if (dFreeCount + nSize >= GetArg("-limitfreerelay", DEFAULT_LIMITFREERELAY) * 10 * 1000) - return state.DoS(0, false, REJECT_INSUFFICIENTFEE, "rate limited free transaction"); - LogPrint("mempool", "Rate limit dFreeCount: %g => %g\n", dFreeCount, dFreeCount+nSize); - dFreeCount += nSize; + // No transactions are allowed below minRelayTxFee except from disconnected blocks + if (fLimitFree && nModifiedFees < ::minRelayTxFee.GetFee(nSize)) { + return state.DoS(0, false, REJECT_INSUFFICIENTFEE, "min relay fee not met"); } if (nAbsurdFee && nFees > nAbsurdFee) @@ -792,10 +800,11 @@ bool AcceptToMemoryPoolWorker(CTxMemPool& pool, CValidationState& state, const C // subsequent RemoveStaged() and addUnchecked() calls don't guarantee // mempool consistency for us. LOCK(pool.cs); - if (setConflicts.size()) + const bool fReplacementTransaction = setConflicts.size(); + if (fReplacementTransaction) { CFeeRate newFeeRate(nModifiedFees, nSize); - set<uint256> setConflictsParents; + std::set<uint256> setConflictsParents; const int maxDescendantsToVisit = 100; CTxMemPool::setEntries setIterConflicting; BOOST_FOREACH(const uint256 &hashConflicting, setConflicts) @@ -896,14 +905,14 @@ bool AcceptToMemoryPoolWorker(CTxMemPool& pool, CValidationState& state, const C // Finally in addition to paying more fees than the conflicts the // new transaction must pay for its own bandwidth. CAmount nDeltaFees = nModifiedFees - nConflictingFees; - if (nDeltaFees < ::minRelayTxFee.GetFee(nSize)) + if (nDeltaFees < ::incrementalRelayFee.GetFee(nSize)) { return state.DoS(0, false, REJECT_INSUFFICIENTFEE, "insufficient fee", false, strprintf("rejecting replacement %s, not enough additional fees to relay; %s < %s", hash.ToString(), FormatMoney(nDeltaFees), - FormatMoney(::minRelayTxFee.GetFee(nSize)))); + FormatMoney(::incrementalRelayFee.GetFee(nSize)))); } } @@ -919,12 +928,13 @@ bool AcceptToMemoryPoolWorker(CTxMemPool& pool, CValidationState& state, const C // SCRIPT_VERIFY_CLEANSTACK requires SCRIPT_VERIFY_WITNESS, so we // need to turn both off, and compare against just turning off CLEANSTACK // to see if the failure is specifically due to witness validation. - if (!tx.HasWitness() && CheckInputs(tx, state, view, true, scriptVerifyFlags & ~(SCRIPT_VERIFY_WITNESS | SCRIPT_VERIFY_CLEANSTACK), true, txdata) && - !CheckInputs(tx, state, view, true, scriptVerifyFlags & ~SCRIPT_VERIFY_CLEANSTACK, true, txdata)) { + CValidationState stateDummy; // Want reported failures to be from first CheckInputs + if (!tx.HasWitness() && CheckInputs(tx, stateDummy, view, true, scriptVerifyFlags & ~(SCRIPT_VERIFY_WITNESS | SCRIPT_VERIFY_CLEANSTACK), true, txdata) && + !CheckInputs(tx, stateDummy, view, true, scriptVerifyFlags & ~SCRIPT_VERIFY_CLEANSTACK, true, txdata)) { // Only the witness is missing, so the transaction itself may be fine. state.SetCorruptionPossible(); } - return false; + return false; // state filled in by CheckInputs } // Check again against just the consensus-critical mandatory script @@ -950,13 +960,16 @@ bool AcceptToMemoryPoolWorker(CTxMemPool& pool, CValidationState& state, const C hash.ToString(), FormatMoney(nModifiedFees - nConflictingFees), (int)nSize - (int)nConflictingSize); + if (plTxnReplaced) + plTxnReplaced->push_back(it->GetSharedTx()); } - pool.RemoveStaged(allConflicting, false); + pool.RemoveStaged(allConflicting, false, MemPoolRemovalReason::REPLACED); - // This transaction should only count for fee estimation if - // the node is not behind and it is not dependent on any other - // transactions in the mempool - bool validForFeeEstimation = IsCurrentForFeeEstimation() && pool.HasNoInputsOf(tx); + // This transaction should only count for fee estimation if it isn't a + // BIP 125 replacement transaction (may not be widely supported), the + // node is not behind, and the transaction is not dependent on any other + // transactions in the mempool. + bool validForFeeEstimation = !fReplacementTransaction && IsCurrentForFeeEstimation() && pool.HasNoInputsOf(tx); // Store transaction in memory pool.addUnchecked(hash, entry, setAncestors, validForFeeEstimation); @@ -975,10 +988,11 @@ bool AcceptToMemoryPoolWorker(CTxMemPool& pool, CValidationState& state, const C } bool AcceptToMemoryPoolWithTime(CTxMemPool& pool, CValidationState &state, const CTransactionRef &tx, bool fLimitFree, - bool* pfMissingInputs, int64_t nAcceptTime, bool fOverrideMempoolLimit, const CAmount nAbsurdFee) + bool* pfMissingInputs, int64_t nAcceptTime, std::list<CTransactionRef>* plTxnReplaced, + bool fOverrideMempoolLimit, const CAmount nAbsurdFee) { std::vector<uint256> vHashTxToUncache; - bool res = AcceptToMemoryPoolWorker(pool, state, tx, fLimitFree, pfMissingInputs, nAcceptTime, fOverrideMempoolLimit, nAbsurdFee, vHashTxToUncache); + bool res = AcceptToMemoryPoolWorker(pool, state, tx, fLimitFree, pfMissingInputs, nAcceptTime, plTxnReplaced, fOverrideMempoolLimit, nAbsurdFee, vHashTxToUncache); if (!res) { BOOST_FOREACH(const uint256& hashTx, vHashTxToUncache) pcoinsTip->Uncache(hashTx); @@ -990,9 +1004,10 @@ bool AcceptToMemoryPoolWithTime(CTxMemPool& pool, CValidationState &state, const } bool AcceptToMemoryPool(CTxMemPool& pool, CValidationState &state, const CTransactionRef &tx, bool fLimitFree, - bool* pfMissingInputs, bool fOverrideMempoolLimit, const CAmount nAbsurdFee) + bool* pfMissingInputs, std::list<CTransactionRef>* plTxnReplaced, + bool fOverrideMempoolLimit, const CAmount nAbsurdFee) { - return AcceptToMemoryPoolWithTime(pool, state, tx, fLimitFree, pfMissingInputs, GetTime(), fOverrideMempoolLimit, nAbsurdFee); + return AcceptToMemoryPoolWithTime(pool, state, tx, fLimitFree, pfMissingInputs, GetTime(), plTxnReplaced, fOverrideMempoolLimit, nAbsurdFee); } /** Return transaction in txOut, and if it was found inside a block, its hash is placed in hashBlock */ @@ -1388,11 +1403,10 @@ bool CheckInputs(const CTransaction& tx, CValidationState &state, const CCoinsVi // Only if ALL inputs pass do we perform expensive ECDSA signature checks. // Helps prevent CPU exhaustion attacks. - // Skip ECDSA signature verification when connecting blocks before the - // last block chain checkpoint. Assuming the checkpoints are valid this + // Skip script verification when connecting blocks under the + // assumevalid block. Assuming the assumevalid block is valid this // is safe because block merkle hashes are still computed and checked, - // and any change will be caught at the next checkpoint. Of course, if - // the checkpoint is for a chain that's invalid due to false scriptSigs + // Of course, if an assumed valid block is invalid due to false scriptSigs // this optimization would allow an invalid chain to be accepted. if (fScriptChecks) { for (unsigned int i = 0; i < tx.vin.size(); i++) { @@ -1700,7 +1714,10 @@ bool ConnectBlock(const CBlock& block, CValidationState& state, CBlockIndex* pin CCoinsViewCache& view, const CChainParams& chainparams, bool fJustCheck) { AssertLockHeld(cs_main); - + assert(pindex); + // pindex->phashBlock can be null if called by CreateNewBlock/TestBlockValidity + assert((pindex->phashBlock == NULL) || + (*pindex->phashBlock == block.GetHash())); int64_t nTimeStart = GetTimeMicros(); // Check it again in case a previous version let a bad block in @@ -1720,11 +1737,28 @@ bool ConnectBlock(const CBlock& block, CValidationState& state, CBlockIndex* pin } bool fScriptChecks = true; - if (fCheckpointsEnabled) { - CBlockIndex *pindexLastCheckpoint = Checkpoints::GetLastCheckpoint(chainparams.Checkpoints()); - if (pindexLastCheckpoint && pindexLastCheckpoint->GetAncestor(pindex->nHeight) == pindex) { - // This block is an ancestor of a checkpoint: disable script checks - fScriptChecks = false; + if (!hashAssumeValid.IsNull()) { + // We've been configured with the hash of a block which has been externally verified to have a valid history. + // A suitable default value is included with the software and updated from time to time. Because validity + // relative to a piece of software is an objective fact these defaults can be easily reviewed. + // This setting doesn't force the selection of any particular chain but makes validating some faster by + // effectively caching the result of part of the verification. + BlockMap::const_iterator it = mapBlockIndex.find(hashAssumeValid); + if (it != mapBlockIndex.end()) { + if (it->second->GetAncestor(pindex->nHeight) == pindex && + pindexBestHeader->GetAncestor(pindex->nHeight) == pindex && + pindexBestHeader->nChainWork >= UintToArith256(chainparams.GetConsensus().nMinimumChainWork)) { + // This block is a member of the assumed verified chain and an ancestor of the best header. + // The equivalent time check discourages hash power from extorting the network via DOS attack + // into accepting an invalid block through telling users they must manually set assumevalid. + // Requiring a software change or burying the invalid block, regardless of the setting, makes + // it hard to hide the implication of the demand. This also avoids having release candidates + // that are hardly doing any signature verification at all in testing without having to + // artificially set the default assumed verified block further back. + // The test against nMinimumChainWork prevents the skipping when denied access to any chain at + // least as good as the expected chain. + fScriptChecks = (GetBlockProofEquivalentTime(*pindexBestHeader, *pindex, *pindexBestHeader, chainparams.GetConsensus()) <= 60 * 60 * 24 * 7 * 2); + } } } @@ -1934,7 +1968,7 @@ bool ConnectBlock(const CBlock& block, CValidationState& state, CBlockIndex* pin * if they're too large, if it's been a while since the last write, * or always and in all cases if we're in prune mode and are deleting files. */ -bool static FlushStateToDisk(CValidationState &state, FlushStateMode mode) { +bool static FlushStateToDisk(CValidationState &state, FlushStateMode mode, int nManualPruneHeight) { int64_t nMempoolUsage = mempool.DynamicMemoryUsage(); const CChainParams& chainparams = Params(); LOCK2(cs_main, cs_LastBlockFile); @@ -1944,9 +1978,13 @@ bool static FlushStateToDisk(CValidationState &state, FlushStateMode mode) { std::set<int> setFilesToPrune; bool fFlushForPrune = false; try { - if (fPruneMode && fCheckForPruning && !fReindex) { - FindFilesToPrune(setFilesToPrune, chainparams.PruneAfterHeight()); - fCheckForPruning = false; + if (fPruneMode && (fCheckForPruning || nManualPruneHeight > 0) && !fReindex) { + if (nManualPruneHeight > 0) { + FindFilesToPruneManual(setFilesToPrune, nManualPruneHeight); + } else { + FindFilesToPrune(setFilesToPrune, chainparams.PruneAfterHeight()); + fCheckForPruning = false; + } if (!setFilesToPrune.empty()) { fFlushForPrune = true; if (!fHavePruned) { @@ -1990,18 +2028,18 @@ bool static FlushStateToDisk(CValidationState &state, FlushStateMode mode) { { std::vector<std::pair<int, const CBlockFileInfo*> > vFiles; vFiles.reserve(setDirtyFileInfo.size()); - for (set<int>::iterator it = setDirtyFileInfo.begin(); it != setDirtyFileInfo.end(); ) { - vFiles.push_back(make_pair(*it, &vinfoBlockFile[*it])); + for (std::set<int>::iterator it = setDirtyFileInfo.begin(); it != setDirtyFileInfo.end(); ) { + vFiles.push_back(std::make_pair(*it, &vinfoBlockFile[*it])); setDirtyFileInfo.erase(it++); } std::vector<const CBlockIndex*> vBlocks; vBlocks.reserve(setDirtyBlockIndex.size()); - for (set<CBlockIndex*>::iterator it = setDirtyBlockIndex.begin(); it != setDirtyBlockIndex.end(); ) { + for (std::set<CBlockIndex*>::iterator it = setDirtyBlockIndex.begin(); it != setDirtyBlockIndex.end(); ) { vBlocks.push_back(*it); setDirtyBlockIndex.erase(it++); } if (!pblocktree->WriteBatchSync(vFiles, nLastBlockFile, vBlocks)) { - return AbortNode(state, "Files to write to block index database"); + return AbortNode(state, "Failed to write to block index database"); } } // Finally remove any pruned files @@ -2101,7 +2139,7 @@ void static UpdateTip(CBlockIndex *pindexNew, const CChainParams& chainParams) { chainActive.Tip()->GetBlockHash().ToString(), chainActive.Height(), chainActive.Tip()->nVersion, log(chainActive.Tip()->nChainWork.getdouble())/log(2.0), (unsigned long)chainActive.Tip()->nChainTx, DateTimeStrFormat("%Y-%m-%d %H:%M:%S", chainActive.Tip()->GetBlockTime()), - Checkpoints::GuessVerificationProgress(chainParams.Checkpoints(), chainActive.Tip()), pcoinsTip->DynamicMemoryUsage() * (1.0 / (1<<20)), pcoinsTip->GetCacheSize()); + GuessVerificationProgress(chainParams.TxData(), chainActive.Tip()), pcoinsTip->DynamicMemoryUsage() * (1.0 / (1<<20)), pcoinsTip->GetCacheSize()); if (!warningMessages.empty()) LogPrintf(" warning='%s'", boost::algorithm::join(warningMessages, ", ")); LogPrintf("\n"); @@ -2138,8 +2176,8 @@ bool static DisconnectTip(CValidationState& state, const CChainParams& chainpara const CTransaction& tx = *it; // ignore validation errors in resurrected transactions CValidationState stateDummy; - if (tx.IsCoinBase() || !AcceptToMemoryPool(mempool, stateDummy, it, false, NULL, true)) { - mempool.removeRecursive(tx); + if (tx.IsCoinBase() || !AcceptToMemoryPool(mempool, stateDummy, it, false, NULL, NULL, true)) { + mempool.removeRecursive(tx, MemPoolRemovalReason::REORG); } else if (mempool.exists(tx.GetHash())) { vHashUpdate.push_back(tx.GetHash()); } @@ -2409,6 +2447,11 @@ static void NotifyHeaderTip() { * that is already loaded (to avoid loading it again from disk). */ bool ActivateBestChain(CValidationState &state, const CChainParams& chainparams, std::shared_ptr<const CBlock> pblock) { + // Note that while we're often called here from ProcessNewBlock, this is + // far from a guarantee. Things in the P2P/RPC will often end up calling + // us in the middle of ProcessNewBlock - do not assume pblock is set + // sanely for performance or correctness! + CBlockIndex *pindexMostWork = NULL; CBlockIndex *pindexNewTip = NULL; do { @@ -2421,6 +2464,14 @@ bool ActivateBestChain(CValidationState &state, const CChainParams& chainparams, bool fInitialDownload; { LOCK(cs_main); + { // TODO: Temporarily ensure that mempool removals are notified before + // connected transactions. This shouldn't matter, but the abandoned + // state of transactions in our wallet is currently cleared when we + // receive another notification and there is a race condition where + // notification of a connected conflict might cause an outside process + // to abandon a transaction and then have it inadvertently cleared by + // the notification that the conflicted transaction was evicted. + MemPoolConflictRemovalTracker mrt(mempool); CBlockIndex *pindexOldTip = chainActive.Tip(); if (pindexMostWork == NULL) { pindexMostWork = FindMostWorkChain(); @@ -2442,20 +2493,23 @@ bool ActivateBestChain(CValidationState &state, const CChainParams& chainparams, pindexNewTip = chainActive.Tip(); pindexFork = chainActive.FindFork(pindexOldTip); fInitialDownload = IsInitialBlockDownload(); + + // throw all transactions though the signal-interface + + } // MemPoolConflictRemovalTracker destroyed and conflict evictions are notified + + // Transactions in the connected block are notified + for (const auto& pair : connectTrace.blocksConnected) { + assert(pair.second); + const CBlock& block = *(pair.second); + for (unsigned int i = 0; i < block.vtx.size(); i++) + GetMainSignals().SyncTransaction(*block.vtx[i], pair.first, i); + } } // When we reach this point, we switched to a new tip (stored in pindexNewTip). // Notifications/callbacks that can run without cs_main - // throw all transactions though the signal-interface - // while _not_ holding the cs_main lock - for (const auto& pair : connectTrace.blocksConnected) { - assert(pair.second); - const CBlock& block = *(pair.second); - for (unsigned int i = 0; i < block.vtx.size(); i++) - GetMainSignals().SyncTransaction(*block.vtx[i], pair.first, i); - } - // Notify external listeners about the new tip. GetMainSignals().UpdatedBlockTip(pindexNewTip, pindexFork, fInitialDownload); @@ -2592,7 +2646,7 @@ CBlockIndex* AddToBlockIndex(const CBlockHeader& block) // to avoid miners withholding blocks but broadcasting headers, to get a // competitive advantage. pindexNew->nSequenceId = 0; - BlockMap::iterator mi = mapBlockIndex.insert(make_pair(hash, pindexNew)).first; + BlockMap::iterator mi = mapBlockIndex.insert(std::make_pair(hash, pindexNew)).first; pindexNew->phashBlock = &((*mi).first); BlockMap::iterator miPrev = mapBlockIndex.find(block.hashPrevBlock); if (miPrev != mapBlockIndex.end()) @@ -2601,6 +2655,7 @@ CBlockIndex* AddToBlockIndex(const CBlockHeader& block) pindexNew->nHeight = pindexNew->pprev->nHeight + 1; pindexNew->BuildSkip(); } + pindexNew->nTimeMax = (pindexNew->pprev ? std::max(pindexNew->pprev->nTimeMax, pindexNew->nTime) : pindexNew->nTime); pindexNew->nChainWork = (pindexNew->pprev ? pindexNew->pprev->nChainWork : 0) + GetBlockProof(*pindexNew); pindexNew->RaiseValidity(BLOCK_VALID_TREE); if (pindexBestHeader == NULL || pindexBestHeader->nChainWork < pindexNew->nChainWork) @@ -2628,7 +2683,7 @@ bool ReceivedBlockTransactions(const CBlock &block, CValidationState& state, CBl if (pindexNew->pprev == NULL || pindexNew->pprev->nChainTx) { // If pindexNew is the genesis block or all parents are BLOCK_VALID_TRANSACTIONS. - deque<CBlockIndex*> queue; + std::deque<CBlockIndex*> queue; queue.push_back(pindexNew); // Recursively process any descendant blocks that now may be eligible to be connected. @@ -2896,7 +2951,8 @@ std::vector<unsigned char> GenerateCoinbaseCommitment(CBlock& block, const CBloc bool ContextualCheckBlockHeader(const CBlockHeader& block, CValidationState& state, const Consensus::Params& consensusParams, const CBlockIndex* pindexPrev, int64_t nAdjustedTime) { - const int nHeight = pindexPrev == NULL ? 0 : pindexPrev->nHeight + 1; + assert(pindexPrev != NULL); + const int nHeight = pindexPrev->nHeight + 1; // Check proof of work if (block.nBits != GetNextWorkRequired(pindexPrev, &block, consensusParams)) return state.DoS(100, false, REJECT_INVALID, "bad-diffbits", false, "incorrect proof of work"); @@ -2906,7 +2962,7 @@ bool ContextualCheckBlockHeader(const CBlockHeader& block, CValidationState& sta return state.Invalid(false, REJECT_INVALID, "time-too-old", "block's timestamp is too early"); // Check timestamp - if (block.GetBlockTime() > nAdjustedTime + 2 * 60 * 60) + if (block.GetBlockTime() > nAdjustedTime + MAX_FUTURE_BLOCK_TIME) return state.Invalid(false, REJECT_INVALID, "time-too-new", "block timestamp too far in the future"); // Reject outdated version blocks when 95% (75% on testnet) of the network has upgraded: @@ -3051,14 +3107,18 @@ static bool AcceptBlockHeader(const CBlockHeader& block, CValidationState& state } // Exposed wrapper for AcceptBlockHeader -bool ProcessNewBlockHeaders(const std::vector<CBlockHeader>& headers, CValidationState& state, const CChainParams& chainparams, CBlockIndex** ppindex) +bool ProcessNewBlockHeaders(const std::vector<CBlockHeader>& headers, CValidationState& state, const CChainParams& chainparams, const CBlockIndex** ppindex) { { LOCK(cs_main); for (const CBlockHeader& header : headers) { - if (!AcceptBlockHeader(header, state, chainparams, ppindex)) { + CBlockIndex *pindex = NULL; // Use a temp pindex instead of ppindex to avoid a const_cast + if (!AcceptBlockHeader(header, state, chainparams, &pindex)) { return false; } + if (ppindex) { + *ppindex = pindex; + } } } NotifyHeaderTip(); @@ -3066,8 +3126,10 @@ bool ProcessNewBlockHeaders(const std::vector<CBlockHeader>& headers, CValidatio } /** Store block on disk. If dbp is non-NULL, the file is known to already reside on disk */ -static bool AcceptBlock(const CBlock& block, CValidationState& state, const CChainParams& chainparams, CBlockIndex** ppindex, bool fRequested, const CDiskBlockPos* dbp, bool* fNewBlock) +static bool AcceptBlock(const std::shared_ptr<const CBlock>& pblock, CValidationState& state, const CChainParams& chainparams, CBlockIndex** ppindex, bool fRequested, const CDiskBlockPos* dbp, bool* fNewBlock) { + const CBlock& block = *pblock; + if (fNewBlock) *fNewBlock = false; AssertLockHeld(cs_main); @@ -3104,7 +3166,7 @@ static bool AcceptBlock(const CBlock& block, CValidationState& state, const CCha } if (fNewBlock) *fNewBlock = true; - if (!CheckBlock(block, state, chainparams.GetConsensus(), GetAdjustedTime()) || + if (!CheckBlock(block, state, chainparams.GetConsensus()) || !ContextualCheckBlock(block, state, chainparams.GetConsensus(), pindex->pprev)) { if (state.IsInvalid() && !state.CorruptionPossible()) { pindex->nStatus |= BLOCK_FAILED_VALID; @@ -3113,6 +3175,11 @@ static bool AcceptBlock(const CBlock& block, CValidationState& state, const CCha return error("%s: %s", __func__, FormatStateMessage(state)); } + // Header is valid/has work, merkle tree and segwit merkle tree are good...RELAY NOW + // (but if it does not build on our best tip, let the SendMessages loop relay it) + if (!IsInitialBlockDownload() && chainActive.Tip() == pindex->pprev) + GetMainSignals().NewPoWValidBlock(pindex, pblock); + int nHeight = pindex->nHeight; // Write block to history file @@ -3141,13 +3208,19 @@ static bool AcceptBlock(const CBlock& block, CValidationState& state, const CCha bool ProcessNewBlock(const CChainParams& chainparams, const std::shared_ptr<const CBlock> pblock, bool fForceProcessing, bool *fNewBlock) { { - LOCK(cs_main); - - // Store to disk CBlockIndex *pindex = NULL; if (fNewBlock) *fNewBlock = false; CValidationState state; - bool ret = AcceptBlock(*pblock, state, chainparams, &pindex, fForceProcessing, NULL, fNewBlock); + // Ensure that CheckBlock() passes before calling AcceptBlock, as + // belt-and-suspenders. + bool ret = CheckBlock(*pblock, state, chainparams.GetConsensus()); + + LOCK(cs_main); + + if (ret) { + // Store to disk + ret = AcceptBlock(pblock, state, chainparams, &pindex, fForceProcessing, NULL, fNewBlock); + } CheckBlockIndex(chainparams.GetConsensus()); if (!ret) { GetMainSignals().BlockChecked(*pblock, state); @@ -3237,9 +3310,9 @@ void PruneOneBlockFile(const int fileNumber) } -void UnlinkPrunedFiles(std::set<int>& setFilesToPrune) +void UnlinkPrunedFiles(const std::set<int>& setFilesToPrune) { - for (set<int>::iterator it = setFilesToPrune.begin(); it != setFilesToPrune.end(); ++it) { + for (std::set<int>::iterator it = setFilesToPrune.begin(); it != setFilesToPrune.end(); ++it) { CDiskBlockPos pos(*it, 0); boost::filesystem::remove(GetBlockPosFilename(pos, "blk")); boost::filesystem::remove(GetBlockPosFilename(pos, "rev")); @@ -3247,6 +3320,35 @@ void UnlinkPrunedFiles(std::set<int>& setFilesToPrune) } } +/* Calculate the block/rev files to delete based on height specified by user with RPC command pruneblockchain */ +void FindFilesToPruneManual(std::set<int>& setFilesToPrune, int nManualPruneHeight) +{ + assert(fPruneMode && nManualPruneHeight > 0); + + LOCK2(cs_main, cs_LastBlockFile); + if (chainActive.Tip() == NULL) + return; + + // last block to prune is the lesser of (user-specified height, MIN_BLOCKS_TO_KEEP from the tip) + unsigned int nLastBlockWeCanPrune = std::min((unsigned)nManualPruneHeight, chainActive.Tip()->nHeight - MIN_BLOCKS_TO_KEEP); + int count=0; + for (int fileNumber = 0; fileNumber < nLastBlockFile; fileNumber++) { + if (vinfoBlockFile[fileNumber].nSize == 0 || vinfoBlockFile[fileNumber].nHeightLast > nLastBlockWeCanPrune) + continue; + PruneOneBlockFile(fileNumber); + setFilesToPrune.insert(fileNumber); + count++; + } + LogPrintf("Prune (Manual): prune_height=%d removed %d blk/rev pairs\n", nLastBlockWeCanPrune, count); +} + +/* This function is called from the RPC code for pruneblockchain */ +void PruneBlockFilesManual(int nManualPruneHeight) +{ + CValidationState state; + FlushStateToDisk(state, FLUSH_STATE_NONE, nManualPruneHeight); +} + /* Calculate the block/rev files that should be deleted to remain under target*/ void FindFilesToPrune(std::set<int>& setFilesToPrune, uint64_t nPruneAfterHeight) { @@ -3355,8 +3457,8 @@ CBlockIndex * InsertBlockIndex(uint256 hash) // Create new CBlockIndex* pindexNew = new CBlockIndex(); if (!pindexNew) - throw runtime_error(std::string(__func__) + ": new CBlockIndex failed"); - mi = mapBlockIndex.insert(make_pair(hash, pindexNew)).first; + throw std::runtime_error(std::string(__func__) + ": new CBlockIndex failed"); + mi = mapBlockIndex.insert(std::make_pair(hash, pindexNew)).first; pindexNew->phashBlock = &((*mi).first); return pindexNew; @@ -3370,18 +3472,19 @@ bool static LoadBlockIndexDB(const CChainParams& chainparams) boost::this_thread::interruption_point(); // Calculate nChainWork - vector<pair<int, CBlockIndex*> > vSortedByHeight; + std::vector<std::pair<int, CBlockIndex*> > vSortedByHeight; vSortedByHeight.reserve(mapBlockIndex.size()); BOOST_FOREACH(const PAIRTYPE(uint256, CBlockIndex*)& item, mapBlockIndex) { CBlockIndex* pindex = item.second; - vSortedByHeight.push_back(make_pair(pindex->nHeight, pindex)); + vSortedByHeight.push_back(std::make_pair(pindex->nHeight, pindex)); } sort(vSortedByHeight.begin(), vSortedByHeight.end()); BOOST_FOREACH(const PAIRTYPE(int, CBlockIndex*)& item, vSortedByHeight) { CBlockIndex* pindex = item.second; pindex->nChainWork = (pindex->pprev ? pindex->pprev->nChainWork : 0) + GetBlockProof(*pindex); + pindex->nTimeMax = (pindex->pprev ? std::max(pindex->pprev->nTimeMax, pindex->nTime) : pindex->nTime); // We can link the chain of blocks for which we've received transactions at some point. // Pruned nodes may have deleted the block. if (pindex->nTx > 0) { @@ -3425,7 +3528,7 @@ bool static LoadBlockIndexDB(const CChainParams& chainparams) // Check presence of blk files LogPrintf("Checking all blk files are present...\n"); - set<int> setBlkDataFiles; + std::set<int> setBlkDataFiles; BOOST_FOREACH(const PAIRTYPE(uint256, CBlockIndex*)& item, mapBlockIndex) { CBlockIndex* pindex = item.second; @@ -3466,7 +3569,7 @@ bool static LoadBlockIndexDB(const CChainParams& chainparams) LogPrintf("%s: hashBestChain=%s height=%d date=%s progress=%f\n", __func__, chainActive.Tip()->GetBlockHash().ToString(), chainActive.Height(), DateTimeStrFormat("%Y-%m-%d %H:%M:%S", chainActive.Tip()->GetBlockTime()), - Checkpoints::GuessVerificationProgress(chainparams.Checkpoints(), chainActive.Tip())); + GuessVerificationProgress(chainparams.TxData(), chainActive.Tip())); return true; } @@ -3524,7 +3627,7 @@ bool CVerifyDB::VerifyDB(const CChainParams& chainparams, CCoinsView *coinsview, return error("VerifyDB(): *** ReadBlockFromDisk failed at %d, hash=%s", pindex->nHeight, pindex->GetBlockHash().ToString()); // check level 1: verify block validity if (nCheckLevel >= 1 && !CheckBlock(block, state, chainparams.GetConsensus())) - return error("%s: *** found bad block at %d, hash=%s (%s)\n", __func__, + return error("%s: *** found bad block at %d, hash=%s (%s)\n", __func__, pindex->nHeight, pindex->GetBlockHash().ToString(), FormatStateMessage(state)); // check level 2: verify undo validity if (nCheckLevel >= 2 && pindex) { @@ -3695,7 +3798,7 @@ bool LoadBlockIndex(const CChainParams& chainparams) return true; } -bool InitBlockIndex(const CChainParams& chainparams) +bool InitBlockIndex(const CChainParams& chainparams) { LOCK(cs_main); @@ -3774,7 +3877,8 @@ bool LoadExternalBlockFile(const CChainParams& chainparams, FILE* fileIn, CDiskB dbp->nPos = nBlockPos; blkdat.SetLimit(nBlockPos + nSize); blkdat.SetPos(nBlockPos); - CBlock block; + std::shared_ptr<CBlock> pblock = std::make_shared<CBlock>(); + CBlock& block = *pblock; blkdat >> block; nRewind = blkdat.GetPos(); @@ -3792,7 +3896,7 @@ bool LoadExternalBlockFile(const CChainParams& chainparams, FILE* fileIn, CDiskB if (mapBlockIndex.count(hash) == 0 || (mapBlockIndex[hash]->nStatus & BLOCK_HAVE_DATA) == 0) { LOCK(cs_main); CValidationState state; - if (AcceptBlock(block, state, chainparams, NULL, true, dbp, NULL)) + if (AcceptBlock(pblock, state, chainparams, NULL, true, dbp, NULL)) nLoaded++; if (state.IsError()) break; @@ -3811,7 +3915,7 @@ bool LoadExternalBlockFile(const CChainParams& chainparams, FILE* fileIn, CDiskB NotifyHeaderTip(); // Recursively process earlier encountered successors of this block - deque<uint256> queue; + std::deque<uint256> queue; queue.push_back(hash); while (!queue.empty()) { uint256 head = queue.front(); @@ -3819,16 +3923,17 @@ bool LoadExternalBlockFile(const CChainParams& chainparams, FILE* fileIn, CDiskB std::pair<std::multimap<uint256, CDiskBlockPos>::iterator, std::multimap<uint256, CDiskBlockPos>::iterator> range = mapBlocksUnknownParent.equal_range(head); while (range.first != range.second) { std::multimap<uint256, CDiskBlockPos>::iterator it = range.first; - if (ReadBlockFromDisk(block, it->second, chainparams.GetConsensus())) + std::shared_ptr<CBlock> pblockrecursive = std::make_shared<CBlock>(); + if (ReadBlockFromDisk(*pblockrecursive, it->second, chainparams.GetConsensus())) { - LogPrint("reindex", "%s: Processing out of order child %s of %s\n", __func__, block.GetHash().ToString(), + LogPrint("reindex", "%s: Processing out of order child %s of %s\n", __func__, pblockrecursive->GetHash().ToString(), head.ToString()); LOCK(cs_main); CValidationState dummy; - if (AcceptBlock(block, dummy, chainparams, NULL, true, &it->second, NULL)) + if (AcceptBlock(pblockrecursive, dummy, chainparams, NULL, true, &it->second, NULL)) { nLoaded++; - queue.push_back(block.GetHash()); + queue.push_back(pblockrecursive->GetHash()); } } range.first++; @@ -4037,6 +4142,11 @@ std::string CBlockFileInfo::ToString() const return strprintf("CBlockFileInfo(blocks=%u, size=%u, heights=%u...%u, time=%s...%s)", nBlocks, nSize, nHeightFirst, nHeightLast, DateTimeStrFormat("%Y-%m-%d", nTimeFirst), DateTimeStrFormat("%Y-%m-%d", nTimeLast)); } +CBlockFileInfo* GetBlockFileInfo(size_t n) +{ + return &vinfoBlockFile.at(n); +} + ThresholdState VersionBitsTipState(const Consensus::Params& params, Consensus::DeploymentPos pos) { LOCK(cs_main); @@ -4054,7 +4164,7 @@ static const uint64_t MEMPOOL_DUMP_VERSION = 1; bool LoadMempool(void) { int64_t nExpiryTimeout = GetArg("-mempoolexpiry", DEFAULT_MEMPOOL_EXPIRY) * 60 * 60; - FILE* filestr = fopen((GetDataDir() / "mempool.dat").string().c_str(), "r"); + FILE* filestr = fopen((GetDataDir() / "mempool.dat").string().c_str(), "rb"); CAutoFile file(filestr, SER_DISK, CLIENT_VERSION); if (file.IsNull()) { LogPrintf("Failed to open mempool file from disk. Continuing anyway.\n"); @@ -4074,7 +4184,6 @@ bool LoadMempool(void) } uint64_t num; file >> num; - double prioritydummy = 0; while (num--) { CTransactionRef tx; int64_t nTime; @@ -4085,7 +4194,7 @@ bool LoadMempool(void) CAmount amountdelta = nFeeDelta; if (amountdelta) { - mempool.PrioritiseTransaction(tx->GetHash(), tx->GetHash().ToString(), prioritydummy, amountdelta); + mempool.PrioritiseTransaction(tx->GetHash(), amountdelta); } CValidationState state; if (nTime + nExpiryTimeout > nNow) { @@ -4106,7 +4215,7 @@ bool LoadMempool(void) file >> mapDeltas; for (const auto& i : mapDeltas) { - mempool.PrioritiseTransaction(i.first, i.first.ToString(), prioritydummy, i.second); + mempool.PrioritiseTransaction(i.first, i.second); } } catch (const std::exception& e) { LogPrintf("Failed to deserialize mempool data on disk: %s. Continuing anyway.\n", e.what()); @@ -4127,7 +4236,7 @@ void DumpMempool(void) { LOCK(mempool.cs); for (const auto &i : mempool.mapDeltas) { - mapDeltas[i.first] = i.second.first; + mapDeltas[i.first] = i.second; } vinfo = mempool.infoAll(); } @@ -4135,7 +4244,7 @@ void DumpMempool(void) int64_t mid = GetTimeMicros(); try { - FILE* filestr = fopen((GetDataDir() / "mempool.dat.new").string().c_str(), "w"); + FILE* filestr = fopen((GetDataDir() / "mempool.dat.new").string().c_str(), "wb"); if (!filestr) { return; } @@ -4164,6 +4273,24 @@ void DumpMempool(void) } } +//! Guess how far we are in the verification process at the given block index +double GuessVerificationProgress(const ChainTxData& data, CBlockIndex *pindex) { + if (pindex == NULL) + return 0.0; + + int64_t nNow = time(NULL); + + double fTxTotal; + + if (pindex->nChainTx <= data.nTxCount) { + fTxTotal = data.nTxCount + (nNow - data.nTime) * data.dTxRate; + } else { + fTxTotal = pindex->nChainTx + (nNow - pindex->GetBlockTime()) * data.dTxRate; + } + + return pindex->nChainTx / fTxTotal; +} + class CMainCleanup { public: diff --git a/src/validation.h b/src/validation.h index 631602a701..43f0dbae34 100644 --- a/src/validation.h +++ b/src/validation.h @@ -42,6 +42,7 @@ class CScriptCheck; class CTxMemPool; class CValidationInterface; class CValidationState; +struct ChainTxData; struct PrecomputedTransactionData; struct LockPoints; @@ -58,12 +59,6 @@ static const CAmount DEFAULT_TRANSACTION_MAXFEE = 0.1 * COIN; static const CAmount HIGH_TX_FEE_PER_KB = 0.01 * COIN; //! -maxtxfee will warn if called with a higher fee than this amount (in satoshis) static const CAmount HIGH_MAX_TX_FEE = 100 * HIGH_TX_FEE_PER_KB; -/** Default for -maxorphantx, maximum number of orphan transactions kept in memory */ -static const unsigned int DEFAULT_MAX_ORPHAN_TRANSACTIONS = 100; -/** Expiration time for orphan transactions in seconds */ -static const int64_t ORPHAN_TX_EXPIRE_TIME = 20 * 60; -/** Minimum time between orphan transactions expire time checks in seconds */ -static const int64_t ORPHAN_TX_EXPIRE_INTERVAL = 5 * 60; /** Default for -limitancestorcount, max number of in-mempool ancestors */ static const unsigned int DEFAULT_ANCESTOR_LIMIT = 25; /** Default for -limitancestorsize, maximum kilobytes of tx + all in-mempool ancestors */ @@ -127,8 +122,6 @@ static const int64_t BLOCK_DOWNLOAD_TIMEOUT_BASE = 1000000; /** Additional block download timeout per parallel downloading peer (i.e. 5 min) */ static const int64_t BLOCK_DOWNLOAD_TIMEOUT_PER_PEER = 500000; -static const unsigned int DEFAULT_LIMITFREERELAY = 0; -static const bool DEFAULT_RELAYPRIORITY = true; static const int64_t DEFAULT_MAX_TIP_AGE = 24 * 60 * 60; /** Maximum age of our tip in seconds for us to be considered current for fee estimation */ static const int64_t MAX_FEE_ESTIMATION_TIP_AGE = 3 * 60 * 60; @@ -185,6 +178,9 @@ extern CAmount maxTxFee; extern int64_t nMaxTipAge; extern bool fEnableReplacement; +/** Block hash whose ancestors we will assume to have valid scripts without checking them. */ +extern uint256 hashAssumeValid; + /** Best header we've seen so far (used for getheaders queries' starting points). */ extern CBlockIndex *pindexBestHeader; @@ -245,7 +241,7 @@ bool ProcessNewBlock(const CChainParams& chainparams, const std::shared_ptr<cons * @param[in] chainparams The params for the chain we want to connect to * @param[out] ppindex If set, the pointer will be set to point to the last new block index object for the given headers */ -bool ProcessNewBlockHeaders(const std::vector<CBlockHeader>& block, CValidationState& state, const CChainParams& chainparams, CBlockIndex** ppindex=NULL); +bool ProcessNewBlockHeaders(const std::vector<CBlockHeader>& block, CValidationState& state, const CChainParams& chainparams, const CBlockIndex** ppindex=NULL); /** Check whether enough disk space is available for an incoming block */ bool CheckDiskSpace(uint64_t nAdditionalBytes = 0); @@ -281,6 +277,9 @@ bool GetTransaction(const uint256 &hash, CTransactionRef &tx, const Consensus::P bool ActivateBestChain(CValidationState& state, const CChainParams& chainparams, std::shared_ptr<const CBlock> pblock = std::shared_ptr<const CBlock>()); CAmount GetBlockSubsidy(int nHeight, const Consensus::Params& consensusParams); +/** Guess verification progress (as a fraction between 0.0=genesis and 1.0=current tip). */ +double GuessVerificationProgress(const ChainTxData& data, CBlockIndex* pindex); + /** * Prune block and undo files (blk???.dat and undo???.dat) so that the disk space used is less than a user-defined target. * The user sets the target (in MB) on the command line or in config file. This will be run on startup and whenever new @@ -299,9 +298,14 @@ CAmount GetBlockSubsidy(int nHeight, const Consensus::Params& consensusParams); void FindFilesToPrune(std::set<int>& setFilesToPrune, uint64_t nPruneAfterHeight); /** + * Mark one block file as pruned. + */ +void PruneOneBlockFile(const int fileNumber); + +/** * Actually unlink the specified files */ -void UnlinkPrunedFiles(std::set<int>& setFilesToPrune); +void UnlinkPrunedFiles(const std::set<int>& setFilesToPrune); /** Create a new block index entry for a given block hash */ CBlockIndex * InsertBlockIndex(uint256 hash); @@ -309,14 +313,19 @@ CBlockIndex * InsertBlockIndex(uint256 hash); void FlushStateToDisk(); /** Prune block files and flush state to disk. */ void PruneAndFlush(); +/** Prune block files up to a given height */ +void PruneBlockFilesManual(int nPruneUpToHeight); -/** (try to) add transaction to memory pool **/ +/** (try to) add transaction to memory pool + * plTxnReplaced will be appended to with all transactions replaced from mempool **/ bool AcceptToMemoryPool(CTxMemPool& pool, CValidationState &state, const CTransactionRef &tx, bool fLimitFree, - bool* pfMissingInputs, bool fOverrideMempoolLimit=false, const CAmount nAbsurdFee=0); + bool* pfMissingInputs, std::list<CTransactionRef>* plTxnReplaced = NULL, + bool fOverrideMempoolLimit=false, const CAmount nAbsurdFee=0); /** (try to) add transaction to memory pool with a specified acceptance time **/ bool AcceptToMemoryPoolWithTime(CTxMemPool& pool, CValidationState &state, const CTransactionRef &tx, bool fLimitFree, - bool* pfMissingInputs, int64_t nAcceptTime, bool fOverrideMempoolLimit=false, const CAmount nAbsurdFee=0); + bool* pfMissingInputs, int64_t nAcceptTime, std::list<CTransactionRef>* plTxnReplaced = NULL, + bool fOverrideMempoolLimit=false, const CAmount nAbsurdFee=0); /** Convert CValidationState to a human-readable message for logging */ std::string FormatStateMessage(const CValidationState &state); @@ -556,6 +565,9 @@ static const unsigned int REJECT_ALREADY_KNOWN = 0x101; /** Transaction conflicts with a transaction already known */ static const unsigned int REJECT_CONFLICT = 0x102; +/** Get block file info entry for one block file */ +CBlockFileInfo* GetBlockFileInfo(size_t n); + /** Dump the mempool to disk. */ void DumpMempool(); diff --git a/src/validationinterface.cpp b/src/validationinterface.cpp index 215c342dea..d4121a28bc 100644 --- a/src/validationinterface.cpp +++ b/src/validationinterface.cpp @@ -22,6 +22,7 @@ void RegisterValidationInterface(CValidationInterface* pwalletIn) { g_signals.BlockChecked.connect(boost::bind(&CValidationInterface::BlockChecked, pwalletIn, _1, _2)); g_signals.ScriptForMining.connect(boost::bind(&CValidationInterface::GetScriptForMining, pwalletIn, _1)); g_signals.BlockFound.connect(boost::bind(&CValidationInterface::ResetRequestCount, pwalletIn, _1)); + g_signals.NewPoWValidBlock.connect(boost::bind(&CValidationInterface::NewPoWValidBlock, pwalletIn, _1, _2)); } void UnregisterValidationInterface(CValidationInterface* pwalletIn) { @@ -34,6 +35,7 @@ void UnregisterValidationInterface(CValidationInterface* pwalletIn) { g_signals.UpdatedTransaction.disconnect(boost::bind(&CValidationInterface::UpdatedTransaction, pwalletIn, _1)); g_signals.SyncTransaction.disconnect(boost::bind(&CValidationInterface::SyncTransaction, pwalletIn, _1, _2, _3)); g_signals.UpdatedBlockTip.disconnect(boost::bind(&CValidationInterface::UpdatedBlockTip, pwalletIn, _1, _2, _3)); + g_signals.NewPoWValidBlock.disconnect(boost::bind(&CValidationInterface::NewPoWValidBlock, pwalletIn, _1, _2)); } void UnregisterAllValidationInterfaces() { @@ -46,4 +48,5 @@ void UnregisterAllValidationInterfaces() { g_signals.UpdatedTransaction.disconnect_all_slots(); g_signals.SyncTransaction.disconnect_all_slots(); g_signals.UpdatedBlockTip.disconnect_all_slots(); + g_signals.NewPoWValidBlock.disconnect_all_slots(); } diff --git a/src/validationinterface.h b/src/validationinterface.h index 717026389c..a494eb6990 100644 --- a/src/validationinterface.h +++ b/src/validationinterface.h @@ -8,6 +8,7 @@ #include <boost/signals2/signal.hpp> #include <boost/shared_ptr.hpp> +#include <memory> class CBlock; class CBlockIndex; @@ -40,6 +41,7 @@ protected: virtual void BlockChecked(const CBlock&, const CValidationState&) {} virtual void GetScriptForMining(boost::shared_ptr<CReserveScript>&) {}; virtual void ResetRequestCount(const uint256 &hash) {}; + virtual void NewPoWValidBlock(const CBlockIndex *pindex, const std::shared_ptr<const CBlock>& block) {}; friend void ::RegisterValidationInterface(CValidationInterface*); friend void ::UnregisterValidationInterface(CValidationInterface*); friend void ::UnregisterAllValidationInterfaces(); @@ -48,9 +50,16 @@ protected: struct CMainSignals { /** Notifies listeners of updated block chain tip */ boost::signals2::signal<void (const CBlockIndex *, const CBlockIndex *, bool fInitialDownload)> UpdatedBlockTip; - /** A posInBlock value for SyncTransaction which indicates the transaction was conflicted, disconnected, or not in a block */ + /** A posInBlock value for SyncTransaction calls for transactions not + * included in connected blocks such as transactions removed from mempool, + * accepted to mempool or appearing in disconnected blocks.*/ static const int SYNC_TRANSACTION_NOT_IN_BLOCK = -1; - /** Notifies listeners of updated transaction data (transaction, and optionally the block it is found in. */ + /** Notifies listeners of updated transaction data (transaction, and + * optionally the block it is found in). Called with block data when + * transaction is included in a connected block, and without block data when + * transaction was accepted to mempool, removed from mempool (only when + * removal was due to conflict from connected block), or appeared in a + * disconnected block.*/ boost::signals2::signal<void (const CTransaction &, const CBlockIndex *pindex, int posInBlock)> SyncTransaction; /** Notifies listeners of an updated transaction without new data (for now: a coinbase potentially becoming visible). */ boost::signals2::signal<void (const uint256 &)> UpdatedTransaction; @@ -66,6 +75,10 @@ struct CMainSignals { boost::signals2::signal<void (boost::shared_ptr<CReserveScript>&)> ScriptForMining; /** Notifies listeners that a block has been successfully mined */ boost::signals2::signal<void (const uint256 &)> BlockFound; + /** + * Notifies listeners that a block which builds directly on our current tip + * has been received and connected to the headers tree, though not validated yet */ + boost::signals2::signal<void (const CBlockIndex *, const std::shared_ptr<const CBlock>&)> NewPoWValidBlock; }; CMainSignals& GetMainSignals(); diff --git a/src/wallet/db.cpp b/src/wallet/db.cpp index 800e1f4e29..80c42bd91b 100644 --- a/src/wallet/db.cpp +++ b/src/wallet/db.cpp @@ -18,15 +18,10 @@ #endif #include <boost/filesystem.hpp> +#include <boost/foreach.hpp> #include <boost/thread.hpp> #include <boost/version.hpp> -using namespace std; - - -unsigned int nWalletDBUpdated; - - // // CDB // @@ -119,7 +114,7 @@ bool CDBEnv::Open(const boost::filesystem::path& pathIn) void CDBEnv::MakeMock() { if (fDbEnvInit) - throw runtime_error("CDBEnv::MakeMock: Already initialized"); + throw std::runtime_error("CDBEnv::MakeMock: Already initialized"); boost::this_thread::interruption_point(); @@ -142,13 +137,13 @@ void CDBEnv::MakeMock() DB_PRIVATE, S_IRUSR | S_IWUSR); if (ret > 0) - throw runtime_error(strprintf("CDBEnv::MakeMock: Error %d opening database environment.", ret)); + throw std::runtime_error(strprintf("CDBEnv::MakeMock: Error %d opening database environment.", ret)); fDbEnvInit = true; fMockDb = true; } -CDBEnv::VerifyResult CDBEnv::Verify(const std::string& strFile, bool (*recoverFunc)(CDBEnv& dbenv, const std::string& strFile)) +CDBEnv::VerifyResult CDBEnv::Verify(const std::string& strFile, bool (*recoverFunc)(const std::string& strFile)) { LOCK(cs_db); assert(mapFileUseCount.count(strFile) == 0); @@ -161,10 +156,134 @@ CDBEnv::VerifyResult CDBEnv::Verify(const std::string& strFile, bool (*recoverFu return RECOVER_FAIL; // Try to recover: - bool fRecovered = (*recoverFunc)(*this, strFile); + bool fRecovered = (*recoverFunc)(strFile); return (fRecovered ? RECOVER_OK : RECOVER_FAIL); } +bool CDB::Recover(const std::string& filename, void *callbackDataIn, bool (*recoverKVcallback)(void* callbackData, CDataStream ssKey, CDataStream ssValue)) +{ + // Recovery procedure: + // move wallet file to wallet.timestamp.bak + // Call Salvage with fAggressive=true to + // get as much data as possible. + // Rewrite salvaged data to fresh wallet file + // Set -rescan so any missing transactions will be + // found. + int64_t now = GetTime(); + std::string newFilename = strprintf("wallet.%d.bak", now); + + int result = bitdb.dbenv->dbrename(NULL, filename.c_str(), NULL, + newFilename.c_str(), DB_AUTO_COMMIT); + if (result == 0) + LogPrintf("Renamed %s to %s\n", filename, newFilename); + else + { + LogPrintf("Failed to rename %s to %s\n", filename, newFilename); + return false; + } + + std::vector<CDBEnv::KeyValPair> salvagedData; + bool fSuccess = bitdb.Salvage(newFilename, true, salvagedData); + if (salvagedData.empty()) + { + LogPrintf("Salvage(aggressive) found no records in %s.\n", newFilename); + return false; + } + LogPrintf("Salvage(aggressive) found %u records\n", salvagedData.size()); + + std::unique_ptr<Db> pdbCopy(new Db(bitdb.dbenv, 0)); + int ret = pdbCopy->open(NULL, // Txn pointer + filename.c_str(), // Filename + "main", // Logical db name + DB_BTREE, // Database type + DB_CREATE, // Flags + 0); + if (ret > 0) + { + LogPrintf("Cannot create database file %s\n", filename); + return false; + } + + DbTxn* ptxn = bitdb.TxnBegin(); + BOOST_FOREACH(CDBEnv::KeyValPair& row, salvagedData) + { + if (recoverKVcallback) + { + CDataStream ssKey(row.first, SER_DISK, CLIENT_VERSION); + CDataStream ssValue(row.second, SER_DISK, CLIENT_VERSION); + std::string strType, strErr; + if (!(*recoverKVcallback)(callbackDataIn, ssKey, ssValue)) + continue; + } + Dbt datKey(&row.first[0], row.first.size()); + Dbt datValue(&row.second[0], row.second.size()); + int ret2 = pdbCopy->put(ptxn, &datKey, &datValue, DB_NOOVERWRITE); + if (ret2 > 0) + fSuccess = false; + } + ptxn->commit(0); + pdbCopy->close(0); + + return fSuccess; +} + +bool CDB::VerifyEnvironment(const std::string& walletFile, const boost::filesystem::path& dataDir, std::string& errorStr) +{ + LogPrintf("Using BerkeleyDB version %s\n", DbEnv::version(0, 0, 0)); + LogPrintf("Using wallet %s\n", walletFile); + + // Wallet file must be a plain filename without a directory + if (walletFile != boost::filesystem::basename(walletFile) + boost::filesystem::extension(walletFile)) + { + errorStr = strprintf(_("Wallet %s resides outside data directory %s"), walletFile, dataDir.string()); + return false; + } + + if (!bitdb.Open(dataDir)) + { + // try moving the database env out of the way + boost::filesystem::path pathDatabase = dataDir / "database"; + boost::filesystem::path pathDatabaseBak = dataDir / strprintf("database.%d.bak", GetTime()); + try { + boost::filesystem::rename(pathDatabase, pathDatabaseBak); + LogPrintf("Moved old %s to %s. Retrying.\n", pathDatabase.string(), pathDatabaseBak.string()); + } catch (const boost::filesystem::filesystem_error&) { + // failure is ok (well, not really, but it's not worse than what we started with) + } + + // try again + if (!bitdb.Open(dataDir)) { + // if it still fails, it probably means we can't even create the database env + errorStr = strprintf(_("Error initializing wallet database environment %s!"), GetDataDir()); + return false; + } + } + return true; +} + +bool CDB::VerifyDatabaseFile(const std::string& walletFile, const boost::filesystem::path& dataDir, std::string& warningStr, std::string& errorStr, bool (*recoverFunc)(const std::string& strFile)) +{ + if (boost::filesystem::exists(dataDir / walletFile)) + { + CDBEnv::VerifyResult r = bitdb.Verify(walletFile, recoverFunc); + if (r == CDBEnv::RECOVER_OK) + { + warningStr = strprintf(_("Warning: Wallet file corrupt, data salvaged!" + " Original %s saved as %s in %s; if" + " your balance or transactions are incorrect you should" + " restore from a backup."), + walletFile, "wallet.{timestamp}.bak", dataDir); + } + if (r == CDBEnv::RECOVER_FAIL) + { + errorStr = strprintf(_("%s corrupt, salvage failed"), walletFile); + return false; + } + } + // also return true if files does not exists + return true; +} + /* End of headers, beginning of key/value data */ static const char *HEADER_END = "HEADER=END"; /* End of key/value data */ @@ -179,7 +298,7 @@ bool CDBEnv::Salvage(const std::string& strFile, bool fAggressive, std::vector<C if (fAggressive) flags |= DB_AGGRESSIVE; - stringstream strDump; + std::stringstream strDump; Db db(dbenv, 0); int result = db.verify(strFile.c_str(), NULL, &strDump, flags); @@ -203,7 +322,7 @@ bool CDBEnv::Salvage(const std::string& strFile, bool fAggressive, std::vector<C // ... repeated // DATA=END - string strLine; + std::string strLine; while (!strDump.eof() && strLine != HEADER_END) getline(strDump, strLine); // Skip past header @@ -256,7 +375,7 @@ CDB::CDB(const std::string& strFilename, const char* pszMode, bool fFlushOnClose { LOCK(bitdb.cs_db); if (!bitdb.Open(GetDataDir())) - throw runtime_error("CDB: Failed to open database environment."); + throw std::runtime_error("CDB: Failed to open database environment."); strFile = strFilename; ++bitdb.mapFileUseCount[strFile]; @@ -269,7 +388,7 @@ CDB::CDB(const std::string& strFilename, const char* pszMode, bool fFlushOnClose DbMpoolFile* mpf = pdb->get_mpf(); ret = mpf->set_flags(DB_MPOOL_NOFILE, 1); if (ret != 0) - throw runtime_error(strprintf("CDB: Failed to configure for no temp file backing for database %s", strFile)); + throw std::runtime_error(strprintf("CDB: Failed to configure for no temp file backing for database %s", strFile)); } ret = pdb->open(NULL, // Txn pointer @@ -284,10 +403,10 @@ CDB::CDB(const std::string& strFilename, const char* pszMode, bool fFlushOnClose pdb = NULL; --bitdb.mapFileUseCount[strFile]; strFile = ""; - throw runtime_error(strprintf("CDB: Error %d, can't open database %s", ret, strFilename)); + throw std::runtime_error(strprintf("CDB: Error %d, can't open database %s", ret, strFilename)); } - if (fCreate && !Exists(string("version"))) { + if (fCreate && !Exists(std::string("version"))) { bool fTmp = fReadOnly; fReadOnly = false; WriteVersion(CLIENT_VERSION); @@ -330,7 +449,7 @@ void CDB::Close() } } -void CDBEnv::CloseDb(const string& strFile) +void CDBEnv::CloseDb(const std::string& strFile) { { LOCK(cs_db); @@ -344,7 +463,7 @@ void CDBEnv::CloseDb(const string& strFile) } } -bool CDBEnv::RemoveDb(const string& strFile) +bool CDBEnv::RemoveDb(const std::string& strFile) { this->CloseDb(strFile); @@ -353,7 +472,7 @@ bool CDBEnv::RemoveDb(const string& strFile) return (rc == 0); } -bool CDB::Rewrite(const string& strFile, const char* pszSkip) +bool CDB::Rewrite(const std::string& strFile, const char* pszSkip) { while (true) { { @@ -366,7 +485,7 @@ bool CDB::Rewrite(const string& strFile, const char* pszSkip) bool fSuccess = true; LogPrintf("CDB::Rewrite: Rewriting %s...\n", strFile); - string strFileRes = strFile + ".rewrite"; + std::string strFileRes = strFile + ".rewrite"; { // surround usage of db with extra {} CDB db(strFile.c_str(), "r"); Db* pdbCopy = new Db(bitdb.dbenv, 0); @@ -446,9 +565,9 @@ void CDBEnv::Flush(bool fShutdown) return; { LOCK(cs_db); - map<string, int>::iterator mi = mapFileUseCount.begin(); + std::map<std::string, int>::iterator mi = mapFileUseCount.begin(); while (mi != mapFileUseCount.end()) { - string strFile = (*mi).first; + std::string strFile = (*mi).first; int nRefCount = (*mi).second; LogPrint("db", "CDBEnv::Flush: Flushing %s (refcount = %d)...\n", strFile, nRefCount); if (nRefCount == 0) { @@ -476,3 +595,41 @@ void CDBEnv::Flush(bool fShutdown) } } } + +bool CDB::PeriodicFlush(std::string strFile) +{ + bool ret = false; + TRY_LOCK(bitdb.cs_db,lockDb); + if (lockDb) + { + // Don't do this if any databases are in use + int nRefCount = 0; + std::map<std::string, int>::iterator mi = bitdb.mapFileUseCount.begin(); + while (mi != bitdb.mapFileUseCount.end()) + { + nRefCount += (*mi).second; + mi++; + } + + if (nRefCount == 0) + { + boost::this_thread::interruption_point(); + std::map<std::string, int>::iterator mi = bitdb.mapFileUseCount.find(strFile); + if (mi != bitdb.mapFileUseCount.end()) + { + LogPrint("db", "Flushing %s\n", strFile); + int64_t nStart = GetTimeMillis(); + + // Flush wallet file so it's self contained + bitdb.CloseDb(strFile); + bitdb.CheckpointLSN(strFile); + + bitdb.mapFileUseCount.erase(mi++); + LogPrint("db", "Flushed %s %dms\n", strFile, GetTimeMillis() - nStart); + ret = true; + } + } + } + + return ret; +} diff --git a/src/wallet/db.h b/src/wallet/db.h index bc15f2147f..19c54e314c 100644 --- a/src/wallet/db.h +++ b/src/wallet/db.h @@ -23,8 +23,6 @@ static const unsigned int DEFAULT_WALLET_DBLOGSIZE = 100; static const bool DEFAULT_WALLET_PRIVDB = true; -extern unsigned int nWalletDBUpdated; - class CDBEnv { private: @@ -58,7 +56,7 @@ public: enum VerifyResult { VERIFY_OK, RECOVER_OK, RECOVER_FAIL }; - VerifyResult Verify(const std::string& strFile, bool (*recoverFunc)(CDBEnv& dbenv, const std::string& strFile)); + VerifyResult Verify(const std::string& strFile, bool (*recoverFunc)(const std::string& strFile)); /** * Salvage data from a file that Verify says is bad. * fAggressive sets the DB_AGGRESSIVE flag (see berkeley DB->verify() method documentation). @@ -106,6 +104,15 @@ protected: public: void Flush(); void Close(); + static bool Recover(const std::string& filename, void *callbackDataIn, bool (*recoverKVcallback)(void* callbackData, CDataStream ssKey, CDataStream ssValue)); + + /* flush the wallet passively (TRY_LOCK) + ideal to be called periodically */ + static bool PeriodicFlush(std::string strFile); + /* verifies the database environment */ + static bool VerifyEnvironment(const std::string& walletFile, const boost::filesystem::path& dataDir, std::string& errorStr); + /* verifies the database file */ + static bool VerifyDatabaseFile(const std::string& walletFile, const boost::filesystem::path& dataDir, std::string& warningStr, std::string& errorStr, bool (*recoverFunc)(const std::string& strFile)); private: CDB(const CDB&); diff --git a/src/wallet/rpcdump.cpp b/src/wallet/rpcdump.cpp index 34443a8250..9554f0541e 100644 --- a/src/wallet/rpcdump.cpp +++ b/src/wallet/rpcdump.cpp @@ -16,6 +16,8 @@ #include "merkleblock.h" #include "core_io.h" +#include "rpcwallet.h" + #include <fstream> #include <stdint.h> @@ -27,11 +29,6 @@ #include <boost/assign/list_of.hpp> #include <boost/foreach.hpp> -using namespace std; - -void EnsureWalletIsUnlocked(); -bool EnsureWalletIsAvailable(bool avoidException); - std::string static EncodeDumpTime(int64_t nTime) { return DateTimeStrFormat("%Y-%m-%dT%H:%M:%SZ", nTime); } @@ -77,12 +74,14 @@ std::string DecodeDumpString(const std::string &str) { UniValue importprivkey(const JSONRPCRequest& request) { - if (!EnsureWalletIsAvailable(request.fHelp)) + CWallet * const pwallet = GetWalletForJSONRPCRequest(request); + if (!EnsureWalletIsAvailable(pwallet, request.fHelp)) { return NullUniValue; - + } + if (request.fHelp || request.params.size() < 1 || request.params.size() > 3) - throw runtime_error( - "importprivkey \"bitcoinprivkey\" ( \"label\" rescan )\n" + throw std::runtime_error( + "importprivkey \"bitcoinprivkey\" ( \"label\" ) ( rescan )\n" "\nAdds a private key (as returned by dumpprivkey) to your wallet.\n" "\nArguments:\n" "1. \"bitcoinprivkey\" (string, required) The private key (see dumpprivkey)\n" @@ -101,12 +100,12 @@ UniValue importprivkey(const JSONRPCRequest& request) ); - LOCK2(cs_main, pwalletMain->cs_wallet); + LOCK2(cs_main, pwallet->cs_wallet); - EnsureWalletIsUnlocked(); + EnsureWalletIsUnlocked(pwallet); - string strSecret = request.params[0].get_str(); - string strLabel = ""; + std::string strSecret = request.params[0].get_str(); + std::string strLabel = ""; if (request.params.size() > 1) strLabel = request.params[1].get_str(); @@ -130,68 +129,75 @@ UniValue importprivkey(const JSONRPCRequest& request) assert(key.VerifyPubKey(pubkey)); CKeyID vchAddress = pubkey.GetID(); { - pwalletMain->MarkDirty(); - pwalletMain->SetAddressBook(vchAddress, strLabel, "receive"); + pwallet->MarkDirty(); + pwallet->SetAddressBook(vchAddress, strLabel, "receive"); // Don't throw error in case a key is already there - if (pwalletMain->HaveKey(vchAddress)) + if (pwallet->HaveKey(vchAddress)) { return NullUniValue; + } - pwalletMain->mapKeyMetadata[vchAddress].nCreateTime = 1; + pwallet->mapKeyMetadata[vchAddress].nCreateTime = 1; - if (!pwalletMain->AddKeyPubKey(key, pubkey)) + if (!pwallet->AddKeyPubKey(key, pubkey)) { throw JSONRPCError(RPC_WALLET_ERROR, "Error adding key to wallet"); + } // whenever a key is imported, we need to scan the whole chain - pwalletMain->nTimeFirstKey = 1; // 0 would be considered 'no value' + pwallet->UpdateTimeFirstKey(1); if (fRescan) { - pwalletMain->ScanForWalletTransactions(chainActive.Genesis(), true); + pwallet->ScanForWalletTransactions(chainActive.Genesis(), true); } } return NullUniValue; } -void ImportAddress(const CBitcoinAddress& address, const string& strLabel); -void ImportScript(const CScript& script, const string& strLabel, bool isRedeemScript) +void ImportAddress(CWallet*, const CBitcoinAddress& address, const std::string& strLabel); +void ImportScript(CWallet* const pwallet, const CScript& script, const std::string& strLabel, bool isRedeemScript) { - if (!isRedeemScript && ::IsMine(*pwalletMain, script) == ISMINE_SPENDABLE) + if (!isRedeemScript && ::IsMine(*pwallet, script) == ISMINE_SPENDABLE) { throw JSONRPCError(RPC_WALLET_ERROR, "The wallet already contains the private key for this address or script"); + } - pwalletMain->MarkDirty(); + pwallet->MarkDirty(); - if (!pwalletMain->HaveWatchOnly(script) && !pwalletMain->AddWatchOnly(script)) + if (!pwallet->HaveWatchOnly(script) && !pwallet->AddWatchOnly(script, 0 /* nCreateTime */)) { throw JSONRPCError(RPC_WALLET_ERROR, "Error adding address to wallet"); + } if (isRedeemScript) { - if (!pwalletMain->HaveCScript(script) && !pwalletMain->AddCScript(script)) + if (!pwallet->HaveCScript(script) && !pwallet->AddCScript(script)) { throw JSONRPCError(RPC_WALLET_ERROR, "Error adding p2sh redeemScript to wallet"); - ImportAddress(CBitcoinAddress(CScriptID(script)), strLabel); + } + ImportAddress(pwallet, CBitcoinAddress(CScriptID(script)), strLabel); } else { CTxDestination destination; if (ExtractDestination(script, destination)) { - pwalletMain->SetAddressBook(destination, strLabel, "receive"); + pwallet->SetAddressBook(destination, strLabel, "receive"); } } } -void ImportAddress(const CBitcoinAddress& address, const string& strLabel) +void ImportAddress(CWallet* const pwallet, const CBitcoinAddress& address, const std::string& strLabel) { CScript script = GetScriptForDestination(address.Get()); - ImportScript(script, strLabel, false); + ImportScript(pwallet, script, strLabel, false); // add to address book or update label if (address.IsValid()) - pwalletMain->SetAddressBook(address.Get(), strLabel, "receive"); + pwallet->SetAddressBook(address.Get(), strLabel, "receive"); } UniValue importaddress(const JSONRPCRequest& request) { - if (!EnsureWalletIsAvailable(request.fHelp)) + CWallet * const pwallet = GetWalletForJSONRPCRequest(request); + if (!EnsureWalletIsAvailable(pwallet, request.fHelp)) { return NullUniValue; - + } + if (request.fHelp || request.params.size() < 1 || request.params.size() > 4) - throw runtime_error( + throw std::runtime_error( "importaddress \"address\" ( \"label\" rescan p2sh )\n" "\nAdds a script (in hex) or address that can be watched as if it were in your wallet but cannot be used to spend.\n" "\nArguments:\n" @@ -213,7 +219,7 @@ UniValue importaddress(const JSONRPCRequest& request) ); - string strLabel = ""; + std::string strLabel = ""; if (request.params.size() > 1) strLabel = request.params[1].get_str(); @@ -230,24 +236,24 @@ UniValue importaddress(const JSONRPCRequest& request) if (request.params.size() > 3) fP2SH = request.params[3].get_bool(); - LOCK2(cs_main, pwalletMain->cs_wallet); + LOCK2(cs_main, pwallet->cs_wallet); CBitcoinAddress address(request.params[0].get_str()); if (address.IsValid()) { if (fP2SH) throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Cannot use the p2sh flag with an address - use a script instead"); - ImportAddress(address, strLabel); + ImportAddress(pwallet, address, strLabel); } else if (IsHex(request.params[0].get_str())) { std::vector<unsigned char> data(ParseHex(request.params[0].get_str())); - ImportScript(CScript(data.begin(), data.end()), strLabel, fP2SH); + ImportScript(pwallet, CScript(data.begin(), data.end()), strLabel, fP2SH); } else { throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid Bitcoin address or script"); } if (fRescan) { - pwalletMain->ScanForWalletTransactions(chainActive.Genesis(), true); - pwalletMain->ReacceptWalletTransactions(); + pwallet->ScanForWalletTransactions(chainActive.Genesis(), true); + pwallet->ReacceptWalletTransactions(); } return NullUniValue; @@ -255,11 +261,13 @@ UniValue importaddress(const JSONRPCRequest& request) UniValue importprunedfunds(const JSONRPCRequest& request) { - if (!EnsureWalletIsAvailable(request.fHelp)) + CWallet * const pwallet = GetWalletForJSONRPCRequest(request); + if (!EnsureWalletIsAvailable(pwallet, request.fHelp)) { return NullUniValue; + } if (request.fHelp || request.params.size() != 2) - throw runtime_error( + throw std::runtime_error( "importprunedfunds\n" "\nImports funds without rescan. Corresponding address or script must previously be included in wallet. Aimed towards pruned wallets. The end-user is responsible to import additional transactions that subsequently spend the imported outputs or rescan after the point in the blockchain the transaction is included.\n" "\nArguments:\n" @@ -271,15 +279,15 @@ UniValue importprunedfunds(const JSONRPCRequest& request) if (!DecodeHexTx(tx, request.params[0].get_str())) throw JSONRPCError(RPC_DESERIALIZATION_ERROR, "TX decode failed"); uint256 hashTx = tx.GetHash(); - CWalletTx wtx(pwalletMain, MakeTransactionRef(std::move(tx))); + CWalletTx wtx(pwallet, MakeTransactionRef(std::move(tx))); CDataStream ssMB(ParseHexV(request.params[1], "proof"), SER_NETWORK, PROTOCOL_VERSION); CMerkleBlock merkleBlock; ssMB >> merkleBlock; //Search partial merkle tree in proof for our transaction and index in valid block - vector<uint256> vMatch; - vector<unsigned int> vIndex; + std::vector<uint256> vMatch; + std::vector<unsigned int> vIndex; unsigned int txnIndex = 0; if (merkleBlock.txn.ExtractMatches(vMatch, vIndex) == merkleBlock.header.hashMerkleRoot) { @@ -288,7 +296,7 @@ UniValue importprunedfunds(const JSONRPCRequest& request) if (!mapBlockIndex.count(merkleBlock.header.GetHash()) || !chainActive.Contains(mapBlockIndex[merkleBlock.header.GetHash()])) throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Block not found in chain"); - vector<uint256>::const_iterator it; + std::vector<uint256>::const_iterator it; if ((it = std::find(vMatch.begin(), vMatch.end(), hashTx))==vMatch.end()) { throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Transaction given doesn't exist in proof"); } @@ -302,10 +310,10 @@ UniValue importprunedfunds(const JSONRPCRequest& request) wtx.nIndex = txnIndex; wtx.hashBlock = merkleBlock.header.GetHash(); - LOCK2(cs_main, pwalletMain->cs_wallet); + LOCK2(cs_main, pwallet->cs_wallet); - if (pwalletMain->IsMine(wtx)) { - pwalletMain->AddToWallet(wtx, false); + if (pwallet->IsMine(wtx)) { + pwallet->AddToWallet(wtx, false); return NullUniValue; } @@ -314,11 +322,13 @@ UniValue importprunedfunds(const JSONRPCRequest& request) UniValue removeprunedfunds(const JSONRPCRequest& request) { - if (!EnsureWalletIsAvailable(request.fHelp)) + CWallet * const pwallet = GetWalletForJSONRPCRequest(request); + if (!EnsureWalletIsAvailable(pwallet, request.fHelp)) { return NullUniValue; + } if (request.fHelp || request.params.size() != 1) - throw runtime_error( + throw std::runtime_error( "removeprunedfunds \"txid\"\n" "\nDeletes the specified transaction from the wallet. Meant for use with pruned wallets and as a companion to importprunedfunds. This will effect wallet balances.\n" "\nArguments:\n" @@ -329,20 +339,20 @@ UniValue removeprunedfunds(const JSONRPCRequest& request) + HelpExampleRpc("removprunedfunds", "\"a8d0c0184dde994a09ec054286f1ce581bebf46446a512166eae7628734ea0a5\"") ); - LOCK2(cs_main, pwalletMain->cs_wallet); + LOCK2(cs_main, pwallet->cs_wallet); uint256 hash; hash.SetHex(request.params[0].get_str()); - vector<uint256> vHash; + std::vector<uint256> vHash; vHash.push_back(hash); - vector<uint256> vHashOut; + std::vector<uint256> vHashOut; - if(pwalletMain->ZapSelectTx(vHash, vHashOut) != DB_LOAD_OK) { - throw JSONRPCError(RPC_INTERNAL_ERROR, "Could not properly delete the transaction."); + if (pwallet->ZapSelectTx(vHash, vHashOut) != DB_LOAD_OK) { + throw JSONRPCError(RPC_WALLET_ERROR, "Could not properly delete the transaction."); } if(vHashOut.empty()) { - throw JSONRPCError(RPC_INTERNAL_ERROR, "Transaction does not exist in wallet."); + throw JSONRPCError(RPC_INVALID_PARAMETER, "Transaction does not exist in wallet."); } return NullUniValue; @@ -350,11 +360,13 @@ UniValue removeprunedfunds(const JSONRPCRequest& request) UniValue importpubkey(const JSONRPCRequest& request) { - if (!EnsureWalletIsAvailable(request.fHelp)) + CWallet * const pwallet = GetWalletForJSONRPCRequest(request); + if (!EnsureWalletIsAvailable(pwallet, request.fHelp)) { return NullUniValue; + } if (request.fHelp || request.params.size() < 1 || request.params.size() > 4) - throw runtime_error( + throw std::runtime_error( "importpubkey \"pubkey\" ( \"label\" rescan )\n" "\nAdds a public key (in hex) that can be watched as if it were in your wallet but cannot be used to spend.\n" "\nArguments:\n" @@ -372,7 +384,7 @@ UniValue importpubkey(const JSONRPCRequest& request) ); - string strLabel = ""; + std::string strLabel = ""; if (request.params.size() > 1) strLabel = request.params[1].get_str(); @@ -391,15 +403,15 @@ UniValue importpubkey(const JSONRPCRequest& request) if (!pubKey.IsFullyValid()) throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Pubkey is not a valid public key"); - LOCK2(cs_main, pwalletMain->cs_wallet); + LOCK2(cs_main, pwallet->cs_wallet); - ImportAddress(CBitcoinAddress(pubKey.GetID()), strLabel); - ImportScript(GetScriptForRawPubKey(pubKey), strLabel, false); + ImportAddress(pwallet, CBitcoinAddress(pubKey.GetID()), strLabel); + ImportScript(pwallet, GetScriptForRawPubKey(pubKey), strLabel, false); if (fRescan) { - pwalletMain->ScanForWalletTransactions(chainActive.Genesis(), true); - pwalletMain->ReacceptWalletTransactions(); + pwallet->ScanForWalletTransactions(chainActive.Genesis(), true); + pwallet->ReacceptWalletTransactions(); } return NullUniValue; @@ -408,11 +420,13 @@ UniValue importpubkey(const JSONRPCRequest& request) UniValue importwallet(const JSONRPCRequest& request) { - if (!EnsureWalletIsAvailable(request.fHelp)) + CWallet * const pwallet = GetWalletForJSONRPCRequest(request); + if (!EnsureWalletIsAvailable(pwallet, request.fHelp)) { return NullUniValue; - + } + if (request.fHelp || request.params.size() != 1) - throw runtime_error( + throw std::runtime_error( "importwallet \"filename\"\n" "\nImports keys from a wallet dump file (see dumpwallet).\n" "\nArguments:\n" @@ -429,11 +443,11 @@ UniValue importwallet(const JSONRPCRequest& request) if (fPruneMode) throw JSONRPCError(RPC_WALLET_ERROR, "Importing wallets is disabled in pruned mode"); - LOCK2(cs_main, pwalletMain->cs_wallet); + LOCK2(cs_main, pwallet->cs_wallet); - EnsureWalletIsUnlocked(); + EnsureWalletIsUnlocked(pwallet); - ifstream file; + std::ifstream file; file.open(request.params[0].get_str().c_str(), std::ios::in | std::ios::ate); if (!file.is_open()) throw JSONRPCError(RPC_INVALID_PARAMETER, "Cannot open wallet dump file"); @@ -445,9 +459,9 @@ UniValue importwallet(const JSONRPCRequest& request) int64_t nFilesize = std::max((int64_t)1, (int64_t)file.tellg()); file.seekg(0, file.beg); - pwalletMain->ShowProgress(_("Importing..."), 0); // show progress dialog in GUI + pwallet->ShowProgress(_("Importing..."), 0); // show progress dialog in GUI while (file.good()) { - pwalletMain->ShowProgress("", std::max(1, std::min(99, (int)(((double)file.tellg() / (double)nFilesize) * 100)))); + pwallet->ShowProgress("", std::max(1, std::min(99, (int)(((double)file.tellg() / (double)nFilesize) * 100)))); std::string line; std::getline(file, line); if (line.empty() || line[0] == '#') @@ -464,7 +478,7 @@ UniValue importwallet(const JSONRPCRequest& request) CPubKey pubkey = key.GetPubKey(); assert(key.VerifyPubKey(pubkey)); CKeyID keyid = pubkey.GetID(); - if (pwalletMain->HaveKey(keyid)) { + if (pwallet->HaveKey(keyid)) { LogPrintf("Skipping import of %s (key already present)\n", CBitcoinAddress(keyid).ToString()); continue; } @@ -484,28 +498,27 @@ UniValue importwallet(const JSONRPCRequest& request) } } LogPrintf("Importing %s...\n", CBitcoinAddress(keyid).ToString()); - if (!pwalletMain->AddKeyPubKey(key, pubkey)) { + if (!pwallet->AddKeyPubKey(key, pubkey)) { fGood = false; continue; } - pwalletMain->mapKeyMetadata[keyid].nCreateTime = nTime; + pwallet->mapKeyMetadata[keyid].nCreateTime = nTime; if (fLabel) - pwalletMain->SetAddressBook(keyid, strLabel, "receive"); + pwallet->SetAddressBook(keyid, strLabel, "receive"); nTimeBegin = std::min(nTimeBegin, nTime); } file.close(); - pwalletMain->ShowProgress("", 100); // hide progress dialog in GUI + pwallet->ShowProgress("", 100); // hide progress dialog in GUI CBlockIndex *pindex = chainActive.Tip(); - while (pindex && pindex->pprev && pindex->GetBlockTime() > nTimeBegin - 7200) + while (pindex && pindex->pprev && pindex->GetBlockTime() > nTimeBegin - TIMESTAMP_WINDOW) pindex = pindex->pprev; - if (!pwalletMain->nTimeFirstKey || nTimeBegin < pwalletMain->nTimeFirstKey) - pwalletMain->nTimeFirstKey = nTimeBegin; + pwallet->UpdateTimeFirstKey(nTimeBegin); LogPrintf("Rescanning last %i blocks\n", chainActive.Height() - pindex->nHeight + 1); - pwalletMain->ScanForWalletTransactions(pindex); - pwalletMain->MarkDirty(); + pwallet->ScanForWalletTransactions(pindex); + pwallet->MarkDirty(); if (!fGood) throw JSONRPCError(RPC_WALLET_ERROR, "Error adding some keys to wallet"); @@ -515,16 +528,18 @@ UniValue importwallet(const JSONRPCRequest& request) UniValue dumpprivkey(const JSONRPCRequest& request) { - if (!EnsureWalletIsAvailable(request.fHelp)) + CWallet * const pwallet = GetWalletForJSONRPCRequest(request); + if (!EnsureWalletIsAvailable(pwallet, request.fHelp)) { return NullUniValue; - + } + if (request.fHelp || request.params.size() != 1) - throw runtime_error( - "dumpprivkey \"bitcoinaddress\"\n" - "\nReveals the private key corresponding to 'bitcoinaddress'.\n" + throw std::runtime_error( + "dumpprivkey \"address\"\n" + "\nReveals the private key corresponding to 'address'.\n" "Then the importprivkey can be used with this output\n" "\nArguments:\n" - "1. \"bitcoinaddress\" (string, required) The bitcoin address for the private key\n" + "1. \"address\" (string, required) The bitcoin address for the private key\n" "\nResult:\n" "\"key\" (string) The private key\n" "\nExamples:\n" @@ -533,11 +548,11 @@ UniValue dumpprivkey(const JSONRPCRequest& request) + HelpExampleRpc("dumpprivkey", "\"myaddress\"") ); - LOCK2(cs_main, pwalletMain->cs_wallet); + LOCK2(cs_main, pwallet->cs_wallet); - EnsureWalletIsUnlocked(); + EnsureWalletIsUnlocked(pwallet); - string strAddress = request.params[0].get_str(); + std::string strAddress = request.params[0].get_str(); CBitcoinAddress address; if (!address.SetString(strAddress)) throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid Bitcoin address"); @@ -545,19 +560,22 @@ UniValue dumpprivkey(const JSONRPCRequest& request) if (!address.GetKeyID(keyID)) throw JSONRPCError(RPC_TYPE_ERROR, "Address does not refer to a key"); CKey vchSecret; - if (!pwalletMain->GetKey(keyID, vchSecret)) + if (!pwallet->GetKey(keyID, vchSecret)) { throw JSONRPCError(RPC_WALLET_ERROR, "Private key for address " + strAddress + " is not known"); + } return CBitcoinSecret(vchSecret).ToString(); } UniValue dumpwallet(const JSONRPCRequest& request) { - if (!EnsureWalletIsAvailable(request.fHelp)) + CWallet * const pwallet = GetWalletForJSONRPCRequest(request); + if (!EnsureWalletIsAvailable(pwallet, request.fHelp)) { return NullUniValue; - + } + if (request.fHelp || request.params.size() != 1) - throw runtime_error( + throw std::runtime_error( "dumpwallet \"filename\"\n" "\nDumps all wallet keys in a human-readable format.\n" "\nArguments:\n" @@ -567,24 +585,26 @@ UniValue dumpwallet(const JSONRPCRequest& request) + HelpExampleRpc("dumpwallet", "\"test\"") ); - LOCK2(cs_main, pwalletMain->cs_wallet); + LOCK2(cs_main, pwallet->cs_wallet); - EnsureWalletIsUnlocked(); + EnsureWalletIsUnlocked(pwallet); - ofstream file; + std::ofstream file; file.open(request.params[0].get_str().c_str()); if (!file.is_open()) throw JSONRPCError(RPC_INVALID_PARAMETER, "Cannot open wallet dump file"); - std::map<CKeyID, int64_t> mapKeyBirth; + std::map<CTxDestination, int64_t> mapKeyBirth; std::set<CKeyID> setKeyPool; - pwalletMain->GetKeyBirthTimes(mapKeyBirth); - pwalletMain->GetAllReserveKeys(setKeyPool); + pwallet->GetKeyBirthTimes(mapKeyBirth); + pwallet->GetAllReserveKeys(setKeyPool); // sort time/key pairs std::vector<std::pair<int64_t, CKeyID> > vKeyBirth; - for (std::map<CKeyID, int64_t>::const_iterator it = mapKeyBirth.begin(); it != mapKeyBirth.end(); it++) { - vKeyBirth.push_back(std::make_pair(it->second, it->first)); + for (const auto& entry : mapKeyBirth) { + if (const CKeyID* keyID = boost::get<CKeyID>(&entry.first)) { // set and test + vKeyBirth.push_back(std::make_pair(entry.second, *keyID)); + } } mapKeyBirth.clear(); std::sort(vKeyBirth.begin(), vKeyBirth.end()); @@ -597,12 +617,11 @@ UniValue dumpwallet(const JSONRPCRequest& request) file << "\n"; // add the base58check encoded extended master if the wallet uses HD - CKeyID masterKeyID = pwalletMain->GetHDChain().masterKeyID; + CKeyID masterKeyID = pwallet->GetHDChain().masterKeyID; if (!masterKeyID.IsNull()) { CKey key; - if (pwalletMain->GetKey(masterKeyID, key)) - { + if (pwallet->GetKey(masterKeyID, key)) { CExtKey masterKey; masterKey.SetMaster(key.begin(), key.size()); @@ -617,20 +636,20 @@ UniValue dumpwallet(const JSONRPCRequest& request) std::string strTime = EncodeDumpTime(it->first); std::string strAddr = CBitcoinAddress(keyid).ToString(); CKey key; - if (pwalletMain->GetKey(keyid, key)) { + if (pwallet->GetKey(keyid, key)) { file << strprintf("%s %s ", CBitcoinSecret(key).ToString(), strTime); - if (pwalletMain->mapAddressBook.count(keyid)) { - file << strprintf("label=%s", EncodeDumpString(pwalletMain->mapAddressBook[keyid].name)); + if (pwallet->mapAddressBook.count(keyid)) { + file << strprintf("label=%s", EncodeDumpString(pwallet->mapAddressBook[keyid].name)); } else if (keyid == masterKeyID) { file << "hdmaster=1"; } else if (setKeyPool.count(keyid)) { file << "reserve=1"; - } else if (pwalletMain->mapKeyMetadata[keyid].hdKeypath == "m") { + } else if (pwallet->mapKeyMetadata[keyid].hdKeypath == "m") { file << "inactivehdmaster=1"; } else { file << "change=1"; } - file << strprintf(" # addr=%s%s\n", strAddr, (pwalletMain->mapKeyMetadata[keyid].hdKeypath.size() > 0 ? " hdkeypath="+pwalletMain->mapKeyMetadata[keyid].hdKeypath : "")); + file << strprintf(" # addr=%s%s\n", strAddr, (pwallet->mapKeyMetadata[keyid].hdKeypath.size() > 0 ? " hdkeypath="+pwallet->mapKeyMetadata[keyid].hdKeypath : "")); } } file << "\n"; @@ -640,7 +659,8 @@ UniValue dumpwallet(const JSONRPCRequest& request) } -UniValue processImport(const UniValue& data) { +UniValue ProcessImport(CWallet * const pwallet, const UniValue& data, const int64_t timestamp) +{ try { bool success = false; @@ -653,17 +673,16 @@ UniValue processImport(const UniValue& data) { } // Optional fields. - const string& strRedeemScript = data.exists("redeemscript") ? data["redeemscript"].get_str() : ""; + const std::string& strRedeemScript = data.exists("redeemscript") ? data["redeemscript"].get_str() : ""; const UniValue& pubKeys = data.exists("pubkeys") ? data["pubkeys"].get_array() : UniValue(); const UniValue& keys = data.exists("keys") ? data["keys"].get_array() : UniValue(); const bool& internal = data.exists("internal") ? data["internal"].get_bool() : false; const bool& watchOnly = data.exists("watchonly") ? data["watchonly"].get_bool() : false; - const string& label = data.exists("label") && !internal ? data["label"].get_str() : ""; - const int64_t& timestamp = data.exists("timestamp") && data["timestamp"].get_int64() > 1 ? data["timestamp"].get_int64() : 1; + const std::string& label = data.exists("label") && !internal ? data["label"].get_str() : ""; bool isScript = scriptPubKey.getType() == UniValue::VSTR; bool isP2SH = strRedeemScript.length() > 0; - const string& output = isScript ? scriptPubKey.get_str() : scriptPubKey["address"].get_str(); + const std::string& output = isScript ? scriptPubKey.get_str() : scriptPubKey["address"].get_str(); // Parse the output. CScript script; @@ -671,6 +690,9 @@ UniValue processImport(const UniValue& data) { if (!isScript) { address = CBitcoinAddress(output); + if (!address.IsValid()) { + throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid address"); + } script = GetScriptForDestination(address.Get()); } else { if (!IsHex(output)) { @@ -719,38 +741,38 @@ UniValue processImport(const UniValue& data) { throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid P2SH address / script"); } - pwalletMain->MarkDirty(); + pwallet->MarkDirty(); - if (!pwalletMain->HaveWatchOnly(redeemScript) && !pwalletMain->AddWatchOnly(redeemScript)) { + if (!pwallet->HaveWatchOnly(redeemScript) && !pwallet->AddWatchOnly(redeemScript, timestamp)) { throw JSONRPCError(RPC_WALLET_ERROR, "Error adding address to wallet"); } - if (!pwalletMain->HaveCScript(redeemScript) && !pwalletMain->AddCScript(redeemScript)) { + if (!pwallet->HaveCScript(redeemScript) && !pwallet->AddCScript(redeemScript)) { throw JSONRPCError(RPC_WALLET_ERROR, "Error adding p2sh redeemScript to wallet"); } CBitcoinAddress redeemAddress = CBitcoinAddress(CScriptID(redeemScript)); CScript redeemDestination = GetScriptForDestination(redeemAddress.Get()); - if (::IsMine(*pwalletMain, redeemDestination) == ISMINE_SPENDABLE) { + if (::IsMine(*pwallet, redeemDestination) == ISMINE_SPENDABLE) { throw JSONRPCError(RPC_WALLET_ERROR, "The wallet already contains the private key for this address or script"); } - pwalletMain->MarkDirty(); + pwallet->MarkDirty(); - if (!pwalletMain->HaveWatchOnly(redeemDestination) && !pwalletMain->AddWatchOnly(redeemDestination)) { + if (!pwallet->HaveWatchOnly(redeemDestination) && !pwallet->AddWatchOnly(redeemDestination, timestamp)) { throw JSONRPCError(RPC_WALLET_ERROR, "Error adding address to wallet"); } // add to address book or update label if (address.IsValid()) { - pwalletMain->SetAddressBook(address.Get(), label, "receive"); + pwallet->SetAddressBook(address.Get(), label, "receive"); } // Import private keys. if (keys.size()) { for (size_t i = 0; i < keys.size(); i++) { - const string& privkey = keys[i].get_str(); + const std::string& privkey = keys[i].get_str(); CBitcoinSecret vchSecret; bool fGood = vchSecret.SetString(privkey); @@ -769,22 +791,20 @@ UniValue processImport(const UniValue& data) { assert(key.VerifyPubKey(pubkey)); CKeyID vchAddress = pubkey.GetID(); - pwalletMain->MarkDirty(); - pwalletMain->SetAddressBook(vchAddress, label, "receive"); + pwallet->MarkDirty(); + pwallet->SetAddressBook(vchAddress, label, "receive"); - if (pwalletMain->HaveKey(vchAddress)) { + if (pwallet->HaveKey(vchAddress)) { throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Already have this key"); } - pwalletMain->mapKeyMetadata[vchAddress].nCreateTime = timestamp; + pwallet->mapKeyMetadata[vchAddress].nCreateTime = timestamp; - if (!pwalletMain->AddKeyPubKey(key, pubkey)) { + if (!pwallet->AddKeyPubKey(key, pubkey)) { throw JSONRPCError(RPC_WALLET_ERROR, "Error adding key to wallet"); } - if (timestamp < pwalletMain->nTimeFirstKey) { - pwalletMain->nTimeFirstKey = timestamp; - } + pwallet->UpdateTimeFirstKey(timestamp); } } @@ -792,7 +812,7 @@ UniValue processImport(const UniValue& data) { } else { // Import public keys. if (pubKeys.size() && keys.size() == 0) { - const string& strPubKey = pubKeys[0].get_str(); + const std::string& strPubKey = pubKeys[0].get_str(); if (!IsHex(strPubKey)) { throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Pubkey must be a hex string"); @@ -827,31 +847,31 @@ UniValue processImport(const UniValue& data) { CScript pubKeyScript = GetScriptForDestination(pubKeyAddress.Get()); - if (::IsMine(*pwalletMain, pubKeyScript) == ISMINE_SPENDABLE) { + if (::IsMine(*pwallet, pubKeyScript) == ISMINE_SPENDABLE) { throw JSONRPCError(RPC_WALLET_ERROR, "The wallet already contains the private key for this address or script"); } - pwalletMain->MarkDirty(); + pwallet->MarkDirty(); - if (!pwalletMain->HaveWatchOnly(pubKeyScript) && !pwalletMain->AddWatchOnly(pubKeyScript)) { + if (!pwallet->HaveWatchOnly(pubKeyScript) && !pwallet->AddWatchOnly(pubKeyScript, timestamp)) { throw JSONRPCError(RPC_WALLET_ERROR, "Error adding address to wallet"); } // add to address book or update label if (pubKeyAddress.IsValid()) { - pwalletMain->SetAddressBook(pubKeyAddress.Get(), label, "receive"); + pwallet->SetAddressBook(pubKeyAddress.Get(), label, "receive"); } // TODO Is this necessary? CScript scriptRawPubKey = GetScriptForRawPubKey(pubKey); - if (::IsMine(*pwalletMain, scriptRawPubKey) == ISMINE_SPENDABLE) { + if (::IsMine(*pwallet, scriptRawPubKey) == ISMINE_SPENDABLE) { throw JSONRPCError(RPC_WALLET_ERROR, "The wallet already contains the private key for this address or script"); } - pwalletMain->MarkDirty(); + pwallet->MarkDirty(); - if (!pwalletMain->HaveWatchOnly(scriptRawPubKey) && !pwalletMain->AddWatchOnly(scriptRawPubKey)) { + if (!pwallet->HaveWatchOnly(scriptRawPubKey) && !pwallet->AddWatchOnly(scriptRawPubKey, timestamp)) { throw JSONRPCError(RPC_WALLET_ERROR, "Error adding address to wallet"); } @@ -860,7 +880,7 @@ UniValue processImport(const UniValue& data) { // Import private keys. if (keys.size()) { - const string& strPrivkey = keys[0].get_str(); + const std::string& strPrivkey = keys[0].get_str(); // Checks. CBitcoinSecret vchSecret; @@ -899,42 +919,40 @@ UniValue processImport(const UniValue& data) { } CKeyID vchAddress = pubKey.GetID(); - pwalletMain->MarkDirty(); - pwalletMain->SetAddressBook(vchAddress, label, "receive"); + pwallet->MarkDirty(); + pwallet->SetAddressBook(vchAddress, label, "receive"); - if (pwalletMain->HaveKey(vchAddress)) { + if (pwallet->HaveKey(vchAddress)) { return false; } - pwalletMain->mapKeyMetadata[vchAddress].nCreateTime = timestamp; + pwallet->mapKeyMetadata[vchAddress].nCreateTime = timestamp; - if (!pwalletMain->AddKeyPubKey(key, pubKey)) { + if (!pwallet->AddKeyPubKey(key, pubKey)) { throw JSONRPCError(RPC_WALLET_ERROR, "Error adding key to wallet"); } - if (timestamp < pwalletMain->nTimeFirstKey) { - pwalletMain->nTimeFirstKey = timestamp; - } + pwallet->UpdateTimeFirstKey(timestamp); success = true; } // Import scriptPubKey only. if (pubKeys.size() == 0 && keys.size() == 0) { - if (::IsMine(*pwalletMain, script) == ISMINE_SPENDABLE) { + if (::IsMine(*pwallet, script) == ISMINE_SPENDABLE) { throw JSONRPCError(RPC_WALLET_ERROR, "The wallet already contains the private key for this address or script"); } - pwalletMain->MarkDirty(); + pwallet->MarkDirty(); - if (!pwalletMain->HaveWatchOnly(script) && !pwalletMain->AddWatchOnly(script)) { + if (!pwallet->HaveWatchOnly(script) && !pwallet->AddWatchOnly(script, timestamp)) { throw JSONRPCError(RPC_WALLET_ERROR, "Error adding address to wallet"); } if (scriptPubKey.getType() == UniValue::VOBJ) { // add to address book or update label if (address.IsValid()) { - pwalletMain->SetAddressBook(address.Get(), label, "receive"); + pwallet->SetAddressBook(address.Get(), label, "receive"); } } @@ -958,29 +976,53 @@ UniValue processImport(const UniValue& data) { } } +int64_t GetImportTimestamp(const UniValue& data, int64_t now) +{ + if (data.exists("timestamp")) { + const UniValue& timestamp = data["timestamp"]; + if (timestamp.isNum()) { + return timestamp.get_int64(); + } else if (timestamp.isStr() && timestamp.get_str() == "now") { + return now; + } + throw JSONRPCError(RPC_TYPE_ERROR, strprintf("Expected number or \"now\" timestamp value for key. got type %s", uvTypeName(timestamp.type()))); + } + throw JSONRPCError(RPC_TYPE_ERROR, "Missing required timestamp field for key"); +} + UniValue importmulti(const JSONRPCRequest& mainRequest) { + CWallet * const pwallet = GetWalletForJSONRPCRequest(mainRequest); + if (!EnsureWalletIsAvailable(pwallet, mainRequest.fHelp)) { + return NullUniValue; + } + // clang-format off if (mainRequest.fHelp || mainRequest.params.size() < 1 || mainRequest.params.size() > 2) - throw runtime_error( - "importmulti '[<json import requests>]' '<json options>' \n\n" + throw std::runtime_error( + "importmulti \"requests\" \"options\"\n\n" "Import addresses/scripts (with private or public keys, redeem script (P2SH)), rescanning all addresses in one-shot-only (rescan can be disabled via options).\n\n" "Arguments:\n" - "1. request array (array, required) Data to be imported\n" + "1. requests (array, required) Data to be imported\n" " [ (array of json objects)\n" " {\n" " \"scriptPubKey\": \"<script>\" | { \"address\":\"<address>\" }, (string / json, required) Type of scriptPubKey (string for script, json for address)\n" + " \"timestamp\": timestamp | \"now\" , (integer / string, required) Creation time of the key in seconds since epoch (Jan 1 1970 GMT),\n" + " or the string \"now\" to substitute the current synced blockchain time. The timestamp of the oldest\n" + " key will determine how far back blockchain rescans need to begin for missing wallet transactions.\n" + " \"now\" can be specified to bypass scanning, for keys which are known to never have been used, and\n" + " 0 can be specified to scan the entire blockchain. Blocks up to 2 hours before the earliest key\n" + " creation time of all keys being imported by the importmulti call will be scanned.\n" " \"redeemscript\": \"<script>\" , (string, optional) Allowed only if the scriptPubKey is a P2SH address or a P2SH scriptPubKey\n" " \"pubkeys\": [\"<pubKey>\", ... ] , (array, optional) Array of strings giving pubkeys that must occur in the output or redeemscript\n" " \"keys\": [\"<key>\", ... ] , (array, optional) Array of strings giving private keys whose corresponding public keys must occur in the output or redeemscript\n" " \"internal\": <true> , (boolean, optional, default: false) Stating whether matching outputs should be be treated as not incoming payments\n" " \"watchonly\": <true> , (boolean, optional, default: false) Stating whether matching outputs should be considered watched even when they're not spendable, only allowed if keys are empty\n" " \"label\": <label> , (string, optional, default: '') Label to assign to the address (aka account name, for now), only allowed with internal=false\n" - " \"timestamp\": 1454686740, (integer, optional, default now) Timestamp\n" " }\n" " ,...\n" " ]\n" - "2. json options (json, optional)\n" + "2. options (json, optional)\n" " {\n" " \"rescan\": <false>, (boolean, optional, default: true) Stating if should rescan the blockchain after all imports\n" " }\n" @@ -993,9 +1035,6 @@ UniValue importmulti(const JSONRPCRequest& mainRequest) " [{ \"success\": true } , { \"success\": false, \"error\": { \"code\": -1, \"message\": \"Internal Server Error\"} }, ... ]\n"); // clang-format on - if (!EnsureWalletIsAvailable(mainRequest.fHelp)) { - return NullUniValue; - } RPCTypeCheck(mainRequest.params, boost::assign::list_of(UniValue::VARR)(UniValue::VOBJ)); @@ -1012,8 +1051,14 @@ UniValue importmulti(const JSONRPCRequest& mainRequest) } } - LOCK2(cs_main, pwalletMain->cs_wallet); - EnsureWalletIsUnlocked(); + LOCK2(cs_main, pwallet->cs_wallet); + EnsureWalletIsUnlocked(pwallet); + + // Verify all timestamps are present before importing any keys. + const int64_t now = chainActive.Tip() ? chainActive.Tip()->GetMedianTimePast() : 0; + for (const UniValue& data : requests.getValues()) { + GetImportTimestamp(data, now); + } bool fRunScan = false; const int64_t minimumTimestamp = 1; @@ -1028,7 +1073,8 @@ UniValue importmulti(const JSONRPCRequest& mainRequest) UniValue response(UniValue::VARR); BOOST_FOREACH (const UniValue& data, requests.getValues()) { - const UniValue result = processImport(data); + const int64_t timestamp = std::max(GetImportTimestamp(data, now), minimumTimestamp); + const UniValue result = ProcessImport(pwallet, data, timestamp); response.push_back(result); if (!fRescan) { @@ -1041,19 +1087,39 @@ UniValue importmulti(const JSONRPCRequest& mainRequest) } // Get the lowest timestamp. - const int64_t& timestamp = data.exists("timestamp") && data["timestamp"].get_int64() > minimumTimestamp ? data["timestamp"].get_int64() : minimumTimestamp; - if (timestamp < nLowestTimestamp) { nLowestTimestamp = timestamp; } } - if (fRescan && fRunScan && requests.size() && nLowestTimestamp <= chainActive.Tip()->GetBlockTime()) { - CBlockIndex* pindex = nLowestTimestamp > minimumTimestamp ? chainActive.FindLatestBefore(nLowestTimestamp) : chainActive.Genesis(); - + if (fRescan && fRunScan && requests.size()) { + CBlockIndex* pindex = nLowestTimestamp > minimumTimestamp ? chainActive.FindEarliestAtLeast(std::max<int64_t>(nLowestTimestamp - TIMESTAMP_WINDOW, 0)) : chainActive.Genesis(); + CBlockIndex* scannedRange = nullptr; if (pindex) { - pwalletMain->ScanForWalletTransactions(pindex, true); - pwalletMain->ReacceptWalletTransactions(); + scannedRange = pwallet->ScanForWalletTransactions(pindex, true); + pwallet->ReacceptWalletTransactions(); + } + + if (!scannedRange || scannedRange->nHeight > pindex->nHeight) { + std::vector<UniValue> results = response.getValues(); + response.clear(); + response.setArray(); + size_t i = 0; + for (const UniValue& request : requests.getValues()) { + // If key creation date is within the successfully scanned + // range, or if the import result already has an error set, let + // the result stand unmodified. Otherwise replace the result + // with an error message. + if (GetImportTimestamp(request, now) - TIMESTAMP_WINDOW >= scannedRange->GetBlockTimeMax() || results.at(i).exists("error")) { + response.push_back(results.at(i)); + } else { + UniValue result = UniValue(UniValue::VOBJ); + result.pushKV("success", UniValue(false)); + result.pushKV("error", JSONRPCError(RPC_MISC_ERROR, strprintf("Failed to rescan before time %d, transactions may be missing.", scannedRange->GetBlockTimeMax()))); + response.push_back(std::move(result)); + } + ++i; + } } } diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp index 936140cf44..84e7eb60d7 100644 --- a/src/wallet/rpcwallet.cpp +++ b/src/wallet/rpcwallet.cpp @@ -11,8 +11,10 @@ #include "init.h" #include "validation.h" #include "net.h" +#include "policy/policy.h" #include "policy/rbf.h" #include "rpc/server.h" +#include "script/sign.h" #include "timedata.h" #include "util.h" #include "utilmoneystr.h" @@ -25,22 +27,21 @@ #include <univalue.h> -using namespace std; - -int64_t nWalletUnlockTime; -static CCriticalSection cs_nWalletUnlockTime; +CWallet *GetWalletForJSONRPCRequest(const JSONRPCRequest& request) +{ + return pwalletMain; +} -std::string HelpRequiringPassphrase() +std::string HelpRequiringPassphrase(CWallet * const pwallet) { - return pwalletMain && pwalletMain->IsCrypted() + return pwallet && pwallet->IsCrypted() ? "\nRequires wallet passphrase to be set with walletpassphrase call." : ""; } -bool EnsureWalletIsAvailable(bool avoidException) +bool EnsureWalletIsAvailable(CWallet * const pwallet, bool avoidException) { - if (!pwalletMain) - { + if (!pwallet) { if (!avoidException) throw JSONRPCError(RPC_METHOD_NOT_FOUND, "Method not found (disabled)"); else @@ -49,10 +50,11 @@ bool EnsureWalletIsAvailable(bool avoidException) return true; } -void EnsureWalletIsUnlocked() +void EnsureWalletIsUnlocked(CWallet * const pwallet) { - if (pwalletMain->IsLocked()) + if (pwallet->IsLocked()) { throw JSONRPCError(RPC_WALLET_UNLOCK_NEEDED, "Error: Please enter the wallet passphrase with walletpassphrase first."); + } } void WalletTxToJSON(const CWalletTx& wtx, UniValue& entry) @@ -90,13 +92,13 @@ void WalletTxToJSON(const CWalletTx& wtx, UniValue& entry) } entry.push_back(Pair("bip125-replaceable", rbfStatus)); - BOOST_FOREACH(const PAIRTYPE(string,string)& item, wtx.mapValue) + BOOST_FOREACH(const PAIRTYPE(std::string, std::string)& item, wtx.mapValue) entry.push_back(Pair(item.first, item.second)); } -string AccountFromValue(const UniValue& value) +std::string AccountFromValue(const UniValue& value) { - string strAccount = value.get_str(); + std::string strAccount = value.get_str(); if (strAccount == "*") throw JSONRPCError(RPC_WALLET_INVALID_ACCOUNT_NAME, "Invalid account name"); return strAccount; @@ -104,11 +106,13 @@ string AccountFromValue(const UniValue& value) UniValue getnewaddress(const JSONRPCRequest& request) { - if (!EnsureWalletIsAvailable(request.fHelp)) + CWallet * const pwallet = GetWalletForJSONRPCRequest(request); + if (!EnsureWalletIsAvailable(pwallet, request.fHelp)) { return NullUniValue; + } if (request.fHelp || request.params.size() > 1) - throw runtime_error( + throw std::runtime_error( "getnewaddress ( \"account\" )\n" "\nReturns a new Bitcoin address for receiving payments.\n" "If 'account' is specified (DEPRECATED), it is added to the address book \n" @@ -116,38 +120,40 @@ UniValue getnewaddress(const JSONRPCRequest& request) "\nArguments:\n" "1. \"account\" (string, optional) DEPRECATED. The account name for the address to be linked to. If not provided, the default account \"\" is used. It can also be set to the empty string \"\" to represent the default account. The account does not need to exist, it will be created if there is no account by the given name.\n" "\nResult:\n" - "\"bitcoinaddress\" (string) The new bitcoin address\n" + "\"address\" (string) The new bitcoin address\n" "\nExamples:\n" + HelpExampleCli("getnewaddress", "") + HelpExampleRpc("getnewaddress", "") ); - LOCK2(cs_main, pwalletMain->cs_wallet); + LOCK2(cs_main, pwallet->cs_wallet); // Parse the account first so we don't generate a key if there's an error - string strAccount; + std::string strAccount; if (request.params.size() > 0) strAccount = AccountFromValue(request.params[0]); - if (!pwalletMain->IsLocked()) - pwalletMain->TopUpKeyPool(); + if (!pwallet->IsLocked()) { + pwallet->TopUpKeyPool(); + } // Generate a new key that is added to wallet CPubKey newKey; - if (!pwalletMain->GetKeyFromPool(newKey)) + if (!pwallet->GetKeyFromPool(newKey)) { throw JSONRPCError(RPC_WALLET_KEYPOOL_RAN_OUT, "Error: Keypool ran out, please call keypoolrefill first"); + } CKeyID keyID = newKey.GetID(); - pwalletMain->SetAddressBook(keyID, strAccount, "receive"); + pwallet->SetAddressBook(keyID, strAccount, "receive"); return CBitcoinAddress(keyID).ToString(); } -CBitcoinAddress GetAccountAddress(string strAccount, bool bForceNew=false) +CBitcoinAddress GetAccountAddress(CWallet* const pwallet, std::string strAccount, bool bForceNew=false) { CPubKey pubKey; - if (!pwalletMain->GetAccountPubkey(pubKey, strAccount, bForceNew)) { + if (!pwallet->GetAccountPubkey(pubKey, strAccount, bForceNew)) { throw JSONRPCError(RPC_WALLET_KEYPOOL_RAN_OUT, "Error: Keypool ran out, please call keypoolrefill first"); } @@ -156,17 +162,19 @@ CBitcoinAddress GetAccountAddress(string strAccount, bool bForceNew=false) UniValue getaccountaddress(const JSONRPCRequest& request) { - if (!EnsureWalletIsAvailable(request.fHelp)) + CWallet * const pwallet = GetWalletForJSONRPCRequest(request); + if (!EnsureWalletIsAvailable(pwallet, request.fHelp)) { return NullUniValue; + } if (request.fHelp || request.params.size() != 1) - throw runtime_error( + throw std::runtime_error( "getaccountaddress \"account\"\n" "\nDEPRECATED. Returns the current Bitcoin address for receiving payments to this account.\n" "\nArguments:\n" "1. \"account\" (string, required) The account name for the address. It can also be set to the empty string \"\" to represent the default account. The account does not need to exist, it will be created and a new address created if there is no account by the given name.\n" "\nResult:\n" - "\"bitcoinaddress\" (string) The account bitcoin address\n" + "\"address\" (string) The account bitcoin address\n" "\nExamples:\n" + HelpExampleCli("getaccountaddress", "") + HelpExampleCli("getaccountaddress", "\"\"") @@ -174,25 +182,27 @@ UniValue getaccountaddress(const JSONRPCRequest& request) + HelpExampleRpc("getaccountaddress", "\"myaccount\"") ); - LOCK2(cs_main, pwalletMain->cs_wallet); + LOCK2(cs_main, pwallet->cs_wallet); // Parse the account first so we don't generate a key if there's an error - string strAccount = AccountFromValue(request.params[0]); + std::string strAccount = AccountFromValue(request.params[0]); UniValue ret(UniValue::VSTR); - ret = GetAccountAddress(strAccount).ToString(); + ret = GetAccountAddress(pwallet, strAccount).ToString(); return ret; } UniValue getrawchangeaddress(const JSONRPCRequest& request) { - if (!EnsureWalletIsAvailable(request.fHelp)) + CWallet * const pwallet = GetWalletForJSONRPCRequest(request); + if (!EnsureWalletIsAvailable(pwallet, request.fHelp)) { return NullUniValue; + } if (request.fHelp || request.params.size() > 1) - throw runtime_error( + throw std::runtime_error( "getrawchangeaddress\n" "\nReturns a new Bitcoin address, for receiving change.\n" "This is for use with raw transactions, NOT normal use.\n" @@ -203,12 +213,13 @@ UniValue getrawchangeaddress(const JSONRPCRequest& request) + HelpExampleRpc("getrawchangeaddress", "") ); - LOCK2(cs_main, pwalletMain->cs_wallet); + LOCK2(cs_main, pwallet->cs_wallet); - if (!pwalletMain->IsLocked()) - pwalletMain->TopUpKeyPool(); + if (!pwallet->IsLocked()) { + pwallet->TopUpKeyPool(); + } - CReserveKey reservekey(pwalletMain); + CReserveKey reservekey(pwallet); CPubKey vchPubKey; if (!reservekey.GetReservedKey(vchPubKey)) throw JSONRPCError(RPC_WALLET_KEYPOOL_RAN_OUT, "Error: Keypool ran out, please call keypoolrefill first"); @@ -223,42 +234,43 @@ UniValue getrawchangeaddress(const JSONRPCRequest& request) UniValue setaccount(const JSONRPCRequest& request) { - if (!EnsureWalletIsAvailable(request.fHelp)) + CWallet * const pwallet = GetWalletForJSONRPCRequest(request); + if (!EnsureWalletIsAvailable(pwallet, request.fHelp)) { return NullUniValue; + } if (request.fHelp || request.params.size() < 1 || request.params.size() > 2) - throw runtime_error( - "setaccount \"bitcoinaddress\" \"account\"\n" + throw std::runtime_error( + "setaccount \"address\" \"account\"\n" "\nDEPRECATED. Sets the account associated with the given address.\n" "\nArguments:\n" - "1. \"bitcoinaddress\" (string, required) The bitcoin address to be associated with an account.\n" + "1. \"address\" (string, required) The bitcoin address to be associated with an account.\n" "2. \"account\" (string, required) The account to assign the address to.\n" "\nExamples:\n" - + HelpExampleCli("setaccount", "\"1D1ZrZNe3JUo7ZycKEYQQiQAWd9y54F4XZ\" \"tabby\"") - + HelpExampleRpc("setaccount", "\"1D1ZrZNe3JUo7ZycKEYQQiQAWd9y54F4XZ\", \"tabby\"") + + HelpExampleCli("setaccount", "\"1D1ZrZNe3JUo7ZycKEYQQiQAWd9y54F4XX\" \"tabby\"") + + HelpExampleRpc("setaccount", "\"1D1ZrZNe3JUo7ZycKEYQQiQAWd9y54F4XX\", \"tabby\"") ); - LOCK2(cs_main, pwalletMain->cs_wallet); + LOCK2(cs_main, pwallet->cs_wallet); CBitcoinAddress address(request.params[0].get_str()); if (!address.IsValid()) throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid Bitcoin address"); - string strAccount; + std::string strAccount; if (request.params.size() > 1) strAccount = AccountFromValue(request.params[1]); // Only add the account if the address is yours. - if (IsMine(*pwalletMain, address.Get())) - { + if (IsMine(*pwallet, address.Get())) { // Detect when changing the account of an address that is the 'unused current key' of another account: - if (pwalletMain->mapAddressBook.count(address.Get())) - { - string strOldAccount = pwalletMain->mapAddressBook[address.Get()].name; - if (address == GetAccountAddress(strOldAccount)) - GetAccountAddress(strOldAccount, true); + if (pwallet->mapAddressBook.count(address.Get())) { + std::string strOldAccount = pwallet->mapAddressBook[address.Get()].name; + if (address == GetAccountAddress(pwallet, strOldAccount)) { + GetAccountAddress(pwallet, strOldAccount, true); + } } - pwalletMain->SetAddressBook(address.Get(), strAccount, "receive"); + pwallet->SetAddressBook(address.Get(), strAccount, "receive"); } else throw JSONRPCError(RPC_MISC_ERROR, "setaccount can only be used with own address"); @@ -269,50 +281,55 @@ UniValue setaccount(const JSONRPCRequest& request) UniValue getaccount(const JSONRPCRequest& request) { - if (!EnsureWalletIsAvailable(request.fHelp)) + CWallet * const pwallet = GetWalletForJSONRPCRequest(request); + if (!EnsureWalletIsAvailable(pwallet, request.fHelp)) { return NullUniValue; + } if (request.fHelp || request.params.size() != 1) - throw runtime_error( - "getaccount \"bitcoinaddress\"\n" + throw std::runtime_error( + "getaccount \"address\"\n" "\nDEPRECATED. Returns the account associated with the given address.\n" "\nArguments:\n" - "1. \"bitcoinaddress\" (string, required) The bitcoin address for account lookup.\n" + "1. \"address\" (string, required) The bitcoin address for account lookup.\n" "\nResult:\n" "\"accountname\" (string) the account address\n" "\nExamples:\n" - + HelpExampleCli("getaccount", "\"1D1ZrZNe3JUo7ZycKEYQQiQAWd9y54F4XZ\"") - + HelpExampleRpc("getaccount", "\"1D1ZrZNe3JUo7ZycKEYQQiQAWd9y54F4XZ\"") + + HelpExampleCli("getaccount", "\"1D1ZrZNe3JUo7ZycKEYQQiQAWd9y54F4XX\"") + + HelpExampleRpc("getaccount", "\"1D1ZrZNe3JUo7ZycKEYQQiQAWd9y54F4XX\"") ); - LOCK2(cs_main, pwalletMain->cs_wallet); + LOCK2(cs_main, pwallet->cs_wallet); CBitcoinAddress address(request.params[0].get_str()); if (!address.IsValid()) throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid Bitcoin address"); - string strAccount; - map<CTxDestination, CAddressBookData>::iterator mi = pwalletMain->mapAddressBook.find(address.Get()); - if (mi != pwalletMain->mapAddressBook.end() && !(*mi).second.name.empty()) + std::string strAccount; + std::map<CTxDestination, CAddressBookData>::iterator mi = pwallet->mapAddressBook.find(address.Get()); + if (mi != pwallet->mapAddressBook.end() && !(*mi).second.name.empty()) { strAccount = (*mi).second.name; + } return strAccount; } UniValue getaddressesbyaccount(const JSONRPCRequest& request) { - if (!EnsureWalletIsAvailable(request.fHelp)) + CWallet * const pwallet = GetWalletForJSONRPCRequest(request); + if (!EnsureWalletIsAvailable(pwallet, request.fHelp)) { return NullUniValue; + } if (request.fHelp || request.params.size() != 1) - throw runtime_error( + throw std::runtime_error( "getaddressesbyaccount \"account\"\n" "\nDEPRECATED. Returns the list of addresses for the given account.\n" "\nArguments:\n" - "1. \"account\" (string, required) The account name.\n" + "1. \"account\" (string, required) The account name.\n" "\nResult:\n" "[ (json array of string)\n" - " \"bitcoinaddress\" (string) a bitcoin address associated with the given account\n" + " \"address\" (string) a bitcoin address associated with the given account\n" " ,...\n" "]\n" "\nExamples:\n" @@ -320,25 +337,24 @@ UniValue getaddressesbyaccount(const JSONRPCRequest& request) + HelpExampleRpc("getaddressesbyaccount", "\"tabby\"") ); - LOCK2(cs_main, pwalletMain->cs_wallet); + LOCK2(cs_main, pwallet->cs_wallet); - string strAccount = AccountFromValue(request.params[0]); + std::string strAccount = AccountFromValue(request.params[0]); // Find all addresses that have the given account UniValue ret(UniValue::VARR); - BOOST_FOREACH(const PAIRTYPE(CBitcoinAddress, CAddressBookData)& item, pwalletMain->mapAddressBook) - { + for (const std::pair<CBitcoinAddress, CAddressBookData>& item : pwallet->mapAddressBook) { const CBitcoinAddress& address = item.first; - const string& strName = item.second.name; + const std::string& strName = item.second.name; if (strName == strAccount) ret.push_back(address.ToString()); } return ret; } -static void SendMoney(const CTxDestination &address, CAmount nValue, bool fSubtractFeeFromAmount, CWalletTx& wtxNew) +static void SendMoney(CWallet * const pwallet, const CTxDestination &address, CAmount nValue, bool fSubtractFeeFromAmount, CWalletTx& wtxNew) { - CAmount curBalance = pwalletMain->GetBalance(); + CAmount curBalance = pwallet->GetBalance(); // Check amount if (nValue <= 0) @@ -347,27 +363,28 @@ static void SendMoney(const CTxDestination &address, CAmount nValue, bool fSubtr if (nValue > curBalance) throw JSONRPCError(RPC_WALLET_INSUFFICIENT_FUNDS, "Insufficient funds"); - if (pwalletMain->GetBroadcastTransactions() && !g_connman) + if (pwallet->GetBroadcastTransactions() && !g_connman) { throw JSONRPCError(RPC_CLIENT_P2P_DISABLED, "Error: Peer-to-peer functionality missing or disabled"); + } // Parse Bitcoin address CScript scriptPubKey = GetScriptForDestination(address); // Create and send the transaction - CReserveKey reservekey(pwalletMain); + CReserveKey reservekey(pwallet); CAmount nFeeRequired; std::string strError; - vector<CRecipient> vecSend; + std::vector<CRecipient> vecSend; int nChangePosRet = -1; CRecipient recipient = {scriptPubKey, nValue, fSubtractFeeFromAmount}; vecSend.push_back(recipient); - if (!pwalletMain->CreateTransaction(vecSend, wtxNew, reservekey, nFeeRequired, nChangePosRet, strError)) { + if (!pwallet->CreateTransaction(vecSend, wtxNew, reservekey, nFeeRequired, nChangePosRet, strError)) { if (!fSubtractFeeFromAmount && nValue + nFeeRequired > curBalance) strError = strprintf("Error: This transaction requires a transaction fee of at least %s", FormatMoney(nFeeRequired)); throw JSONRPCError(RPC_WALLET_ERROR, strError); } CValidationState state; - if (!pwalletMain->CommitTransaction(wtxNew, reservekey, g_connman.get(), state)) { + if (!pwallet->CommitTransaction(wtxNew, reservekey, g_connman.get(), state)) { strError = strprintf("Error: The transaction was rejected! Reason given: %s", state.GetRejectReason()); throw JSONRPCError(RPC_WALLET_ERROR, strError); } @@ -375,26 +392,28 @@ static void SendMoney(const CTxDestination &address, CAmount nValue, bool fSubtr UniValue sendtoaddress(const JSONRPCRequest& request) { - if (!EnsureWalletIsAvailable(request.fHelp)) + CWallet * const pwallet = GetWalletForJSONRPCRequest(request); + if (!EnsureWalletIsAvailable(pwallet, request.fHelp)) { return NullUniValue; + } if (request.fHelp || request.params.size() < 2 || request.params.size() > 5) - throw runtime_error( - "sendtoaddress \"bitcoinaddress\" amount ( \"comment\" \"comment-to\" subtractfeefromamount )\n" + throw std::runtime_error( + "sendtoaddress \"address\" amount ( \"comment\" \"comment_to\" subtractfeefromamount )\n" "\nSend an amount to a given address.\n" - + HelpRequiringPassphrase() + + + HelpRequiringPassphrase(pwallet) + "\nArguments:\n" - "1. \"bitcoinaddress\" (string, required) The bitcoin address to send to.\n" - "2. \"amount\" (numeric or string, required) The amount in " + CURRENCY_UNIT + " to send. eg 0.1\n" - "3. \"comment\" (string, optional) A comment used to store what the transaction is for. \n" + "1. \"address\" (string, required) The bitcoin address to send to.\n" + "2. \"amount\" (numeric or string, required) The amount in " + CURRENCY_UNIT + " to send. eg 0.1\n" + "3. \"comment\" (string, optional) A comment used to store what the transaction is for. \n" " This is not part of the transaction, just kept in your wallet.\n" - "4. \"comment-to\" (string, optional) A comment to store the name of the person or organization \n" + "4. \"comment_to\" (string, optional) A comment to store the name of the person or organization \n" " to which you're sending the transaction. This is not part of the \n" " transaction, just kept in your wallet.\n" "5. subtractfeefromamount (boolean, optional, default=false) The fee will be deducted from the amount being sent.\n" " The recipient will receive less bitcoins than you enter in the amount field.\n" "\nResult:\n" - "\"transactionid\" (string) The transaction id.\n" + "\"txid\" (string) The transaction id.\n" "\nExamples:\n" + HelpExampleCli("sendtoaddress", "\"1M72Sfpbz1BPpXFHz9m3CdqATR44Jvaydd\" 0.1") + HelpExampleCli("sendtoaddress", "\"1M72Sfpbz1BPpXFHz9m3CdqATR44Jvaydd\" 0.1 \"donation\" \"seans outpost\"") @@ -402,7 +421,7 @@ UniValue sendtoaddress(const JSONRPCRequest& request) + HelpExampleRpc("sendtoaddress", "\"1M72Sfpbz1BPpXFHz9m3CdqATR44Jvaydd\", 0.1, \"donation\", \"seans outpost\"") ); - LOCK2(cs_main, pwalletMain->cs_wallet); + LOCK2(cs_main, pwallet->cs_wallet); CBitcoinAddress address(request.params[0].get_str()); if (!address.IsValid()) @@ -424,20 +443,22 @@ UniValue sendtoaddress(const JSONRPCRequest& request) if (request.params.size() > 4) fSubtractFeeFromAmount = request.params[4].get_bool(); - EnsureWalletIsUnlocked(); + EnsureWalletIsUnlocked(pwallet); - SendMoney(address.Get(), nAmount, fSubtractFeeFromAmount, wtx); + SendMoney(pwallet, address.Get(), nAmount, fSubtractFeeFromAmount, wtx); return wtx.GetHash().GetHex(); } UniValue listaddressgroupings(const JSONRPCRequest& request) { - if (!EnsureWalletIsAvailable(request.fHelp)) + CWallet * const pwallet = GetWalletForJSONRPCRequest(request); + if (!EnsureWalletIsAvailable(pwallet, request.fHelp)) { return NullUniValue; + } if (request.fHelp) - throw runtime_error( + throw std::runtime_error( "listaddressgroupings\n" "\nLists groups of addresses which have had their common ownership\n" "made public by common use as inputs or as the resulting change\n" @@ -446,9 +467,9 @@ UniValue listaddressgroupings(const JSONRPCRequest& request) "[\n" " [\n" " [\n" - " \"bitcoinaddress\", (string) The bitcoin address\n" + " \"address\", (string) The bitcoin address\n" " amount, (numeric) The amount in " + CURRENCY_UNIT + "\n" - " \"account\" (string, optional) The account (DEPRECATED)\n" + " \"account\" (string, optional) DEPRECATED. The account\n" " ]\n" " ,...\n" " ]\n" @@ -459,12 +480,11 @@ UniValue listaddressgroupings(const JSONRPCRequest& request) + HelpExampleRpc("listaddressgroupings", "") ); - LOCK2(cs_main, pwalletMain->cs_wallet); + LOCK2(cs_main, pwallet->cs_wallet); UniValue jsonGroupings(UniValue::VARR); - map<CTxDestination, CAmount> balances = pwalletMain->GetAddressBalances(); - BOOST_FOREACH(set<CTxDestination> grouping, pwalletMain->GetAddressGroupings()) - { + std::map<CTxDestination, CAmount> balances = pwallet->GetAddressBalances(); + for (std::set<CTxDestination> grouping : pwallet->GetAddressGroupings()) { UniValue jsonGrouping(UniValue::VARR); BOOST_FOREACH(CTxDestination address, grouping) { @@ -472,8 +492,9 @@ UniValue listaddressgroupings(const JSONRPCRequest& request) addressInfo.push_back(CBitcoinAddress(address).ToString()); addressInfo.push_back(ValueFromAmount(balances[address])); { - if (pwalletMain->mapAddressBook.find(CBitcoinAddress(address).Get()) != pwalletMain->mapAddressBook.end()) - addressInfo.push_back(pwalletMain->mapAddressBook.find(CBitcoinAddress(address).Get())->second.name); + if (pwallet->mapAddressBook.find(CBitcoinAddress(address).Get()) != pwallet->mapAddressBook.end()) { + addressInfo.push_back(pwallet->mapAddressBook.find(CBitcoinAddress(address).Get())->second.name); + } } jsonGrouping.push_back(addressInfo); } @@ -484,16 +505,18 @@ UniValue listaddressgroupings(const JSONRPCRequest& request) UniValue signmessage(const JSONRPCRequest& request) { - if (!EnsureWalletIsAvailable(request.fHelp)) + CWallet * const pwallet = GetWalletForJSONRPCRequest(request); + if (!EnsureWalletIsAvailable(pwallet, request.fHelp)) { return NullUniValue; + } if (request.fHelp || request.params.size() != 2) - throw runtime_error( - "signmessage \"bitcoinaddress\" \"message\"\n" + throw std::runtime_error( + "signmessage \"address\" \"message\"\n" "\nSign a message with the private key of an address" - + HelpRequiringPassphrase() + "\n" + + HelpRequiringPassphrase(pwallet) + "\n" "\nArguments:\n" - "1. \"bitcoinaddress\" (string, required) The bitcoin address to use for the private key.\n" + "1. \"address\" (string, required) The bitcoin address to use for the private key.\n" "2. \"message\" (string, required) The message to create a signature of.\n" "\nResult:\n" "\"signature\" (string) The signature of the message encoded in base 64\n" @@ -501,19 +524,19 @@ UniValue signmessage(const JSONRPCRequest& request) "\nUnlock the wallet for 30 seconds\n" + HelpExampleCli("walletpassphrase", "\"mypassphrase\" 30") + "\nCreate the signature\n" - + HelpExampleCli("signmessage", "\"1D1ZrZNe3JUo7ZycKEYQQiQAWd9y54F4XZ\" \"my message\"") + + + HelpExampleCli("signmessage", "\"1D1ZrZNe3JUo7ZycKEYQQiQAWd9y54F4XX\" \"my message\"") + "\nVerify the signature\n" - + HelpExampleCli("verifymessage", "\"1D1ZrZNe3JUo7ZycKEYQQiQAWd9y54F4XZ\" \"signature\" \"my message\"") + + + HelpExampleCli("verifymessage", "\"1D1ZrZNe3JUo7ZycKEYQQiQAWd9y54F4XX\" \"signature\" \"my message\"") + "\nAs json rpc\n" - + HelpExampleRpc("signmessage", "\"1D1ZrZNe3JUo7ZycKEYQQiQAWd9y54F4XZ\", \"my message\"") + + HelpExampleRpc("signmessage", "\"1D1ZrZNe3JUo7ZycKEYQQiQAWd9y54F4XX\", \"my message\"") ); - LOCK2(cs_main, pwalletMain->cs_wallet); + LOCK2(cs_main, pwallet->cs_wallet); - EnsureWalletIsUnlocked(); + EnsureWalletIsUnlocked(pwallet); - string strAddress = request.params[0].get_str(); - string strMessage = request.params[1].get_str(); + std::string strAddress = request.params[0].get_str(); + std::string strMessage = request.params[1].get_str(); CBitcoinAddress addr(strAddress); if (!addr.IsValid()) @@ -524,14 +547,15 @@ UniValue signmessage(const JSONRPCRequest& request) throw JSONRPCError(RPC_TYPE_ERROR, "Address does not refer to key"); CKey key; - if (!pwalletMain->GetKey(keyID, key)) + if (!pwallet->GetKey(keyID, key)) { throw JSONRPCError(RPC_WALLET_ERROR, "Private key not available"); + } CHashWriter ss(SER_GETHASH, 0); ss << strMessageMagic; ss << strMessage; - vector<unsigned char> vchSig; + std::vector<unsigned char> vchSig; if (!key.SignCompact(ss.GetHash(), vchSig)) throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Sign failed"); @@ -540,38 +564,41 @@ UniValue signmessage(const JSONRPCRequest& request) UniValue getreceivedbyaddress(const JSONRPCRequest& request) { - if (!EnsureWalletIsAvailable(request.fHelp)) + CWallet * const pwallet = GetWalletForJSONRPCRequest(request); + if (!EnsureWalletIsAvailable(pwallet, request.fHelp)) { return NullUniValue; + } if (request.fHelp || request.params.size() < 1 || request.params.size() > 2) - throw runtime_error( - "getreceivedbyaddress \"bitcoinaddress\" ( minconf )\n" - "\nReturns the total amount received by the given bitcoinaddress in transactions with at least minconf confirmations.\n" + throw std::runtime_error( + "getreceivedbyaddress \"address\" ( minconf )\n" + "\nReturns the total amount received by the given address in transactions with at least minconf confirmations.\n" "\nArguments:\n" - "1. \"bitcoinaddress\" (string, required) The bitcoin address for transactions.\n" + "1. \"address\" (string, required) The bitcoin address for transactions.\n" "2. minconf (numeric, optional, default=1) Only include transactions confirmed at least this many times.\n" "\nResult:\n" "amount (numeric) The total amount in " + CURRENCY_UNIT + " received at this address.\n" "\nExamples:\n" "\nThe amount from transactions with at least 1 confirmation\n" - + HelpExampleCli("getreceivedbyaddress", "\"1D1ZrZNe3JUo7ZycKEYQQiQAWd9y54F4XZ\"") + + + HelpExampleCli("getreceivedbyaddress", "\"1D1ZrZNe3JUo7ZycKEYQQiQAWd9y54F4XX\"") + "\nThe amount including unconfirmed transactions, zero confirmations\n" - + HelpExampleCli("getreceivedbyaddress", "\"1D1ZrZNe3JUo7ZycKEYQQiQAWd9y54F4XZ\" 0") + + + HelpExampleCli("getreceivedbyaddress", "\"1D1ZrZNe3JUo7ZycKEYQQiQAWd9y54F4XX\" 0") + "\nThe amount with at least 6 confirmation, very safe\n" - + HelpExampleCli("getreceivedbyaddress", "\"1D1ZrZNe3JUo7ZycKEYQQiQAWd9y54F4XZ\" 6") + + + HelpExampleCli("getreceivedbyaddress", "\"1D1ZrZNe3JUo7ZycKEYQQiQAWd9y54F4XX\" 6") + "\nAs a json rpc call\n" - + HelpExampleRpc("getreceivedbyaddress", "\"1D1ZrZNe3JUo7ZycKEYQQiQAWd9y54F4XZ\", 6") + + HelpExampleRpc("getreceivedbyaddress", "\"1D1ZrZNe3JUo7ZycKEYQQiQAWd9y54F4XX\", 6") ); - LOCK2(cs_main, pwalletMain->cs_wallet); + LOCK2(cs_main, pwallet->cs_wallet); // Bitcoin address CBitcoinAddress address = CBitcoinAddress(request.params[0].get_str()); if (!address.IsValid()) throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid Bitcoin address"); CScript scriptPubKey = GetScriptForDestination(address.Get()); - if (!IsMine(*pwalletMain, scriptPubKey)) + if (!IsMine(*pwallet, scriptPubKey)) { return ValueFromAmount(0); + } // Minimum confirmations int nMinDepth = 1; @@ -580,9 +607,8 @@ UniValue getreceivedbyaddress(const JSONRPCRequest& request) // Tally CAmount nAmount = 0; - for (map<uint256, CWalletTx>::iterator it = pwalletMain->mapWallet.begin(); it != pwalletMain->mapWallet.end(); ++it) - { - const CWalletTx& wtx = (*it).second; + for (const std::pair<uint256, CWalletTx>& pairWtx : pwallet->mapWallet) { + const CWalletTx& wtx = pairWtx.second; if (wtx.IsCoinBase() || !CheckFinalTx(*wtx.tx)) continue; @@ -598,11 +624,13 @@ UniValue getreceivedbyaddress(const JSONRPCRequest& request) UniValue getreceivedbyaccount(const JSONRPCRequest& request) { - if (!EnsureWalletIsAvailable(request.fHelp)) + CWallet * const pwallet = GetWalletForJSONRPCRequest(request); + if (!EnsureWalletIsAvailable(pwallet, request.fHelp)) { return NullUniValue; + } if (request.fHelp || request.params.size() < 1 || request.params.size() > 2) - throw runtime_error( + throw std::runtime_error( "getreceivedbyaccount \"account\" ( minconf )\n" "\nDEPRECATED. Returns the total amount received by addresses with <account> in transactions with at least [minconf] confirmations.\n" "\nArguments:\n" @@ -621,7 +649,7 @@ UniValue getreceivedbyaccount(const JSONRPCRequest& request) + HelpExampleRpc("getreceivedbyaccount", "\"tabby\", 6") ); - LOCK2(cs_main, pwalletMain->cs_wallet); + LOCK2(cs_main, pwallet->cs_wallet); // Minimum confirmations int nMinDepth = 1; @@ -629,23 +657,23 @@ UniValue getreceivedbyaccount(const JSONRPCRequest& request) nMinDepth = request.params[1].get_int(); // Get the set of pub keys assigned to account - string strAccount = AccountFromValue(request.params[0]); - set<CTxDestination> setAddress = pwalletMain->GetAccountAddresses(strAccount); + std::string strAccount = AccountFromValue(request.params[0]); + std::set<CTxDestination> setAddress = pwallet->GetAccountAddresses(strAccount); // Tally CAmount nAmount = 0; - for (map<uint256, CWalletTx>::iterator it = pwalletMain->mapWallet.begin(); it != pwalletMain->mapWallet.end(); ++it) - { - const CWalletTx& wtx = (*it).second; + for (const std::pair<uint256, CWalletTx>& pairWtx : pwallet->mapWallet) { + const CWalletTx& wtx = pairWtx.second; if (wtx.IsCoinBase() || !CheckFinalTx(*wtx.tx)) continue; BOOST_FOREACH(const CTxOut& txout, wtx.tx->vout) { CTxDestination address; - if (ExtractDestination(txout.scriptPubKey, address) && IsMine(*pwalletMain, address) && setAddress.count(address)) + if (ExtractDestination(txout.scriptPubKey, address) && IsMine(*pwallet, address) && setAddress.count(address)) { if (wtx.GetDepthInMainChain() >= nMinDepth) nAmount += txout.nValue; + } } } @@ -655,20 +683,33 @@ UniValue getreceivedbyaccount(const JSONRPCRequest& request) UniValue getbalance(const JSONRPCRequest& request) { - if (!EnsureWalletIsAvailable(request.fHelp)) + CWallet * const pwallet = GetWalletForJSONRPCRequest(request); + if (!EnsureWalletIsAvailable(pwallet, request.fHelp)) { return NullUniValue; + } if (request.fHelp || request.params.size() > 3) - throw runtime_error( - "getbalance ( \"account\" minconf includeWatchonly )\n" + throw std::runtime_error( + "getbalance ( \"account\" minconf include_watchonly )\n" "\nIf account is not specified, returns the server's total available balance.\n" "If account is specified (DEPRECATED), returns the balance in the account.\n" "Note that the account \"\" is not the same as leaving the parameter out.\n" "The server total may be different to the balance in the default \"\" account.\n" "\nArguments:\n" - "1. \"account\" (string, optional) DEPRECATED. The selected account, or \"*\" for entire wallet. It may be the default account using \"\".\n" - "2. minconf (numeric, optional, default=1) Only include transactions confirmed at least this many times.\n" - "3. includeWatchonly (bool, optional, default=false) Also include balance in watchonly addresses (see 'importaddress')\n" + "1. \"account\" (string, optional) DEPRECATED. The account string may be given as a\n" + " specific account name to find the balance associated with wallet keys in\n" + " a named account, or as the empty string (\"\") to find the balance\n" + " associated with wallet keys not in any named account, or as \"*\" to find\n" + " the balance associated with all wallet keys regardless of account.\n" + " When this option is specified, it calculates the balance in a different\n" + " way than when it is not specified, and which can count spends twice when\n" + " there are conflicting pending transactions (such as those created by\n" + " the bumpfee command), temporarily resulting in low or even negative\n" + " balances. In general, account balance calculation is not considered\n" + " reliable and has resulted in confusing outcomes, so it is recommended to\n" + " avoid passing this argument.\n" + "2. minconf (numeric, optional, default=1) Only include transactions confirmed at least this many times.\n" + "3. include_watchonly (bool, optional, default=false) Also include balance in watch-only addresses (see 'importaddress')\n" "\nResult:\n" "amount (numeric) The total amount in " + CURRENCY_UNIT + " received for this account.\n" "\nExamples:\n" @@ -680,10 +721,10 @@ UniValue getbalance(const JSONRPCRequest& request) + HelpExampleRpc("getbalance", "\"*\", 6") ); - LOCK2(cs_main, pwalletMain->cs_wallet); + LOCK2(cs_main, pwallet->cs_wallet); if (request.params.size() == 0) - return ValueFromAmount(pwalletMain->GetBalance()); + return ValueFromAmount(pwallet->GetBalance()); int nMinDepth = 1; if (request.params.size() > 1) @@ -694,20 +735,22 @@ UniValue getbalance(const JSONRPCRequest& request) filter = filter | ISMINE_WATCH_ONLY; if (request.params[0].get_str() == "*") { - // Calculate total balance a different way from GetBalance() - // (GetBalance() sums up all unspent TxOuts) - // getbalance and "getbalance * 1 true" should return the same number + // Calculate total balance in a very different way from GetBalance(). + // The biggest difference is that GetBalance() sums up all unspent + // TxOuts paying to the wallet, while this sums up both spent and + // unspent TxOuts paying to the wallet, and then subtracts the values of + // TxIns spending from the wallet. This also has fewer restrictions on + // which unconfirmed transactions are considered trusted. CAmount nBalance = 0; - for (map<uint256, CWalletTx>::iterator it = pwalletMain->mapWallet.begin(); it != pwalletMain->mapWallet.end(); ++it) - { - const CWalletTx& wtx = (*it).second; + for (const std::pair<uint256, CWalletTx>& pairWtx : pwallet->mapWallet) { + const CWalletTx& wtx = pairWtx.second; if (!CheckFinalTx(wtx) || wtx.GetBlocksToMaturity() > 0 || wtx.GetDepthInMainChain() < 0) continue; CAmount allFee; - string strSentAccount; - list<COutputEntry> listReceived; - list<COutputEntry> listSent; + std::string strSentAccount; + std::list<COutputEntry> listReceived; + std::list<COutputEntry> listSent; wtx.GetAmounts(listReceived, listSent, allFee, strSentAccount, filter); if (wtx.GetDepthInMainChain() >= nMinDepth) { @@ -721,36 +764,40 @@ UniValue getbalance(const JSONRPCRequest& request) return ValueFromAmount(nBalance); } - string strAccount = AccountFromValue(request.params[0]); + std::string strAccount = AccountFromValue(request.params[0]); - CAmount nBalance = pwalletMain->GetAccountBalance(strAccount, nMinDepth, filter); + CAmount nBalance = pwallet->GetAccountBalance(strAccount, nMinDepth, filter); return ValueFromAmount(nBalance); } UniValue getunconfirmedbalance(const JSONRPCRequest &request) { - if (!EnsureWalletIsAvailable(request.fHelp)) + CWallet * const pwallet = GetWalletForJSONRPCRequest(request); + if (!EnsureWalletIsAvailable(pwallet, request.fHelp)) { return NullUniValue; + } if (request.fHelp || request.params.size() > 0) - throw runtime_error( + throw std::runtime_error( "getunconfirmedbalance\n" "Returns the server's total unconfirmed balance\n"); - LOCK2(cs_main, pwalletMain->cs_wallet); + LOCK2(cs_main, pwallet->cs_wallet); - return ValueFromAmount(pwalletMain->GetUnconfirmedBalance()); + return ValueFromAmount(pwallet->GetUnconfirmedBalance()); } UniValue movecmd(const JSONRPCRequest& request) { - if (!EnsureWalletIsAvailable(request.fHelp)) + CWallet * const pwallet = GetWalletForJSONRPCRequest(request); + if (!EnsureWalletIsAvailable(pwallet, request.fHelp)) { return NullUniValue; + } if (request.fHelp || request.params.size() < 3 || request.params.size() > 5) - throw runtime_error( + throw std::runtime_error( "move \"fromaccount\" \"toaccount\" amount ( minconf \"comment\" )\n" "\nDEPRECATED. Move a specified amount from one account in your wallet to another.\n" "\nArguments:\n" @@ -770,22 +817,23 @@ UniValue movecmd(const JSONRPCRequest& request) + HelpExampleRpc("move", "\"timotei\", \"akiko\", 0.01, 6, \"happy birthday!\"") ); - LOCK2(cs_main, pwalletMain->cs_wallet); + LOCK2(cs_main, pwallet->cs_wallet); - string strFrom = AccountFromValue(request.params[0]); - string strTo = AccountFromValue(request.params[1]); + std::string strFrom = AccountFromValue(request.params[0]); + std::string strTo = AccountFromValue(request.params[1]); CAmount nAmount = AmountFromValue(request.params[2]); if (nAmount <= 0) throw JSONRPCError(RPC_TYPE_ERROR, "Invalid amount for send"); if (request.params.size() > 3) // unused parameter, used to be nMinDepth, keep type-checking it though (void)request.params[3].get_int(); - string strComment; + std::string strComment; if (request.params.size() > 4) strComment = request.params[4].get_str(); - if (!pwalletMain->AccountMove(strFrom, strTo, nAmount, strComment)) + if (!pwallet->AccountMove(strFrom, strTo, nAmount, strComment)) { throw JSONRPCError(RPC_DATABASE_ERROR, "database error"); + } return true; } @@ -793,26 +841,31 @@ UniValue movecmd(const JSONRPCRequest& request) UniValue sendfrom(const JSONRPCRequest& request) { - if (!EnsureWalletIsAvailable(request.fHelp)) + CWallet * const pwallet = GetWalletForJSONRPCRequest(request); + if (!EnsureWalletIsAvailable(pwallet, request.fHelp)) { return NullUniValue; + } if (request.fHelp || request.params.size() < 3 || request.params.size() > 6) - throw runtime_error( - "sendfrom \"fromaccount\" \"tobitcoinaddress\" amount ( minconf \"comment\" \"comment-to\" )\n" + throw std::runtime_error( + "sendfrom \"fromaccount\" \"toaddress\" amount ( minconf \"comment\" \"comment_to\" )\n" "\nDEPRECATED (use sendtoaddress). Sent an amount from an account to a bitcoin address." - + HelpRequiringPassphrase() + "\n" + + HelpRequiringPassphrase(pwallet) + "\n" "\nArguments:\n" "1. \"fromaccount\" (string, required) The name of the account to send funds from. May be the default account using \"\".\n" - "2. \"tobitcoinaddress\" (string, required) The bitcoin address to send funds to.\n" + " Specifying an account does not influence coin selection, but it does associate the newly created\n" + " transaction with the account, so the account's balance computation and transaction history can reflect\n" + " the spend.\n" + "2. \"toaddress\" (string, required) The bitcoin address to send funds to.\n" "3. amount (numeric or string, required) The amount in " + CURRENCY_UNIT + " (transaction fee is added on top).\n" "4. minconf (numeric, optional, default=1) Only use funds with at least this many confirmations.\n" "5. \"comment\" (string, optional) A comment used to store what the transaction is for. \n" " This is not part of the transaction, just kept in your wallet.\n" - "6. \"comment-to\" (string, optional) An optional comment to store the name of the person or organization \n" + "6. \"comment_to\" (string, optional) An optional comment to store the name of the person or organization \n" " to which you're sending the transaction. This is not part of the transaction, \n" " it is just kept in your wallet.\n" "\nResult:\n" - "\"transactionid\" (string) The transaction id.\n" + "\"txid\" (string) The transaction id.\n" "\nExamples:\n" "\nSend 0.01 " + CURRENCY_UNIT + " from the default account to the address, must have at least 1 confirmation\n" + HelpExampleCli("sendfrom", "\"\" \"1M72Sfpbz1BPpXFHz9m3CdqATR44Jvaydd\" 0.01") + @@ -822,9 +875,9 @@ UniValue sendfrom(const JSONRPCRequest& request) + HelpExampleRpc("sendfrom", "\"tabby\", \"1M72Sfpbz1BPpXFHz9m3CdqATR44Jvaydd\", 0.01, 6, \"donation\", \"seans outpost\"") ); - LOCK2(cs_main, pwalletMain->cs_wallet); + LOCK2(cs_main, pwallet->cs_wallet); - string strAccount = AccountFromValue(request.params[0]); + std::string strAccount = AccountFromValue(request.params[0]); CBitcoinAddress address(request.params[1].get_str()); if (!address.IsValid()) throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid Bitcoin address"); @@ -842,14 +895,14 @@ UniValue sendfrom(const JSONRPCRequest& request) if (request.params.size() > 5 && !request.params[5].isNull() && !request.params[5].get_str().empty()) wtx.mapValue["to"] = request.params[5].get_str(); - EnsureWalletIsUnlocked(); + EnsureWalletIsUnlocked(pwallet); // Check funds - CAmount nBalance = pwalletMain->GetAccountBalance(strAccount, nMinDepth, ISMINE_SPENDABLE); + CAmount nBalance = pwallet->GetAccountBalance(strAccount, nMinDepth, ISMINE_SPENDABLE); if (nAmount > nBalance) throw JSONRPCError(RPC_WALLET_INSUFFICIENT_FUNDS, "Account has insufficient funds"); - SendMoney(address.Get(), nAmount, false, wtx); + SendMoney(pwallet, address.Get(), nAmount, false, wtx); return wtx.GetHash().GetHex(); } @@ -857,14 +910,16 @@ UniValue sendfrom(const JSONRPCRequest& request) UniValue sendmany(const JSONRPCRequest& request) { - if (!EnsureWalletIsAvailable(request.fHelp)) + CWallet * const pwallet = GetWalletForJSONRPCRequest(request); + if (!EnsureWalletIsAvailable(pwallet, request.fHelp)) { return NullUniValue; + } if (request.fHelp || request.params.size() < 2 || request.params.size() > 5) - throw runtime_error( + throw std::runtime_error( "sendmany \"fromaccount\" {\"address\":amount,...} ( minconf \"comment\" [\"address\",...] )\n" "\nSend multiple times. Amounts are double-precision floating point numbers." - + HelpRequiringPassphrase() + "\n" + + HelpRequiringPassphrase(pwallet) + "\n" "\nArguments:\n" "1. \"fromaccount\" (string, required) DEPRECATED. The account to send the funds from. Should be \"\" for the default account\n" "2. \"amounts\" (string, required) A json object with addresses and amounts\n" @@ -874,34 +929,35 @@ UniValue sendmany(const JSONRPCRequest& request) " }\n" "3. minconf (numeric, optional, default=1) Only use the balance confirmed at least this many times.\n" "4. \"comment\" (string, optional) A comment\n" - "5. subtractfeefromamount (string, optional) A json array with addresses.\n" + "5. subtractfeefrom (array, optional) A json array with addresses.\n" " The fee will be equally deducted from the amount of each selected address.\n" " Those recipients will receive less bitcoins than you enter in their corresponding amount field.\n" " If no addresses are specified here, the sender pays the fee.\n" " [\n" - " \"address\" (string) Subtract fee from this address\n" + " \"address\" (string) Subtract fee from this address\n" " ,...\n" " ]\n" "\nResult:\n" - "\"transactionid\" (string) The transaction id for the send. Only 1 transaction is created regardless of \n" + "\"txid\" (string) The transaction id for the send. Only 1 transaction is created regardless of \n" " the number of addresses.\n" "\nExamples:\n" "\nSend two amounts to two different addresses:\n" - + HelpExampleCli("sendmany", "\"\" \"{\\\"1D1ZrZNe3JUo7ZycKEYQQiQAWd9y54F4XZ\\\":0.01,\\\"1353tsE8YMTA4EuV7dgUXGjNFf9KpVvKHz\\\":0.02}\"") + + + HelpExampleCli("sendmany", "\"\" \"{\\\"1D1ZrZNe3JUo7ZycKEYQQiQAWd9y54F4XX\\\":0.01,\\\"1353tsE8YMTA4EuV7dgUXGjNFf9KpVvKHz\\\":0.02}\"") + "\nSend two amounts to two different addresses setting the confirmation and comment:\n" - + HelpExampleCli("sendmany", "\"\" \"{\\\"1D1ZrZNe3JUo7ZycKEYQQiQAWd9y54F4XZ\\\":0.01,\\\"1353tsE8YMTA4EuV7dgUXGjNFf9KpVvKHz\\\":0.02}\" 6 \"testing\"") + + + HelpExampleCli("sendmany", "\"\" \"{\\\"1D1ZrZNe3JUo7ZycKEYQQiQAWd9y54F4XX\\\":0.01,\\\"1353tsE8YMTA4EuV7dgUXGjNFf9KpVvKHz\\\":0.02}\" 6 \"testing\"") + "\nSend two amounts to two different addresses, subtract fee from amount:\n" - + HelpExampleCli("sendmany", "\"\" \"{\\\"1D1ZrZNe3JUo7ZycKEYQQiQAWd9y54F4XZ\\\":0.01,\\\"1353tsE8YMTA4EuV7dgUXGjNFf9KpVvKHz\\\":0.02}\" 1 \"\" \"[\\\"1D1ZrZNe3JUo7ZycKEYQQiQAWd9y54F4XZ\\\",\\\"1353tsE8YMTA4EuV7dgUXGjNFf9KpVvKHz\\\"]\"") + + + HelpExampleCli("sendmany", "\"\" \"{\\\"1D1ZrZNe3JUo7ZycKEYQQiQAWd9y54F4XX\\\":0.01,\\\"1353tsE8YMTA4EuV7dgUXGjNFf9KpVvKHz\\\":0.02}\" 1 \"\" \"[\\\"1D1ZrZNe3JUo7ZycKEYQQiQAWd9y54F4XX\\\",\\\"1353tsE8YMTA4EuV7dgUXGjNFf9KpVvKHz\\\"]\"") + "\nAs a json rpc call\n" - + HelpExampleRpc("sendmany", "\"\", \"{\\\"1D1ZrZNe3JUo7ZycKEYQQiQAWd9y54F4XZ\\\":0.01,\\\"1353tsE8YMTA4EuV7dgUXGjNFf9KpVvKHz\\\":0.02}\", 6, \"testing\"") + + HelpExampleRpc("sendmany", "\"\", \"{\\\"1D1ZrZNe3JUo7ZycKEYQQiQAWd9y54F4XX\\\":0.01,\\\"1353tsE8YMTA4EuV7dgUXGjNFf9KpVvKHz\\\":0.02}\", 6, \"testing\"") ); - LOCK2(cs_main, pwalletMain->cs_wallet); + LOCK2(cs_main, pwallet->cs_wallet); - if (pwalletMain->GetBroadcastTransactions() && !g_connman) + if (pwallet->GetBroadcastTransactions() && !g_connman) { throw JSONRPCError(RPC_CLIENT_P2P_DISABLED, "Error: Peer-to-peer functionality missing or disabled"); + } - string strAccount = AccountFromValue(request.params[0]); + std::string strAccount = AccountFromValue(request.params[0]); UniValue sendTo = request.params[1].get_obj(); int nMinDepth = 1; if (request.params.size() > 2) @@ -916,19 +972,19 @@ UniValue sendmany(const JSONRPCRequest& request) if (request.params.size() > 4) subtractFeeFromAmount = request.params[4].get_array(); - set<CBitcoinAddress> setAddress; - vector<CRecipient> vecSend; + std::set<CBitcoinAddress> setAddress; + std::vector<CRecipient> vecSend; CAmount totalAmount = 0; - vector<string> keys = sendTo.getKeys(); - BOOST_FOREACH(const string& name_, keys) + std::vector<std::string> keys = sendTo.getKeys(); + BOOST_FOREACH(const std::string& name_, keys) { CBitcoinAddress address(name_); if (!address.IsValid()) - throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, string("Invalid Bitcoin address: ")+name_); + throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, std::string("Invalid Bitcoin address: ")+name_); if (setAddress.count(address)) - throw JSONRPCError(RPC_INVALID_PARAMETER, string("Invalid parameter, duplicated address: ")+name_); + throw JSONRPCError(RPC_INVALID_PARAMETER, std::string("Invalid parameter, duplicated address: ")+name_); setAddress.insert(address); CScript scriptPubKey = GetScriptForDestination(address.Get()); @@ -948,23 +1004,23 @@ UniValue sendmany(const JSONRPCRequest& request) vecSend.push_back(recipient); } - EnsureWalletIsUnlocked(); + EnsureWalletIsUnlocked(pwallet); // Check funds - CAmount nBalance = pwalletMain->GetAccountBalance(strAccount, nMinDepth, ISMINE_SPENDABLE); + CAmount nBalance = pwallet->GetAccountBalance(strAccount, nMinDepth, ISMINE_SPENDABLE); if (totalAmount > nBalance) throw JSONRPCError(RPC_WALLET_INSUFFICIENT_FUNDS, "Account has insufficient funds"); // Send - CReserveKey keyChange(pwalletMain); + CReserveKey keyChange(pwallet); CAmount nFeeRequired = 0; int nChangePosRet = -1; - string strFailReason; - bool fCreated = pwalletMain->CreateTransaction(vecSend, wtx, keyChange, nFeeRequired, nChangePosRet, strFailReason); + std::string strFailReason; + bool fCreated = pwallet->CreateTransaction(vecSend, wtx, keyChange, nFeeRequired, nChangePosRet, strFailReason); if (!fCreated) throw JSONRPCError(RPC_WALLET_INSUFFICIENT_FUNDS, strFailReason); CValidationState state; - if (!pwalletMain->CommitTransaction(wtx, keyChange, g_connman.get(), state)) { + if (!pwallet->CommitTransaction(wtx, keyChange, g_connman.get(), state)) { strFailReason = strprintf("Transaction commit failed:: %s", state.GetRejectReason()); throw JSONRPCError(RPC_WALLET_ERROR, strFailReason); } @@ -973,23 +1029,25 @@ UniValue sendmany(const JSONRPCRequest& request) } // Defined in rpc/misc.cpp -extern CScript _createmultisig_redeemScript(const UniValue& params); +extern CScript _createmultisig_redeemScript(CWallet * const pwallet, const UniValue& params); UniValue addmultisigaddress(const JSONRPCRequest& request) { - if (!EnsureWalletIsAvailable(request.fHelp)) + CWallet * const pwallet = GetWalletForJSONRPCRequest(request); + if (!EnsureWalletIsAvailable(pwallet, request.fHelp)) { return NullUniValue; + } if (request.fHelp || request.params.size() < 2 || request.params.size() > 3) { - string msg = "addmultisigaddress nrequired [\"key\",...] ( \"account\" )\n" + std::string msg = "addmultisigaddress nrequired [\"key\",...] ( \"account\" )\n" "\nAdd a nrequired-to-sign multisignature address to the wallet.\n" "Each key is a Bitcoin address or hex-encoded public key.\n" "If 'account' is specified (DEPRECATED), assign address to that account.\n" "\nArguments:\n" "1. nrequired (numeric, required) The number of required signatures out of the n keys or addresses.\n" - "2. \"keysobject\" (string, required) A json array of bitcoin addresses or hex-encoded public keys\n" + "2. \"keys\" (string, required) A json array of bitcoin addresses or hex-encoded public keys\n" " [\n" " \"address\" (string) bitcoin address or hex-encoded public key\n" " ...,\n" @@ -997,7 +1055,7 @@ UniValue addmultisigaddress(const JSONRPCRequest& request) "3. \"account\" (string, optional) DEPRECATED. An account to assign the addresses to.\n" "\nResult:\n" - "\"bitcoinaddress\" (string) A bitcoin address associated with the keys.\n" + "\"address\" (string) A bitcoin address associated with the keys.\n" "\nExamples:\n" "\nAdd a multisig address from 2 addresses\n" @@ -1005,41 +1063,44 @@ UniValue addmultisigaddress(const JSONRPCRequest& request) "\nAs json rpc call\n" + HelpExampleRpc("addmultisigaddress", "2, \"[\\\"16sSauSf5pF2UkUwvKGq4qjNRzBZYqgEL5\\\",\\\"171sgjn4YtPu27adkKGrdDwzRTxnRkBfKV\\\"]\"") ; - throw runtime_error(msg); + throw std::runtime_error(msg); } - LOCK2(cs_main, pwalletMain->cs_wallet); + LOCK2(cs_main, pwallet->cs_wallet); - string strAccount; + std::string strAccount; if (request.params.size() > 2) strAccount = AccountFromValue(request.params[2]); // Construct using pay-to-script-hash: - CScript inner = _createmultisig_redeemScript(request.params); + CScript inner = _createmultisig_redeemScript(pwallet, request.params); CScriptID innerID(inner); - pwalletMain->AddCScript(inner); + pwallet->AddCScript(inner); - pwalletMain->SetAddressBook(innerID, strAccount, "send"); + pwallet->SetAddressBook(innerID, strAccount, "send"); return CBitcoinAddress(innerID).ToString(); } class Witnessifier : public boost::static_visitor<bool> { public: + CWallet * const pwallet; CScriptID result; + Witnessifier(CWallet *_pwallet) : pwallet(_pwallet) {} + bool operator()(const CNoDestination &dest) const { return false; } bool operator()(const CKeyID &keyID) { CPubKey pubkey; - if (pwalletMain) { + if (pwallet) { CScript basescript = GetScriptForDestination(keyID); isminetype typ; - typ = IsMine(*pwalletMain, basescript, SIGVERSION_WITNESS_V0); + typ = IsMine(*pwallet, basescript, SIGVERSION_WITNESS_V0); if (typ != ISMINE_SPENDABLE && typ != ISMINE_WATCH_SOLVABLE) return false; CScript witscript = GetScriptForWitness(basescript); - pwalletMain->AddCScript(witscript); + pwallet->AddCScript(witscript); result = CScriptID(witscript); return true; } @@ -1048,7 +1109,7 @@ public: bool operator()(const CScriptID &scriptID) { CScript subscript; - if (pwalletMain && pwalletMain->GetCScript(scriptID, subscript)) { + if (pwallet && pwallet->GetCScript(scriptID, subscript)) { int witnessversion; std::vector<unsigned char> witprog; if (subscript.IsWitnessProgram(witnessversion, witprog)) { @@ -1056,11 +1117,11 @@ public: return true; } isminetype typ; - typ = IsMine(*pwalletMain, subscript, SIGVERSION_WITNESS_V0); + typ = IsMine(*pwallet, subscript, SIGVERSION_WITNESS_V0); if (typ != ISMINE_SPENDABLE && typ != ISMINE_WATCH_SOLVABLE) return false; CScript witscript = GetScriptForWitness(subscript); - pwalletMain->AddCScript(witscript); + pwallet->AddCScript(witscript); result = CScriptID(witscript); return true; } @@ -1070,12 +1131,14 @@ public: UniValue addwitnessaddress(const JSONRPCRequest& request) { - if (!EnsureWalletIsAvailable(request.fHelp)) + CWallet * const pwallet = GetWalletForJSONRPCRequest(request); + if (!EnsureWalletIsAvailable(pwallet, request.fHelp)) { return NullUniValue; + } if (request.fHelp || request.params.size() < 1 || request.params.size() > 1) { - string msg = "addwitnessaddress \"address\"\n" + std::string msg = "addwitnessaddress \"address\"\n" "\nAdd a witness address for a script (with pubkey or redeemscript known).\n" "It returns the witness script.\n" @@ -1086,7 +1149,7 @@ UniValue addwitnessaddress(const JSONRPCRequest& request) "\"witnessaddress\", (string) The value of the new address (P2SH of witness script).\n" "}\n" ; - throw runtime_error(msg); + throw std::runtime_error(msg); } { @@ -1100,14 +1163,14 @@ UniValue addwitnessaddress(const JSONRPCRequest& request) if (!address.IsValid()) throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid Bitcoin address"); - Witnessifier w; + Witnessifier w(pwallet); CTxDestination dest = address.Get(); bool ret = boost::apply_visitor(w, dest); if (!ret) { throw JSONRPCError(RPC_WALLET_ERROR, "Public key or redeemscript not known to wallet, or the key is uncompressed"); } - pwalletMain->SetAddressBook(w.result, "", "receive"); + pwallet->SetAddressBook(w.result, "", "receive"); return CBitcoinAddress(w.result).ToString(); } @@ -1116,7 +1179,7 @@ struct tallyitem { CAmount nAmount; int nConf; - vector<uint256> txids; + std::vector<uint256> txids; bool fIsWatchonly; tallyitem() { @@ -1126,7 +1189,7 @@ struct tallyitem } }; -UniValue ListReceived(const UniValue& params, bool fByAccounts) +UniValue ListReceived(CWallet * const pwallet, const UniValue& params, bool fByAccounts) { // Minimum confirmations int nMinDepth = 1; @@ -1144,10 +1207,9 @@ UniValue ListReceived(const UniValue& params, bool fByAccounts) filter = filter | ISMINE_WATCH_ONLY; // Tally - map<CBitcoinAddress, tallyitem> mapTally; - for (map<uint256, CWalletTx>::iterator it = pwalletMain->mapWallet.begin(); it != pwalletMain->mapWallet.end(); ++it) - { - const CWalletTx& wtx = (*it).second; + std::map<CBitcoinAddress, tallyitem> mapTally; + for (const std::pair<uint256, CWalletTx>& pairWtx : pwallet->mapWallet) { + const CWalletTx& wtx = pairWtx.second; if (wtx.IsCoinBase() || !CheckFinalTx(*wtx.tx)) continue; @@ -1162,13 +1224,13 @@ UniValue ListReceived(const UniValue& params, bool fByAccounts) if (!ExtractDestination(txout.scriptPubKey, address)) continue; - isminefilter mine = IsMine(*pwalletMain, address); + isminefilter mine = IsMine(*pwallet, address); if(!(mine & filter)) continue; tallyitem& item = mapTally[address]; item.nAmount += txout.nValue; - item.nConf = min(item.nConf, nDepth); + item.nConf = std::min(item.nConf, nDepth); item.txids.push_back(wtx.GetHash()); if (mine & ISMINE_WATCH_ONLY) item.fIsWatchonly = true; @@ -1177,12 +1239,11 @@ UniValue ListReceived(const UniValue& params, bool fByAccounts) // Reply UniValue ret(UniValue::VARR); - map<string, tallyitem> mapAccountTally; - BOOST_FOREACH(const PAIRTYPE(CBitcoinAddress, CAddressBookData)& item, pwalletMain->mapAddressBook) - { + std::map<std::string, tallyitem> mapAccountTally; + for (const std::pair<CBitcoinAddress, CAddressBookData>& item : pwallet->mapAddressBook) { const CBitcoinAddress& address = item.first; - const string& strAccount = item.second.name; - map<CBitcoinAddress, tallyitem>::iterator it = mapTally.find(address); + const std::string& strAccount = item.second.name; + std::map<CBitcoinAddress, tallyitem>::iterator it = mapTally.find(address); if (it == mapTally.end() && !fIncludeEmpty) continue; @@ -1200,7 +1261,7 @@ UniValue ListReceived(const UniValue& params, bool fByAccounts) { tallyitem& _item = mapAccountTally[strAccount]; _item.nAmount += nAmount; - _item.nConf = min(_item.nConf, nConf); + _item.nConf = std::min(_item.nConf, nConf); _item.fIsWatchonly = fIsWatchonly; } else @@ -1229,7 +1290,7 @@ UniValue ListReceived(const UniValue& params, bool fByAccounts) if (fByAccounts) { - for (map<string, tallyitem>::iterator it = mapAccountTally.begin(); it != mapAccountTally.end(); ++it) + for (std::map<std::string, tallyitem>::iterator it = mapAccountTally.begin(); it != mapAccountTally.end(); ++it) { CAmount nAmount = (*it).second.nAmount; int nConf = (*it).second.nConf; @@ -1248,17 +1309,19 @@ UniValue ListReceived(const UniValue& params, bool fByAccounts) UniValue listreceivedbyaddress(const JSONRPCRequest& request) { - if (!EnsureWalletIsAvailable(request.fHelp)) + CWallet * const pwallet = GetWalletForJSONRPCRequest(request); + if (!EnsureWalletIsAvailable(pwallet, request.fHelp)) { return NullUniValue; + } if (request.fHelp || request.params.size() > 3) - throw runtime_error( - "listreceivedbyaddress ( minconf includeempty includeWatchonly)\n" + throw std::runtime_error( + "listreceivedbyaddress ( minconf include_empty include_watchonly)\n" "\nList balances by receiving address.\n" "\nArguments:\n" - "1. minconf (numeric, optional, default=1) The minimum number of confirmations before payments are included.\n" - "2. includeempty (bool, optional, default=false) Whether to include addresses that haven't received any payments.\n" - "3. includeWatchonly (bool, optional, default=false) Whether to include watchonly addresses (see 'importaddress').\n" + "1. minconf (numeric, optional, default=1) The minimum number of confirmations before payments are included.\n" + "2. include_empty (bool, optional, default=false) Whether to include addresses that haven't received any payments.\n" + "3. include_watchonly (bool, optional, default=false) Whether to include watch-only addresses (see 'importaddress').\n" "\nResult:\n" "[\n" @@ -1268,7 +1331,11 @@ UniValue listreceivedbyaddress(const JSONRPCRequest& request) " \"account\" : \"accountname\", (string) DEPRECATED. The account of the receiving address. The default account is \"\".\n" " \"amount\" : x.xxx, (numeric) The total amount in " + CURRENCY_UNIT + " received by the address\n" " \"confirmations\" : n, (numeric) The number of confirmations of the most recent transaction included\n" - " \"label\" : \"label\" (string) A comment for the address/transaction, if any\n" + " \"label\" : \"label\", (string) A comment for the address/transaction, if any\n" + " \"txids\": [\n" + " n, (numeric) The ids of transactions received with the address \n" + " ...\n" + " ]\n" " }\n" " ,...\n" "]\n" @@ -1279,24 +1346,26 @@ UniValue listreceivedbyaddress(const JSONRPCRequest& request) + HelpExampleRpc("listreceivedbyaddress", "6, true, true") ); - LOCK2(cs_main, pwalletMain->cs_wallet); + LOCK2(cs_main, pwallet->cs_wallet); - return ListReceived(request.params, false); + return ListReceived(pwallet, request.params, false); } UniValue listreceivedbyaccount(const JSONRPCRequest& request) { - if (!EnsureWalletIsAvailable(request.fHelp)) + CWallet * const pwallet = GetWalletForJSONRPCRequest(request); + if (!EnsureWalletIsAvailable(pwallet, request.fHelp)) { return NullUniValue; + } if (request.fHelp || request.params.size() > 3) - throw runtime_error( - "listreceivedbyaccount ( minconf includeempty includeWatchonly)\n" + throw std::runtime_error( + "listreceivedbyaccount ( minconf include_empty include_watchonly)\n" "\nDEPRECATED. List balances by account.\n" "\nArguments:\n" - "1. minconf (numeric, optional, default=1) The minimum number of confirmations before payments are included.\n" - "2. includeempty (bool, optional, default=false) Whether to include accounts that haven't received any payments.\n" - "3. includeWatchonly (bool, optional, default=false) Whether to include watchonly addresses (see 'importaddress').\n" + "1. minconf (numeric, optional, default=1) The minimum number of confirmations before payments are included.\n" + "2. include_empty (bool, optional, default=false) Whether to include accounts that haven't received any payments.\n" + "3. include_watchonly (bool, optional, default=false) Whether to include watch-only addresses (see 'importaddress').\n" "\nResult:\n" "[\n" @@ -1316,9 +1385,9 @@ UniValue listreceivedbyaccount(const JSONRPCRequest& request) + HelpExampleRpc("listreceivedbyaccount", "6, true, true") ); - LOCK2(cs_main, pwalletMain->cs_wallet); + LOCK2(cs_main, pwallet->cs_wallet); - return ListReceived(request.params, true); + return ListReceived(pwallet, request.params, true); } static void MaybePushAddress(UniValue & entry, const CTxDestination &dest) @@ -1328,16 +1397,16 @@ static void MaybePushAddress(UniValue & entry, const CTxDestination &dest) entry.push_back(Pair("address", addr.ToString())); } -void ListTransactions(const CWalletTx& wtx, const string& strAccount, int nMinDepth, bool fLong, UniValue& ret, const isminefilter& filter) +void ListTransactions(CWallet* const pwallet, const CWalletTx& wtx, const std::string& strAccount, int nMinDepth, bool fLong, UniValue& ret, const isminefilter& filter) { CAmount nFee; - string strSentAccount; - list<COutputEntry> listReceived; - list<COutputEntry> listSent; + std::string strSentAccount; + std::list<COutputEntry> listReceived; + std::list<COutputEntry> listSent; wtx.GetAmounts(listReceived, listSent, nFee, strSentAccount, filter); - bool fAllAccounts = (strAccount == string("*")); + bool fAllAccounts = (strAccount == std::string("*")); bool involvesWatchonly = wtx.IsFromMe(ISMINE_WATCH_ONLY); // Sent @@ -1346,14 +1415,16 @@ void ListTransactions(const CWalletTx& wtx, const string& strAccount, int nMinDe BOOST_FOREACH(const COutputEntry& s, listSent) { UniValue entry(UniValue::VOBJ); - if(involvesWatchonly || (::IsMine(*pwalletMain, s.destination) & ISMINE_WATCH_ONLY)) + if (involvesWatchonly || (::IsMine(*pwallet, s.destination) & ISMINE_WATCH_ONLY)) { entry.push_back(Pair("involvesWatchonly", true)); + } entry.push_back(Pair("account", strSentAccount)); MaybePushAddress(entry, s.destination); entry.push_back(Pair("category", "send")); entry.push_back(Pair("amount", ValueFromAmount(-s.amount))); - if (pwalletMain->mapAddressBook.count(s.destination)) - entry.push_back(Pair("label", pwalletMain->mapAddressBook[s.destination].name)); + if (pwallet->mapAddressBook.count(s.destination)) { + entry.push_back(Pair("label", pwallet->mapAddressBook[s.destination].name)); + } entry.push_back(Pair("vout", s.vout)); entry.push_back(Pair("fee", ValueFromAmount(-nFee))); if (fLong) @@ -1368,14 +1439,16 @@ void ListTransactions(const CWalletTx& wtx, const string& strAccount, int nMinDe { BOOST_FOREACH(const COutputEntry& r, listReceived) { - string account; - if (pwalletMain->mapAddressBook.count(r.destination)) - account = pwalletMain->mapAddressBook[r.destination].name; + std::string account; + if (pwallet->mapAddressBook.count(r.destination)) { + account = pwallet->mapAddressBook[r.destination].name; + } if (fAllAccounts || (account == strAccount)) { UniValue entry(UniValue::VOBJ); - if(involvesWatchonly || (::IsMine(*pwalletMain, r.destination) & ISMINE_WATCH_ONLY)) + if (involvesWatchonly || (::IsMine(*pwallet, r.destination) & ISMINE_WATCH_ONLY)) { entry.push_back(Pair("involvesWatchonly", true)); + } entry.push_back(Pair("account", account)); MaybePushAddress(entry, r.destination); if (wtx.IsCoinBase()) @@ -1392,8 +1465,9 @@ void ListTransactions(const CWalletTx& wtx, const string& strAccount, int nMinDe entry.push_back(Pair("category", "receive")); } entry.push_back(Pair("amount", ValueFromAmount(r.amount))); - if (pwalletMain->mapAddressBook.count(r.destination)) + if (pwallet->mapAddressBook.count(r.destination)) { entry.push_back(Pair("label", account)); + } entry.push_back(Pair("vout", r.vout)); if (fLong) WalletTxToJSON(wtx, entry); @@ -1403,9 +1477,9 @@ void ListTransactions(const CWalletTx& wtx, const string& strAccount, int nMinDe } } -void AcentryToJSON(const CAccountingEntry& acentry, const string& strAccount, UniValue& ret) +void AcentryToJSON(const CAccountingEntry& acentry, const std::string& strAccount, UniValue& ret) { - bool fAllAccounts = (strAccount == string("*")); + bool fAllAccounts = (strAccount == std::string("*")); if (fAllAccounts || acentry.strAccount == strAccount) { @@ -1422,24 +1496,26 @@ void AcentryToJSON(const CAccountingEntry& acentry, const string& strAccount, Un UniValue listtransactions(const JSONRPCRequest& request) { - if (!EnsureWalletIsAvailable(request.fHelp)) + CWallet * const pwallet = GetWalletForJSONRPCRequest(request); + if (!EnsureWalletIsAvailable(pwallet, request.fHelp)) { return NullUniValue; + } if (request.fHelp || request.params.size() > 4) - throw runtime_error( - "listtransactions ( \"account\" count from includeWatchonly)\n" + throw std::runtime_error( + "listtransactions ( \"account\" count skip include_watchonly)\n" "\nReturns up to 'count' most recent transactions skipping the first 'from' transactions for account 'account'.\n" "\nArguments:\n" "1. \"account\" (string, optional) DEPRECATED. The account name. Should be \"*\".\n" "2. count (numeric, optional, default=10) The number of transactions to return\n" - "3. from (numeric, optional, default=0) The number of transactions to skip\n" - "4. includeWatchonly (bool, optional, default=false) Include transactions to watchonly addresses (see 'importaddress')\n" + "3. skip (numeric, optional, default=0) The number of transactions to skip\n" + "4. include_watchonly (bool, optional, default=false) Include transactions to watch-only addresses (see 'importaddress')\n" "\nResult:\n" "[\n" " {\n" " \"account\":\"accountname\", (string) DEPRECATED. The account name associated with the transaction. \n" " It will be \"\" for the default account.\n" - " \"address\":\"bitcoinaddress\", (string) The bitcoin address of the transaction. Not present for \n" + " \"address\":\"address\", (string) The bitcoin address of the transaction. Not present for \n" " move transactions (category = move).\n" " \"category\":\"send|receive|move\", (string) The transaction category. 'move' is a local (off blockchain)\n" " transaction between accounts, and not associated with an address,\n" @@ -1448,14 +1524,14 @@ UniValue listtransactions(const JSONRPCRequest& request) " \"amount\": x.xxx, (numeric) The amount in " + CURRENCY_UNIT + ". This is negative for the 'send' category, and for the\n" " 'move' category for moves outbound. It is positive for the 'receive' category,\n" " and for the 'move' category for inbound funds.\n" + " \"label\": \"label\", (string) A comment for the address/transaction, if any\n" " \"vout\": n, (numeric) the vout value\n" " \"fee\": x.xxx, (numeric) The amount of the fee in " + CURRENCY_UNIT + ". This is negative and only available for the \n" " 'send' category of transactions.\n" - " \"abandoned\": xxx (bool) 'true' if the transaction has been abandoned (inputs are respendable).\n" " \"confirmations\": n, (numeric) The number of confirmations for the transaction. Available for 'send' and \n" " 'receive' category of transactions. Negative confirmations indicate the\n" " transaction conflicts with the block chain\n" - " \"trusted\": xxx (bool) Whether we consider the outputs of this unconfirmed transaction safe to spend.\n" + " \"trusted\": xxx, (bool) Whether we consider the outputs of this unconfirmed transaction safe to spend.\n" " \"blockhash\": \"hashvalue\", (string) The block hash containing the transaction. Available for 'send' and 'receive'\n" " category of transactions.\n" " \"blockindex\": n, (numeric) The index of the transaction in the block that includes it. Available for 'send' and 'receive'\n" @@ -1466,12 +1542,13 @@ UniValue listtransactions(const JSONRPCRequest& request) " \"timereceived\": xxx, (numeric) The time received in seconds since epoch (midnight Jan 1 1970 GMT). Available \n" " for 'send' and 'receive' category of transactions.\n" " \"comment\": \"...\", (string) If a comment is associated with the transaction.\n" - " \"label\": \"label\" (string) A comment for the address/transaction, if any\n" - " \"otheraccount\": \"accountname\", (string) For the 'move' category of transactions, the account the funds came \n" + " \"otheraccount\": \"accountname\", (string) DEPRECATED. For the 'move' category of transactions, the account the funds came \n" " from (for receiving funds, positive amounts), or went to (for sending funds,\n" " negative amounts).\n" - " \"bip125-replaceable\": \"yes|no|unknown\" (string) Whether this transaction could be replaced due to BIP125 (replace-by-fee);\n" + " \"bip125-replaceable\": \"yes|no|unknown\", (string) Whether this transaction could be replaced due to BIP125 (replace-by-fee);\n" " may be unknown for unconfirmed transactions not in the mempool\n" + " \"abandoned\": xxx (bool) 'true' if the transaction has been abandoned (inputs are respendable). Only available for the \n" + " 'send' category of transactions.\n" " }\n" "]\n" @@ -1484,9 +1561,9 @@ UniValue listtransactions(const JSONRPCRequest& request) + HelpExampleRpc("listtransactions", "\"*\", 20, 100") ); - LOCK2(cs_main, pwalletMain->cs_wallet); + LOCK2(cs_main, pwallet->cs_wallet); - string strAccount = "*"; + std::string strAccount = "*"; if (request.params.size() > 0) strAccount = request.params[0].get_str(); int nCount = 10; @@ -1507,14 +1584,14 @@ UniValue listtransactions(const JSONRPCRequest& request) UniValue ret(UniValue::VARR); - const CWallet::TxItems & txOrdered = pwalletMain->wtxOrdered; + const CWallet::TxItems & txOrdered = pwallet->wtxOrdered; // iterate backwards until we have nCount items to return: for (CWallet::TxItems::const_reverse_iterator it = txOrdered.rbegin(); it != txOrdered.rend(); ++it) { CWalletTx *const pwtx = (*it).second.first; if (pwtx != 0) - ListTransactions(*pwtx, strAccount, 0, true, ret, filter); + ListTransactions(pwallet, *pwtx, strAccount, 0, true, ret, filter); CAccountingEntry *const pacentry = (*it).second.second; if (pacentry != 0) AcentryToJSON(*pacentry, strAccount, ret); @@ -1528,11 +1605,11 @@ UniValue listtransactions(const JSONRPCRequest& request) if ((nFrom + nCount) > (int)ret.size()) nCount = ret.size() - nFrom; - vector<UniValue> arrTmp = ret.getValues(); + std::vector<UniValue> arrTmp = ret.getValues(); - vector<UniValue>::iterator first = arrTmp.begin(); + std::vector<UniValue>::iterator first = arrTmp.begin(); std::advance(first, nFrom); - vector<UniValue>::iterator last = arrTmp.begin(); + std::vector<UniValue>::iterator last = arrTmp.begin(); std::advance(last, nFrom+nCount); if (last != arrTmp.end()) arrTmp.erase(last, arrTmp.end()); @@ -1549,16 +1626,18 @@ UniValue listtransactions(const JSONRPCRequest& request) UniValue listaccounts(const JSONRPCRequest& request) { - if (!EnsureWalletIsAvailable(request.fHelp)) + CWallet * const pwallet = GetWalletForJSONRPCRequest(request); + if (!EnsureWalletIsAvailable(pwallet, request.fHelp)) { return NullUniValue; + } if (request.fHelp || request.params.size() > 2) - throw runtime_error( - "listaccounts ( minconf includeWatchonly)\n" + throw std::runtime_error( + "listaccounts ( minconf include_watchonly)\n" "\nDEPRECATED. Returns Object that has account names as keys, account balances as values.\n" "\nArguments:\n" - "1. minconf (numeric, optional, default=1) Only include transactions with at least this many confirmations\n" - "2. includeWatchonly (bool, optional, default=false) Include balances in watchonly addresses (see 'importaddress')\n" + "1. minconf (numeric, optional, default=1) Only include transactions with at least this many confirmations\n" + "2. include_watchonly (bool, optional, default=false) Include balances in watch-only addresses (see 'importaddress')\n" "\nResult:\n" "{ (json object where keys are account names, and values are numeric balances\n" " \"account\": x.xxx, (numeric) The property name is the account name, and the value is the total balance for the account.\n" @@ -1575,7 +1654,7 @@ UniValue listaccounts(const JSONRPCRequest& request) + HelpExampleRpc("listaccounts", "6") ); - LOCK2(cs_main, pwalletMain->cs_wallet); + LOCK2(cs_main, pwallet->cs_wallet); int nMinDepth = 1; if (request.params.size() > 0) @@ -1585,19 +1664,19 @@ UniValue listaccounts(const JSONRPCRequest& request) if(request.params[1].get_bool()) includeWatchonly = includeWatchonly | ISMINE_WATCH_ONLY; - map<string, CAmount> mapAccountBalances; - BOOST_FOREACH(const PAIRTYPE(CTxDestination, CAddressBookData)& entry, pwalletMain->mapAddressBook) { - if (IsMine(*pwalletMain, entry.first) & includeWatchonly) // This address belongs to me + std::map<std::string, CAmount> mapAccountBalances; + for (const std::pair<CTxDestination, CAddressBookData>& entry : pwallet->mapAddressBook) { + if (IsMine(*pwallet, entry.first) & includeWatchonly) { // This address belongs to me mapAccountBalances[entry.second.name] = 0; + } } - for (map<uint256, CWalletTx>::iterator it = pwalletMain->mapWallet.begin(); it != pwalletMain->mapWallet.end(); ++it) - { - const CWalletTx& wtx = (*it).second; + for (const std::pair<uint256, CWalletTx>& pairWtx : pwallet->mapWallet) { + const CWalletTx& wtx = pairWtx.second; CAmount nFee; - string strSentAccount; - list<COutputEntry> listReceived; - list<COutputEntry> listSent; + std::string strSentAccount; + std::list<COutputEntry> listReceived; + std::list<COutputEntry> listSent; int nDepth = wtx.GetDepthInMainChain(); if (wtx.GetBlocksToMaturity() > 0 || nDepth < 0) continue; @@ -1608,19 +1687,20 @@ UniValue listaccounts(const JSONRPCRequest& request) if (nDepth >= nMinDepth) { BOOST_FOREACH(const COutputEntry& r, listReceived) - if (pwalletMain->mapAddressBook.count(r.destination)) - mapAccountBalances[pwalletMain->mapAddressBook[r.destination].name] += r.amount; + if (pwallet->mapAddressBook.count(r.destination)) { + mapAccountBalances[pwallet->mapAddressBook[r.destination].name] += r.amount; + } else mapAccountBalances[""] += r.amount; } } - const list<CAccountingEntry> & acentries = pwalletMain->laccentries; + const std::list<CAccountingEntry>& acentries = pwallet->laccentries; BOOST_FOREACH(const CAccountingEntry& entry, acentries) mapAccountBalances[entry.strAccount] += entry.nCreditDebit; UniValue ret(UniValue::VOBJ); - BOOST_FOREACH(const PAIRTYPE(string, CAmount)& accountBalance, mapAccountBalances) { + BOOST_FOREACH(const PAIRTYPE(std::string, CAmount)& accountBalance, mapAccountBalances) { ret.push_back(Pair(accountBalance.first, ValueFromAmount(accountBalance.second))); } return ret; @@ -1628,22 +1708,24 @@ UniValue listaccounts(const JSONRPCRequest& request) UniValue listsinceblock(const JSONRPCRequest& request) { - if (!EnsureWalletIsAvailable(request.fHelp)) + CWallet * const pwallet = GetWalletForJSONRPCRequest(request); + if (!EnsureWalletIsAvailable(pwallet, request.fHelp)) { return NullUniValue; + } if (request.fHelp) - throw runtime_error( - "listsinceblock ( \"blockhash\" target-confirmations includeWatchonly)\n" + throw std::runtime_error( + "listsinceblock ( \"blockhash\" target_confirmations include_watchonly)\n" "\nGet all transactions in blocks since block [blockhash], or all transactions if omitted\n" "\nArguments:\n" - "1. \"blockhash\" (string, optional) The block hash to list transactions since\n" - "2. target-confirmations: (numeric, optional) The confirmations required, must be 1 or more\n" - "3. includeWatchonly: (bool, optional, default=false) Include transactions to watchonly addresses (see 'importaddress')" + "1. \"blockhash\" (string, optional) The block hash to list transactions since\n" + "2. target_confirmations: (numeric, optional) The confirmations required, must be 1 or more\n" + "3. include_watchonly: (bool, optional, default=false) Include transactions to watch-only addresses (see 'importaddress')" "\nResult:\n" "{\n" " \"transactions\": [\n" " \"account\":\"accountname\", (string) DEPRECATED. The account name associated with the transaction. Will be \"\" for the default account.\n" - " \"address\":\"bitcoinaddress\", (string) The bitcoin address of the transaction. Not present for move transactions (category = move).\n" + " \"address\":\"address\", (string) The bitcoin address of the transaction. Not present for move transactions (category = move).\n" " \"category\":\"send|receive\", (string) The transaction category. 'send' has negative amounts, 'receive' has positive amounts.\n" " \"amount\": x.xxx, (numeric) The amount in " + CURRENCY_UNIT + ". This is negative for the 'send' category, and for the 'move' category for moves \n" " outbound. It is positive for the 'receive' category, and for the 'move' category for inbound funds.\n" @@ -1657,6 +1739,9 @@ UniValue listsinceblock(const JSONRPCRequest& request) " \"txid\": \"transactionid\", (string) The transaction id. Available for 'send' and 'receive' category of transactions.\n" " \"time\": xxx, (numeric) The transaction time in seconds since epoch (Jan 1 1970 GMT).\n" " \"timereceived\": xxx, (numeric) The time received in seconds since epoch (Jan 1 1970 GMT). Available for 'send' and 'receive' category of transactions.\n" + " \"bip125-replaceable\": \"yes|no|unknown\", (string) Whether this transaction could be replaced due to BIP125 (replace-by-fee);\n" + " may be unknown for unconfirmed transactions not in the mempool\n" + " \"abandoned\": xxx, (bool) 'true' if the transaction has been abandoned (inputs are respendable). Only available for the 'send' category of transactions.\n" " \"comment\": \"...\", (string) If a comment is associated with the transaction.\n" " \"label\" : \"label\" (string) A comment for the address/transaction, if any\n" " \"to\": \"...\", (string) If a comment to is associated with the transaction.\n" @@ -1669,9 +1754,9 @@ UniValue listsinceblock(const JSONRPCRequest& request) + HelpExampleRpc("listsinceblock", "\"000000000000000bacf66f7497b7dc45ef753ee9a7d38571037cdb1a57f663ad\", 6") ); - LOCK2(cs_main, pwalletMain->cs_wallet); + LOCK2(cs_main, pwallet->cs_wallet); - CBlockIndex *pindex = NULL; + const CBlockIndex *pindex = NULL; int target_confirms = 1; isminefilter filter = ISMINE_SPENDABLE; @@ -1682,7 +1767,16 @@ UniValue listsinceblock(const JSONRPCRequest& request) blockId.SetHex(request.params[0].get_str()); BlockMap::iterator it = mapBlockIndex.find(blockId); if (it != mapBlockIndex.end()) + { pindex = it->second; + if (chainActive[pindex->nHeight] != pindex) + { + // the block being asked for is a part of a deactivated chain; + // we don't want to depend on its perceived height in the block + // chain, we want to instead use the last common ancestor + pindex = chainActive.FindFork(pindex); + } + } } if (request.params.size() > 1) @@ -1693,20 +1787,20 @@ UniValue listsinceblock(const JSONRPCRequest& request) throw JSONRPCError(RPC_INVALID_PARAMETER, "Invalid parameter"); } - if(request.params.size() > 2) - if(request.params[2].get_bool()) - filter = filter | ISMINE_WATCH_ONLY; + if (request.params.size() > 2 && request.params[2].get_bool()) + { + filter = filter | ISMINE_WATCH_ONLY; + } int depth = pindex ? (1 + chainActive.Height() - pindex->nHeight) : -1; UniValue transactions(UniValue::VARR); - for (map<uint256, CWalletTx>::iterator it = pwalletMain->mapWallet.begin(); it != pwalletMain->mapWallet.end(); it++) - { - CWalletTx tx = (*it).second; + for (const std::pair<uint256, CWalletTx>& pairWtx : pwallet->mapWallet) { + CWalletTx tx = pairWtx.second; if (depth == -1 || tx.GetDepthInMainChain() < depth) - ListTransactions(tx, "*", 0, true, transactions, filter); + ListTransactions(pwallet, tx, "*", 0, true, transactions, filter); } CBlockIndex *pblockLast = chainActive[chainActive.Height() + 1 - target_confirms]; @@ -1721,19 +1815,23 @@ UniValue listsinceblock(const JSONRPCRequest& request) UniValue gettransaction(const JSONRPCRequest& request) { - if (!EnsureWalletIsAvailable(request.fHelp)) + CWallet * const pwallet = GetWalletForJSONRPCRequest(request); + if (!EnsureWalletIsAvailable(pwallet, request.fHelp)) { return NullUniValue; + } if (request.fHelp || request.params.size() < 1 || request.params.size() > 2) - throw runtime_error( - "gettransaction \"txid\" ( includeWatchonly )\n" + throw std::runtime_error( + "gettransaction \"txid\" ( include_watchonly )\n" "\nGet detailed information about in-wallet transaction <txid>\n" "\nArguments:\n" - "1. \"txid\" (string, required) The transaction id\n" - "2. \"includeWatchonly\" (bool, optional, default=false) Whether to include watchonly addresses in balance calculation and details[]\n" + "1. \"txid\" (string, required) The transaction id\n" + "2. \"include_watchonly\" (bool, optional, default=false) Whether to include watch-only addresses in balance calculation and details[]\n" "\nResult:\n" "{\n" " \"amount\" : x.xxx, (numeric) The transaction amount in " + CURRENCY_UNIT + "\n" + " \"fee\": x.xxx, (numeric) The amount of the fee in " + CURRENCY_UNIT + ". This is negative and only available for the \n" + " 'send' category of transactions.\n" " \"confirmations\" : n, (numeric) The number of confirmations\n" " \"blockhash\" : \"hash\", (string) The block hash\n" " \"blockindex\" : xx, (numeric) The index of the transaction in the block that includes it\n" @@ -1741,16 +1839,20 @@ UniValue gettransaction(const JSONRPCRequest& request) " \"txid\" : \"transactionid\", (string) The transaction id.\n" " \"time\" : ttt, (numeric) The transaction time in seconds since epoch (1 Jan 1970 GMT)\n" " \"timereceived\" : ttt, (numeric) The time received in seconds since epoch (1 Jan 1970 GMT)\n" - " \"bip125-replaceable\": \"yes|no|unknown\" (string) Whether this transaction could be replaced due to BIP125 (replace-by-fee);\n" + " \"bip125-replaceable\": \"yes|no|unknown\", (string) Whether this transaction could be replaced due to BIP125 (replace-by-fee);\n" " may be unknown for unconfirmed transactions not in the mempool\n" " \"details\" : [\n" " {\n" - " \"account\" : \"accountname\", (string) DEPRECATED. The account name involved in the transaction, can be \"\" for the default account.\n" - " \"address\" : \"bitcoinaddress\", (string) The bitcoin address involved in the transaction\n" + " \"account\" : \"accountname\", (string) DEPRECATED. The account name involved in the transaction, can be \"\" for the default account.\n" + " \"address\" : \"address\", (string) The bitcoin address involved in the transaction\n" " \"category\" : \"send|receive\", (string) The category, either 'send' or 'receive'\n" " \"amount\" : x.xxx, (numeric) The amount in " + CURRENCY_UNIT + "\n" " \"label\" : \"label\", (string) A comment for the address/transaction, if any\n" " \"vout\" : n, (numeric) the vout value\n" + " \"fee\": x.xxx, (numeric) The amount of the fee in " + CURRENCY_UNIT + ". This is negative and only available for the \n" + " 'send' category of transactions.\n" + " \"abandoned\": xxx (bool) 'true' if the transaction has been abandoned (inputs are respendable). Only available for the \n" + " 'send' category of transactions.\n" " }\n" " ,...\n" " ],\n" @@ -1763,7 +1865,7 @@ UniValue gettransaction(const JSONRPCRequest& request) + HelpExampleRpc("gettransaction", "\"1075db55d416d3ca199f55b6084e2115b9345e16c5cf302fc80e9d5fbf5d48d\"") ); - LOCK2(cs_main, pwalletMain->cs_wallet); + LOCK2(cs_main, pwallet->cs_wallet); uint256 hash; hash.SetHex(request.params[0].get_str()); @@ -1774,9 +1876,10 @@ UniValue gettransaction(const JSONRPCRequest& request) filter = filter | ISMINE_WATCH_ONLY; UniValue entry(UniValue::VOBJ); - if (!pwalletMain->mapWallet.count(hash)) + if (!pwallet->mapWallet.count(hash)) { throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid or non-wallet transaction id"); - const CWalletTx& wtx = pwalletMain->mapWallet[hash]; + } + const CWalletTx& wtx = pwallet->mapWallet[hash]; CAmount nCredit = wtx.GetCredit(filter); CAmount nDebit = wtx.GetDebit(filter); @@ -1790,10 +1893,10 @@ UniValue gettransaction(const JSONRPCRequest& request) WalletTxToJSON(wtx, entry); UniValue details(UniValue::VARR); - ListTransactions(wtx, "*", 0, false, details, filter); + ListTransactions(pwallet, wtx, "*", 0, false, details, filter); entry.push_back(Pair("details", details)); - string strHex = EncodeHexTx(static_cast<CTransaction>(wtx), RPCSerializationFlags()); + std::string strHex = EncodeHexTx(static_cast<CTransaction>(wtx), RPCSerializationFlags()); entry.push_back(Pair("hex", strHex)); return entry; @@ -1801,11 +1904,13 @@ UniValue gettransaction(const JSONRPCRequest& request) UniValue abandontransaction(const JSONRPCRequest& request) { - if (!EnsureWalletIsAvailable(request.fHelp)) + CWallet * const pwallet = GetWalletForJSONRPCRequest(request); + if (!EnsureWalletIsAvailable(pwallet, request.fHelp)) { return NullUniValue; + } if (request.fHelp || request.params.size() != 1) - throw runtime_error( + throw std::runtime_error( "abandontransaction \"txid\"\n" "\nMark in-wallet transaction <txid> as abandoned\n" "This will mark this transaction and all its in-wallet descendants as abandoned which will allow\n" @@ -1820,15 +1925,17 @@ UniValue abandontransaction(const JSONRPCRequest& request) + HelpExampleRpc("abandontransaction", "\"1075db55d416d3ca199f55b6084e2115b9345e16c5cf302fc80e9d5fbf5d48d\"") ); - LOCK2(cs_main, pwalletMain->cs_wallet); + LOCK2(cs_main, pwallet->cs_wallet); uint256 hash; hash.SetHex(request.params[0].get_str()); - if (!pwalletMain->mapWallet.count(hash)) + if (!pwallet->mapWallet.count(hash)) { throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid or non-wallet transaction id"); - if (!pwalletMain->AbandonTransaction(hash)) + } + if (!pwallet->AbandonTransaction(hash)) { throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Transaction not eligible for abandonment"); + } return NullUniValue; } @@ -1836,11 +1943,13 @@ UniValue abandontransaction(const JSONRPCRequest& request) UniValue backupwallet(const JSONRPCRequest& request) { - if (!EnsureWalletIsAvailable(request.fHelp)) + CWallet * const pwallet = GetWalletForJSONRPCRequest(request); + if (!EnsureWalletIsAvailable(pwallet, request.fHelp)) { return NullUniValue; + } if (request.fHelp || request.params.size() != 1) - throw runtime_error( + throw std::runtime_error( "backupwallet \"destination\"\n" "\nSafely copies current wallet file to destination, which can be a directory or a path with filename.\n" "\nArguments:\n" @@ -1850,11 +1959,12 @@ UniValue backupwallet(const JSONRPCRequest& request) + HelpExampleRpc("backupwallet", "\"backup.dat\"") ); - LOCK2(cs_main, pwalletMain->cs_wallet); + LOCK2(cs_main, pwallet->cs_wallet); - string strDest = request.params[0].get_str(); - if (!pwalletMain->BackupWallet(strDest)) + std::string strDest = request.params[0].get_str(); + if (!pwallet->BackupWallet(strDest)) { throw JSONRPCError(RPC_WALLET_ERROR, "Error: Wallet backup failed!"); + } return NullUniValue; } @@ -1862,14 +1972,16 @@ UniValue backupwallet(const JSONRPCRequest& request) UniValue keypoolrefill(const JSONRPCRequest& request) { - if (!EnsureWalletIsAvailable(request.fHelp)) + CWallet * const pwallet = GetWalletForJSONRPCRequest(request); + if (!EnsureWalletIsAvailable(pwallet, request.fHelp)) { return NullUniValue; + } if (request.fHelp || request.params.size() > 1) - throw runtime_error( + throw std::runtime_error( "keypoolrefill ( newsize )\n" "\nFills the keypool." - + HelpRequiringPassphrase() + "\n" + + HelpRequiringPassphrase(pwallet) + "\n" "\nArguments\n" "1. newsize (numeric, optional, default=100) The new keypool size\n" "\nExamples:\n" @@ -1877,7 +1989,7 @@ UniValue keypoolrefill(const JSONRPCRequest& request) + HelpExampleRpc("keypoolrefill", "") ); - LOCK2(cs_main, pwalletMain->cs_wallet); + LOCK2(cs_main, pwallet->cs_wallet); // 0 is interpreted by TopUpKeyPool() as the default keypool size given by -keypool unsigned int kpSize = 0; @@ -1887,11 +1999,12 @@ UniValue keypoolrefill(const JSONRPCRequest& request) kpSize = (unsigned int)request.params[0].get_int(); } - EnsureWalletIsUnlocked(); - pwalletMain->TopUpKeyPool(kpSize); + EnsureWalletIsUnlocked(pwallet); + pwallet->TopUpKeyPool(kpSize); - if (pwalletMain->GetKeyPoolSize() < kpSize) + if (pwallet->GetKeyPoolSize() < kpSize) { throw JSONRPCError(RPC_WALLET_ERROR, "Error refreshing keypool."); + } return NullUniValue; } @@ -1899,18 +2012,20 @@ UniValue keypoolrefill(const JSONRPCRequest& request) static void LockWallet(CWallet* pWallet) { - LOCK(cs_nWalletUnlockTime); - nWalletUnlockTime = 0; + LOCK(pWallet->cs_wallet); + pWallet->nRelockTime = 0; pWallet->Lock(); } UniValue walletpassphrase(const JSONRPCRequest& request) { - if (!EnsureWalletIsAvailable(request.fHelp)) + CWallet * const pwallet = GetWalletForJSONRPCRequest(request); + if (!EnsureWalletIsAvailable(pwallet, request.fHelp)) { return NullUniValue; + } - if (pwalletMain->IsCrypted() && (request.fHelp || request.params.size() != 2)) - throw runtime_error( + if (pwallet->IsCrypted() && (request.fHelp || request.params.size() != 2)) { + throw std::runtime_error( "walletpassphrase \"passphrase\" timeout\n" "\nStores the wallet decryption key in memory for 'timeout' seconds.\n" "This is needed prior to performing transactions related to private keys such as sending bitcoins\n" @@ -1928,13 +2043,15 @@ UniValue walletpassphrase(const JSONRPCRequest& request) "\nAs json rpc call\n" + HelpExampleRpc("walletpassphrase", "\"my pass phrase\", 60") ); + } - LOCK2(cs_main, pwalletMain->cs_wallet); + LOCK2(cs_main, pwallet->cs_wallet); if (request.fHelp) return true; - if (!pwalletMain->IsCrypted()) + if (!pwallet->IsCrypted()) { throw JSONRPCError(RPC_WALLET_WRONG_ENC_STATE, "Error: running with an unencrypted wallet, but walletpassphrase was called."); + } // Note that the walletpassphrase is stored in request.params[0] which is not mlock()ed SecureString strWalletPass; @@ -1945,20 +2062,20 @@ UniValue walletpassphrase(const JSONRPCRequest& request) if (strWalletPass.length() > 0) { - if (!pwalletMain->Unlock(strWalletPass)) + if (!pwallet->Unlock(strWalletPass)) { throw JSONRPCError(RPC_WALLET_PASSPHRASE_INCORRECT, "Error: The wallet passphrase entered was incorrect."); + } } else - throw runtime_error( + throw std::runtime_error( "walletpassphrase <passphrase> <timeout>\n" "Stores the wallet decryption key in memory for <timeout> seconds."); - pwalletMain->TopUpKeyPool(); + pwallet->TopUpKeyPool(); int64_t nSleepTime = request.params[1].get_int64(); - LOCK(cs_nWalletUnlockTime); - nWalletUnlockTime = GetTime() + nSleepTime; - RPCRunLater("lockwallet", boost::bind(LockWallet, pwalletMain), nSleepTime); + pwallet->nRelockTime = GetTime() + nSleepTime; + RPCRunLater(strprintf("lockwallet(%s)", pwallet->strWalletFile), boost::bind(LockWallet, pwallet), nSleepTime); return NullUniValue; } @@ -1966,11 +2083,13 @@ UniValue walletpassphrase(const JSONRPCRequest& request) UniValue walletpassphrasechange(const JSONRPCRequest& request) { - if (!EnsureWalletIsAvailable(request.fHelp)) + CWallet * const pwallet = GetWalletForJSONRPCRequest(request); + if (!EnsureWalletIsAvailable(pwallet, request.fHelp)) { return NullUniValue; + } - if (pwalletMain->IsCrypted() && (request.fHelp || request.params.size() != 2)) - throw runtime_error( + if (pwallet->IsCrypted() && (request.fHelp || request.params.size() != 2)) { + throw std::runtime_error( "walletpassphrasechange \"oldpassphrase\" \"newpassphrase\"\n" "\nChanges the wallet passphrase from 'oldpassphrase' to 'newpassphrase'.\n" "\nArguments:\n" @@ -1980,13 +2099,15 @@ UniValue walletpassphrasechange(const JSONRPCRequest& request) + HelpExampleCli("walletpassphrasechange", "\"old one\" \"new one\"") + HelpExampleRpc("walletpassphrasechange", "\"old one\", \"new one\"") ); + } - LOCK2(cs_main, pwalletMain->cs_wallet); + LOCK2(cs_main, pwallet->cs_wallet); if (request.fHelp) return true; - if (!pwalletMain->IsCrypted()) + if (!pwallet->IsCrypted()) { throw JSONRPCError(RPC_WALLET_WRONG_ENC_STATE, "Error: running with an unencrypted wallet, but walletpassphrasechange was called."); + } // TODO: get rid of these .c_str() calls by implementing SecureString::operator=(std::string) // Alternately, find a way to make request.params[0] mlock()'d to begin with. @@ -1999,12 +2120,13 @@ UniValue walletpassphrasechange(const JSONRPCRequest& request) strNewWalletPass = request.params[1].get_str().c_str(); if (strOldWalletPass.length() < 1 || strNewWalletPass.length() < 1) - throw runtime_error( + throw std::runtime_error( "walletpassphrasechange <oldpassphrase> <newpassphrase>\n" "Changes the wallet passphrase from <oldpassphrase> to <newpassphrase>."); - if (!pwalletMain->ChangeWalletPassphrase(strOldWalletPass, strNewWalletPass)) + if (!pwallet->ChangeWalletPassphrase(strOldWalletPass, strNewWalletPass)) { throw JSONRPCError(RPC_WALLET_PASSPHRASE_INCORRECT, "Error: The wallet passphrase entered was incorrect."); + } return NullUniValue; } @@ -2012,11 +2134,13 @@ UniValue walletpassphrasechange(const JSONRPCRequest& request) UniValue walletlock(const JSONRPCRequest& request) { - if (!EnsureWalletIsAvailable(request.fHelp)) + CWallet * const pwallet = GetWalletForJSONRPCRequest(request); + if (!EnsureWalletIsAvailable(pwallet, request.fHelp)) { return NullUniValue; + } - if (pwalletMain->IsCrypted() && (request.fHelp || request.params.size() != 0)) - throw runtime_error( + if (pwallet->IsCrypted() && (request.fHelp || request.params.size() != 0)) { + throw std::runtime_error( "walletlock\n" "\nRemoves the wallet encryption key from memory, locking the wallet.\n" "After calling this method, you will need to call walletpassphrase again\n" @@ -2031,31 +2155,32 @@ UniValue walletlock(const JSONRPCRequest& request) "\nAs json rpc call\n" + HelpExampleRpc("walletlock", "") ); + } - LOCK2(cs_main, pwalletMain->cs_wallet); + LOCK2(cs_main, pwallet->cs_wallet); if (request.fHelp) return true; - if (!pwalletMain->IsCrypted()) + if (!pwallet->IsCrypted()) { throw JSONRPCError(RPC_WALLET_WRONG_ENC_STATE, "Error: running with an unencrypted wallet, but walletlock was called."); - - { - LOCK(cs_nWalletUnlockTime); - pwalletMain->Lock(); - nWalletUnlockTime = 0; } + pwallet->Lock(); + pwallet->nRelockTime = 0; + return NullUniValue; } UniValue encryptwallet(const JSONRPCRequest& request) { - if (!EnsureWalletIsAvailable(request.fHelp)) + CWallet * const pwallet = GetWalletForJSONRPCRequest(request); + if (!EnsureWalletIsAvailable(pwallet, request.fHelp)) { return NullUniValue; + } - if (!pwalletMain->IsCrypted() && (request.fHelp || request.params.size() != 1)) - throw runtime_error( + if (!pwallet->IsCrypted() && (request.fHelp || request.params.size() != 1)) { + throw std::runtime_error( "encryptwallet \"passphrase\"\n" "\nEncrypts the wallet with 'passphrase'. This is for first time encryption.\n" "After this, any calls that interact with private keys such as sending or signing \n" @@ -2071,19 +2196,21 @@ UniValue encryptwallet(const JSONRPCRequest& request) "\nNow set the passphrase to use the wallet, such as for signing or sending bitcoin\n" + HelpExampleCli("walletpassphrase", "\"my pass phrase\"") + "\nNow we can so something like sign\n" - + HelpExampleCli("signmessage", "\"bitcoinaddress\" \"test message\"") + + + HelpExampleCli("signmessage", "\"address\" \"test message\"") + "\nNow lock the wallet again by removing the passphrase\n" + HelpExampleCli("walletlock", "") + "\nAs a json rpc call\n" + HelpExampleRpc("encryptwallet", "\"my pass phrase\"") ); + } - LOCK2(cs_main, pwalletMain->cs_wallet); + LOCK2(cs_main, pwallet->cs_wallet); if (request.fHelp) return true; - if (pwalletMain->IsCrypted()) + if (pwallet->IsCrypted()) { throw JSONRPCError(RPC_WALLET_WRONG_ENC_STATE, "Error: running with an encrypted wallet, but encryptwallet was called."); + } // TODO: get rid of this .c_str() by implementing SecureString::operator=(std::string) // Alternately, find a way to make request.params[0] mlock()'d to begin with. @@ -2092,12 +2219,13 @@ UniValue encryptwallet(const JSONRPCRequest& request) strWalletPass = request.params[0].get_str().c_str(); if (strWalletPass.length() < 1) - throw runtime_error( + throw std::runtime_error( "encryptwallet <passphrase>\n" "Encrypts the wallet with <passphrase>."); - if (!pwalletMain->EncryptWallet(strWalletPass)) + if (!pwallet->EncryptWallet(strWalletPass)) { throw JSONRPCError(RPC_WALLET_ENCRYPTION_FAILED, "Error: Failed to encrypt the wallet."); + } // BDB seems to have a bad habit of writing old data into // slack space in .dat files; that is bad if the old data is @@ -2108,11 +2236,13 @@ UniValue encryptwallet(const JSONRPCRequest& request) UniValue lockunspent(const JSONRPCRequest& request) { - if (!EnsureWalletIsAvailable(request.fHelp)) + CWallet * const pwallet = GetWalletForJSONRPCRequest(request); + if (!EnsureWalletIsAvailable(pwallet, request.fHelp)) { return NullUniValue; + } if (request.fHelp || request.params.size() < 1 || request.params.size() > 2) - throw runtime_error( + throw std::runtime_error( "lockunspent unlock ([{\"txid\":\"txid\",\"vout\":n},...])\n" "\nUpdates list of temporarily unspendable outputs.\n" "Temporarily lock (unlock=false) or unlock (unlock=true) specified transaction outputs.\n" @@ -2148,7 +2278,7 @@ UniValue lockunspent(const JSONRPCRequest& request) + HelpExampleRpc("lockunspent", "false, \"[{\\\"txid\\\":\\\"a08e6907dbbd3d809776dbfc5d82e371b764ed838b5655e72f463568df1aadf0\\\",\\\"vout\\\":1}]\"") ); - LOCK2(cs_main, pwalletMain->cs_wallet); + LOCK2(cs_main, pwallet->cs_wallet); if (request.params.size() == 1) RPCTypeCheck(request.params, boost::assign::list_of(UniValue::VBOOL)); @@ -2159,7 +2289,7 @@ UniValue lockunspent(const JSONRPCRequest& request) if (request.params.size() == 1) { if (fUnlock) - pwalletMain->UnlockAllCoins(); + pwallet->UnlockAllCoins(); return true; } @@ -2176,7 +2306,7 @@ UniValue lockunspent(const JSONRPCRequest& request) {"vout", UniValueType(UniValue::VNUM)}, }); - string txid = find_value(o, "txid").get_str(); + std::string txid = find_value(o, "txid").get_str(); if (!IsHex(txid)) throw JSONRPCError(RPC_INVALID_PARAMETER, "Invalid parameter, expected hex txid"); @@ -2187,9 +2317,9 @@ UniValue lockunspent(const JSONRPCRequest& request) COutPoint outpt(uint256S(txid), nOutput); if (fUnlock) - pwalletMain->UnlockCoin(outpt); + pwallet->UnlockCoin(outpt); else - pwalletMain->LockCoin(outpt); + pwallet->LockCoin(outpt); } return true; @@ -2197,11 +2327,13 @@ UniValue lockunspent(const JSONRPCRequest& request) UniValue listlockunspent(const JSONRPCRequest& request) { - if (!EnsureWalletIsAvailable(request.fHelp)) + CWallet * const pwallet = GetWalletForJSONRPCRequest(request); + if (!EnsureWalletIsAvailable(pwallet, request.fHelp)) { return NullUniValue; + } if (request.fHelp || request.params.size() > 0) - throw runtime_error( + throw std::runtime_error( "listlockunspent\n" "\nReturns list of temporarily unspendable outputs.\n" "See the lockunspent call to lock and unlock transactions for spending.\n" @@ -2226,10 +2358,10 @@ UniValue listlockunspent(const JSONRPCRequest& request) + HelpExampleRpc("listlockunspent", "") ); - LOCK2(cs_main, pwalletMain->cs_wallet); + LOCK2(cs_main, pwallet->cs_wallet); - vector<COutPoint> vOutpts; - pwalletMain->ListLockedCoins(vOutpts); + std::vector<COutPoint> vOutpts; + pwallet->ListLockedCoins(vOutpts); UniValue ret(UniValue::VARR); @@ -2246,11 +2378,13 @@ UniValue listlockunspent(const JSONRPCRequest& request) UniValue settxfee(const JSONRPCRequest& request) { - if (!EnsureWalletIsAvailable(request.fHelp)) + CWallet * const pwallet = GetWalletForJSONRPCRequest(request); + if (!EnsureWalletIsAvailable(pwallet, request.fHelp)) { return NullUniValue; + } if (request.fHelp || request.params.size() < 1 || request.params.size() > 1) - throw runtime_error( + throw std::runtime_error( "settxfee amount\n" "\nSet the transaction fee per kB. Overwrites the paytxfee parameter.\n" "\nArguments:\n" @@ -2262,7 +2396,7 @@ UniValue settxfee(const JSONRPCRequest& request) + HelpExampleRpc("settxfee", "0.00001") ); - LOCK2(cs_main, pwalletMain->cs_wallet); + LOCK2(cs_main, pwallet->cs_wallet); // Amount CAmount nAmount = AmountFromValue(request.params[0]); @@ -2273,11 +2407,13 @@ UniValue settxfee(const JSONRPCRequest& request) UniValue getwalletinfo(const JSONRPCRequest& request) { - if (!EnsureWalletIsAvailable(request.fHelp)) + CWallet * const pwallet = GetWalletForJSONRPCRequest(request); + if (!EnsureWalletIsAvailable(pwallet, request.fHelp)) { return NullUniValue; + } if (request.fHelp || request.params.size() != 0) - throw runtime_error( + throw std::runtime_error( "getwalletinfo\n" "Returns an object containing various wallet state info.\n" "\nResult:\n" @@ -2291,27 +2427,28 @@ UniValue getwalletinfo(const JSONRPCRequest& request) " \"keypoolsize\": xxxx, (numeric) how many new keys are pre-generated\n" " \"unlocked_until\": ttt, (numeric) the timestamp in seconds since epoch (midnight Jan 1 1970 GMT) that the wallet is unlocked for transfers, or 0 if the wallet is locked\n" " \"paytxfee\": x.xxxx, (numeric) the transaction fee configuration, set in " + CURRENCY_UNIT + "/kB\n" - " \"hdmasterkeyid\": \"<hash160>\", (string) the Hash160 of the HD master pubkey\n" + " \"hdmasterkeyid\": \"<hash160>\" (string) the Hash160 of the HD master pubkey\n" "}\n" "\nExamples:\n" + HelpExampleCli("getwalletinfo", "") + HelpExampleRpc("getwalletinfo", "") ); - LOCK2(cs_main, pwalletMain->cs_wallet); + LOCK2(cs_main, pwallet->cs_wallet); UniValue obj(UniValue::VOBJ); - obj.push_back(Pair("walletversion", pwalletMain->GetVersion())); - obj.push_back(Pair("balance", ValueFromAmount(pwalletMain->GetBalance()))); - obj.push_back(Pair("unconfirmed_balance", ValueFromAmount(pwalletMain->GetUnconfirmedBalance()))); - obj.push_back(Pair("immature_balance", ValueFromAmount(pwalletMain->GetImmatureBalance()))); - obj.push_back(Pair("txcount", (int)pwalletMain->mapWallet.size())); - obj.push_back(Pair("keypoololdest", pwalletMain->GetOldestKeyPoolTime())); - obj.push_back(Pair("keypoolsize", (int)pwalletMain->GetKeyPoolSize())); - if (pwalletMain->IsCrypted()) - obj.push_back(Pair("unlocked_until", nWalletUnlockTime)); + obj.push_back(Pair("walletversion", pwallet->GetVersion())); + obj.push_back(Pair("balance", ValueFromAmount(pwallet->GetBalance()))); + obj.push_back(Pair("unconfirmed_balance", ValueFromAmount(pwallet->GetUnconfirmedBalance()))); + obj.push_back(Pair("immature_balance", ValueFromAmount(pwallet->GetImmatureBalance()))); + obj.push_back(Pair("txcount", (int)pwallet->mapWallet.size())); + obj.push_back(Pair("keypoololdest", pwallet->GetOldestKeyPoolTime())); + obj.push_back(Pair("keypoolsize", (int)pwallet->GetKeyPoolSize())); + if (pwallet->IsCrypted()) { + obj.push_back(Pair("unlocked_until", pwallet->nRelockTime)); + } obj.push_back(Pair("paytxfee", ValueFromAmount(payTxFee.GetFeePerK()))); - CKeyID masterKeyID = pwalletMain->GetHDChain().masterKeyID; + CKeyID masterKeyID = pwallet->GetHDChain().masterKeyID; if (!masterKeyID.IsNull()) obj.push_back(Pair("hdmasterkeyid", masterKeyID.GetHex())); return obj; @@ -2319,11 +2456,13 @@ UniValue getwalletinfo(const JSONRPCRequest& request) UniValue resendwallettransactions(const JSONRPCRequest& request) { - if (!EnsureWalletIsAvailable(request.fHelp)) + CWallet * const pwallet = GetWalletForJSONRPCRequest(request); + if (!EnsureWalletIsAvailable(pwallet, request.fHelp)) { return NullUniValue; + } if (request.fHelp || request.params.size() != 0) - throw runtime_error( + throw std::runtime_error( "resendwallettransactions\n" "Immediately re-broadcast unconfirmed wallet transactions to all peers.\n" "Intended only for testing; the wallet code periodically re-broadcasts\n" @@ -2334,9 +2473,9 @@ UniValue resendwallettransactions(const JSONRPCRequest& request) if (!g_connman) throw JSONRPCError(RPC_CLIENT_P2P_DISABLED, "Error: Peer-to-peer functionality missing or disabled"); - LOCK2(cs_main, pwalletMain->cs_wallet); + LOCK2(cs_main, pwallet->cs_wallet); - std::vector<uint256> txids = pwalletMain->ResendWalletTransactionsBefore(GetTime(), g_connman.get()); + std::vector<uint256> txids = pwallet->ResendWalletTransactionsBefore(GetTime(), g_connman.get()); UniValue result(UniValue::VARR); BOOST_FOREACH(const uint256& txid, txids) { @@ -2347,12 +2486,14 @@ UniValue resendwallettransactions(const JSONRPCRequest& request) UniValue listunspent(const JSONRPCRequest& request) { - if (!EnsureWalletIsAvailable(request.fHelp)) + CWallet * const pwallet = GetWalletForJSONRPCRequest(request); + if (!EnsureWalletIsAvailable(pwallet, request.fHelp)) { return NullUniValue; + } - if (request.fHelp || request.params.size() > 3) - throw runtime_error( - "listunspent ( minconf maxconf [\"address\",...] )\n" + if (request.fHelp || request.params.size() > 4) + throw std::runtime_error( + "listunspent ( minconf maxconf [\"addresses\",...] [include_unsafe] )\n" "\nReturns array of unspent transaction outputs\n" "with between minconf and maxconf (inclusive) confirmations.\n" "Optionally filter to only include txouts paid to specified addresses.\n" @@ -2364,6 +2505,8 @@ UniValue listunspent(const JSONRPCRequest& request) " \"address\" (string) bitcoin address\n" " ,...\n" " ]\n" + "4. include_unsafe (bool, optional, default=true) Include outputs that are not safe to spend\n" + " See description of \"safe\" attribute below.\n" "\nResult\n" "[ (array of json object)\n" " {\n" @@ -2372,11 +2515,14 @@ UniValue listunspent(const JSONRPCRequest& request) " \"address\" : \"address\", (string) the bitcoin address\n" " \"account\" : \"account\", (string) DEPRECATED. The associated account, or \"\" for the default account\n" " \"scriptPubKey\" : \"key\", (string) the script key\n" - " \"amount\" : x.xxx, (numeric) the transaction amount in " + CURRENCY_UNIT + "\n" + " \"amount\" : x.xxx, (numeric) the transaction output amount in " + CURRENCY_UNIT + "\n" " \"confirmations\" : n, (numeric) The number of confirmations\n" " \"redeemScript\" : n (string) The redeemScript if scriptPubKey is P2SH\n" " \"spendable\" : xxx, (bool) Whether we have the private keys to spend this output\n" - " \"solvable\" : xxx (bool) Whether we know how to spend this output, ignoring the lack of keys\n" + " \"solvable\" : xxx, (bool) Whether we know how to spend this output, ignoring the lack of keys\n" + " \"safe\" : xxx (bool) Whether this output is considered safe to spend. Unconfirmed transactions\n" + " from outside keys and unconfirmed replacement transactions are considered unsafe\n" + " and are not eligible for spending by fundrawtransaction and sendtoaddress.\n" " }\n" " ,...\n" "]\n" @@ -2387,35 +2533,44 @@ UniValue listunspent(const JSONRPCRequest& request) + HelpExampleRpc("listunspent", "6, 9999999 \"[\\\"1PGFqEzfmQch1gKD3ra4k18PNj3tTUUSqg\\\",\\\"1LtvqCaApEdUGFkpKMM4MstjcaL4dKg8SP\\\"]\"") ); - RPCTypeCheck(request.params, boost::assign::list_of(UniValue::VNUM)(UniValue::VNUM)(UniValue::VARR)); - int nMinDepth = 1; - if (request.params.size() > 0) + if (request.params.size() > 0 && !request.params[0].isNull()) { + RPCTypeCheckArgument(request.params[0], UniValue::VNUM); nMinDepth = request.params[0].get_int(); + } int nMaxDepth = 9999999; - if (request.params.size() > 1) + if (request.params.size() > 1 && !request.params[1].isNull()) { + RPCTypeCheckArgument(request.params[1], UniValue::VNUM); nMaxDepth = request.params[1].get_int(); + } - set<CBitcoinAddress> setAddress; - if (request.params.size() > 2) { + std::set<CBitcoinAddress> setAddress; + if (request.params.size() > 2 && !request.params[2].isNull()) { + RPCTypeCheckArgument(request.params[2], UniValue::VARR); UniValue inputs = request.params[2].get_array(); for (unsigned int idx = 0; idx < inputs.size(); idx++) { const UniValue& input = inputs[idx]; CBitcoinAddress address(input.get_str()); if (!address.IsValid()) - throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, string("Invalid Bitcoin address: ")+input.get_str()); + throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, std::string("Invalid Bitcoin address: ")+input.get_str()); if (setAddress.count(address)) - throw JSONRPCError(RPC_INVALID_PARAMETER, string("Invalid parameter, duplicated address: ")+input.get_str()); + throw JSONRPCError(RPC_INVALID_PARAMETER, std::string("Invalid parameter, duplicated address: ")+input.get_str()); setAddress.insert(address); } } + bool include_unsafe = true; + if (request.params.size() > 3 && !request.params[3].isNull()) { + RPCTypeCheckArgument(request.params[3], UniValue::VBOOL); + include_unsafe = request.params[3].get_bool(); + } + UniValue results(UniValue::VARR); - vector<COutput> vecOutputs; - assert(pwalletMain != NULL); - LOCK2(cs_main, pwalletMain->cs_wallet); - pwalletMain->AvailableCoins(vecOutputs, false, NULL, true); + std::vector<COutput> vecOutputs; + assert(pwallet != NULL); + LOCK2(cs_main, pwallet->cs_wallet); + pwallet->AvailableCoins(vecOutputs, !include_unsafe, NULL, true); BOOST_FOREACH(const COutput& out, vecOutputs) { if (out.nDepth < nMinDepth || out.nDepth > nMaxDepth) continue; @@ -2434,14 +2589,16 @@ UniValue listunspent(const JSONRPCRequest& request) if (fValidAddress) { entry.push_back(Pair("address", CBitcoinAddress(address).ToString())); - if (pwalletMain->mapAddressBook.count(address)) - entry.push_back(Pair("account", pwalletMain->mapAddressBook[address].name)); + if (pwallet->mapAddressBook.count(address)) { + entry.push_back(Pair("account", pwallet->mapAddressBook[address].name)); + } if (scriptPubKey.IsPayToScriptHash()) { const CScriptID& hash = boost::get<CScriptID>(address); CScript redeemScript; - if (pwalletMain->GetCScript(hash, redeemScript)) + if (pwallet->GetCScript(hash, redeemScript)) { entry.push_back(Pair("redeemScript", HexStr(redeemScript.begin(), redeemScript.end()))); + } } } @@ -2450,6 +2607,7 @@ UniValue listunspent(const JSONRPCRequest& request) entry.push_back(Pair("confirmations", out.nDepth)); entry.push_back(Pair("spendable", out.fSpendable)); entry.push_back(Pair("solvable", out.fSolvable)); + entry.push_back(Pair("safe", out.fSafe)); results.push_back(entry); } @@ -2458,14 +2616,17 @@ UniValue listunspent(const JSONRPCRequest& request) UniValue fundrawtransaction(const JSONRPCRequest& request) { - if (!EnsureWalletIsAvailable(request.fHelp)) + CWallet * const pwallet = GetWalletForJSONRPCRequest(request); + if (!EnsureWalletIsAvailable(pwallet, request.fHelp)) { return NullUniValue; + } if (request.fHelp || request.params.size() < 1 || request.params.size() > 2) - throw runtime_error( + throw std::runtime_error( "fundrawtransaction \"hexstring\" ( options )\n" "\nAdd inputs to a transaction until it has enough in value to meet its out value.\n" - "This will not modify existing inputs, and will add one change output to the outputs.\n" + "This will not modify existing inputs, and will add at most one change output to the outputs.\n" + "No existing outputs will be modified unless \"subtractFeeFromOutputs\" is specified.\n" "Note that inputs which were signed may need to be resigned after completion since in/outputs have been added.\n" "The inputs added will not be signed, use signrawtransaction for that.\n" "Note that all existing inputs must have their previous output transaction be in the wallet.\n" @@ -2475,13 +2636,20 @@ UniValue fundrawtransaction(const JSONRPCRequest& request) "Only pay-to-pubkey, multisig, and P2SH versions thereof are currently supported for watch-only\n" "\nArguments:\n" "1. \"hexstring\" (string, required) The hex string of the raw transaction\n" - "2. options (object, optional)\n" + "2. options (object, optional)\n" " {\n" - " \"changeAddress\" (string, optional, default pool address) The bitcoin address to receive the change\n" - " \"changePosition\" (numeric, optional, default random) The index of the change output\n" - " \"includeWatching\" (boolean, optional, default false) Also select inputs which are watch only\n" - " \"lockUnspents\" (boolean, optional, default false) Lock selected unspent outputs\n" - " \"feeRate\" (numeric, optional, default not set: makes wallet determine the fee) Set a specific feerate (" + CURRENCY_UNIT + " per KB)\n" + " \"changeAddress\" (string, optional, default pool address) The bitcoin address to receive the change\n" + " \"changePosition\" (numeric, optional, default random) The index of the change output\n" + " \"includeWatching\" (boolean, optional, default false) Also select inputs which are watch only\n" + " \"lockUnspents\" (boolean, optional, default false) Lock selected unspent outputs\n" + " \"reserveChangeKey\" (boolean, optional, default true) Reserves the change output key from the keypool\n" + " \"feeRate\" (numeric, optional, default not set: makes wallet determine the fee) Set a specific feerate (" + CURRENCY_UNIT + " per KB)\n" + " \"subtractFeeFromOutputs\" (array, optional) A json array of integers.\n" + " The fee will be equally deducted from the amount of each specified output.\n" + " The outputs are specified by their zero-based index, before any change output is added.\n" + " Those recipients will receive less bitcoins than you enter in their corresponding amount field.\n" + " If no outputs are specified here, the sender pays the fee.\n" + " [vout_index,...]\n" " }\n" " for backward compatibility: passing in a true instead of an object will result in {\"includeWatching\":true}\n" "\nResult:\n" @@ -2490,7 +2658,6 @@ UniValue fundrawtransaction(const JSONRPCRequest& request) " \"fee\": n, (numeric) Fee in " + CURRENCY_UNIT + " the resulting transaction pays\n" " \"changepos\": n (numeric) The position of the added change output, or -1\n" "}\n" - "\"hex\" \n" "\nExamples:\n" "\nCreate a transaction with no inputs\n" + HelpExampleCli("createrawtransaction", "\"[]\" \"{\\\"myaddress\\\":0.01}\"") + @@ -2508,8 +2675,11 @@ UniValue fundrawtransaction(const JSONRPCRequest& request) int changePosition = -1; bool includeWatching = false; bool lockUnspents = false; + bool reserveChangeKey = true; CFeeRate feeRate = CFeeRate(0); bool overrideEstimatedFeerate = false; + UniValue subtractFeeFromOutputs; + std::set<int> setSubtractFeeFromOutputs; if (request.params.size() > 1) { if (request.params[1].type() == UniValue::VBOOL) { @@ -2527,7 +2697,9 @@ UniValue fundrawtransaction(const JSONRPCRequest& request) {"changePosition", UniValueType(UniValue::VNUM)}, {"includeWatching", UniValueType(UniValue::VBOOL)}, {"lockUnspents", UniValueType(UniValue::VBOOL)}, + {"reserveChangeKey", UniValueType(UniValue::VBOOL)}, {"feeRate", UniValueType()}, // will be checked below + {"subtractFeeFromOutputs", UniValueType(UniValue::VARR)}, }, true, true); @@ -2535,7 +2707,7 @@ UniValue fundrawtransaction(const JSONRPCRequest& request) CBitcoinAddress address(options["changeAddress"].get_str()); if (!address.IsValid()) - throw JSONRPCError(RPC_INVALID_PARAMETER, "changeAddress must be a valid bitcoin address"); + throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "changeAddress must be a valid bitcoin address"); changeAddress = address.Get(); } @@ -2549,11 +2721,17 @@ UniValue fundrawtransaction(const JSONRPCRequest& request) if (options.exists("lockUnspents")) lockUnspents = options["lockUnspents"].get_bool(); + if (options.exists("reserveChangeKey")) + reserveChangeKey = options["reserveChangeKey"].get_bool(); + if (options.exists("feeRate")) { feeRate = CFeeRate(AmountFromValue(options["feeRate"])); overrideEstimatedFeerate = true; } + + if (options.exists("subtractFeeFromOutputs")) + subtractFeeFromOutputs = options["subtractFeeFromOutputs"].get_array(); } } @@ -2568,11 +2746,23 @@ UniValue fundrawtransaction(const JSONRPCRequest& request) if (changePosition != -1 && (changePosition < 0 || (unsigned int)changePosition > tx.vout.size())) throw JSONRPCError(RPC_INVALID_PARAMETER, "changePosition out of bounds"); + for (unsigned int idx = 0; idx < subtractFeeFromOutputs.size(); idx++) { + int pos = subtractFeeFromOutputs[idx].get_int(); + if (setSubtractFeeFromOutputs.count(pos)) + throw JSONRPCError(RPC_INVALID_PARAMETER, strprintf("Invalid parameter, duplicated position: %d", pos)); + if (pos < 0) + throw JSONRPCError(RPC_INVALID_PARAMETER, strprintf("Invalid parameter, negative position: %d", pos)); + if (pos >= int(tx.vout.size())) + throw JSONRPCError(RPC_INVALID_PARAMETER, strprintf("Invalid parameter, position too large: %d", pos)); + setSubtractFeeFromOutputs.insert(pos); + } + CAmount nFeeOut; - string strFailReason; + std::string strFailReason; - if(!pwalletMain->FundTransaction(tx, nFeeOut, overrideEstimatedFeerate, feeRate, changePosition, strFailReason, includeWatching, lockUnspents, changeAddress)) - throw JSONRPCError(RPC_INTERNAL_ERROR, strFailReason); + if (!pwallet->FundTransaction(tx, nFeeOut, overrideEstimatedFeerate, feeRate, changePosition, strFailReason, includeWatching, lockUnspents, setSubtractFeeFromOutputs, reserveChangeKey, changeAddress)) { + throw JSONRPCError(RPC_WALLET_ERROR, strFailReason); + } UniValue result(UniValue::VOBJ); result.push_back(Pair("hex", EncodeHexTx(tx))); @@ -2582,6 +2772,324 @@ UniValue fundrawtransaction(const JSONRPCRequest& request) return result; } +// Calculate the size of the transaction assuming all signatures are max size +// Use DummySignatureCreator, which inserts 72 byte signatures everywhere. +// TODO: re-use this in CWallet::CreateTransaction (right now +// CreateTransaction uses the constructed dummy-signed tx to do a priority +// calculation, but we should be able to refactor after priority is removed). +// NOTE: this requires that all inputs must be in mapWallet (eg the tx should +// be IsAllFromMe). +int64_t CalculateMaximumSignedTxSize(const CTransaction &tx, CWallet &wallet) +{ + CMutableTransaction txNew(tx); + std::vector<std::pair<CWalletTx*, unsigned int>> vCoins; + // Look up the inputs. We should have already checked that this transaction + // IsAllFromMe(ISMINE_SPENDABLE), so every input should already be in our + // wallet, with a valid index into the vout array. + for (auto& input : tx.vin) { + const auto mi = wallet.mapWallet.find(input.prevout.hash); + assert(mi != wallet.mapWallet.end() && input.prevout.n < mi->second.tx->vout.size()); + vCoins.emplace_back(std::make_pair(&(mi->second), input.prevout.n)); + } + if (!wallet.DummySignTx(txNew, vCoins)) { + // This should never happen, because IsAllFromMe(ISMINE_SPENDABLE) + // implies that we can sign for every input. + throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Transaction contains inputs that cannot be signed"); + } + return GetVirtualTransactionSize(txNew); +} + +UniValue bumpfee(const JSONRPCRequest& request) +{ + CWallet * const pwallet = GetWalletForJSONRPCRequest(request); + + if (!EnsureWalletIsAvailable(pwallet, request.fHelp)) + return NullUniValue; + + if (request.fHelp || request.params.size() < 1 || request.params.size() > 2) { + throw std::runtime_error( + "bumpfee \"txid\" ( options ) \n" + "\nBumps the fee of an opt-in-RBF transaction T, replacing it with a new transaction B.\n" + "An opt-in RBF transaction with the given txid must be in the wallet.\n" + "The command will pay the additional fee by decreasing (or perhaps removing) its change output.\n" + "If the change output is not big enough to cover the increased fee, the command will currently fail\n" + "instead of adding new inputs to compensate. (A future implementation could improve this.)\n" + "The command will fail if the wallet or mempool contains a transaction that spends one of T's outputs.\n" + "By default, the new fee will be calculated automatically using estimatefee.\n" + "The user can specify a confirmation target for estimatefee.\n" + "Alternatively, the user can specify totalFee, or use RPC setpaytxfee to set a higher fee rate.\n" + "At a minimum, the new fee rate must be high enough to pay an additional new relay fee (incrementalfee\n" + "returned by getnetworkinfo) to enter the node's mempool.\n" + "\nArguments:\n" + "1. txid (string, required) The txid to be bumped\n" + "2. options (object, optional)\n" + " {\n" + " \"confTarget\" (numeric, optional) Confirmation target (in blocks)\n" + " \"totalFee\" (numeric, optional) Total fee (NOT feerate) to pay, in satoshis.\n" + " In rare cases, the actual fee paid might be slightly higher than the specified\n" + " totalFee if the tx change output has to be removed because it is too close to\n" + " the dust threshold.\n" + " \"replaceable\" (boolean, optional, default true) Whether the new transaction should still be\n" + " marked bip-125 replaceable. If true, the sequence numbers in the transaction will\n" + " be left unchanged from the original. If false, any input sequence numbers in the\n" + " original transaction that were less than 0xfffffffe will be increased to 0xfffffffe\n" + " so the new transaction will not be explicitly bip-125 replaceable (though it may\n" + " still be replaceable in practice, for example if it has unconfirmed ancestors which\n" + " are replaceable).\n" + " }\n" + "\nResult:\n" + "{\n" + " \"txid\": \"value\", (string) The id of the new transaction\n" + " \"origfee\": n, (numeric) Fee of the replaced transaction\n" + " \"fee\": n, (numeric) Fee of the new transaction\n" + " \"errors\": [ str... ] (json array of strings) Errors encountered during processing (may be empty)\n" + "}\n" + "\nExamples:\n" + "\nBump the fee, get the new transaction\'s txid\n" + + HelpExampleCli("bumpfee", "<txid>")); + } + + RPCTypeCheck(request.params, boost::assign::list_of(UniValue::VSTR)(UniValue::VOBJ)); + uint256 hash; + hash.SetHex(request.params[0].get_str()); + + // retrieve the original tx from the wallet + LOCK2(cs_main, pwallet->cs_wallet); + EnsureWalletIsUnlocked(pwallet); + if (!pwallet->mapWallet.count(hash)) { + throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid or non-wallet transaction id"); + } + CWalletTx& wtx = pwallet->mapWallet[hash]; + + if (pwallet->HasWalletSpend(hash)) { + throw JSONRPCError(RPC_INVALID_PARAMETER, "Transaction has descendants in the wallet"); + } + + { + LOCK(mempool.cs); + auto it = mempool.mapTx.find(hash); + if (it != mempool.mapTx.end() && it->GetCountWithDescendants() > 1) { + throw JSONRPCError(RPC_INVALID_PARAMETER, "Transaction has descendants in the mempool"); + } + } + + if (wtx.GetDepthInMainChain() != 0) { + throw JSONRPCError(RPC_WALLET_ERROR, "Transaction has been mined, or is conflicted with a mined transaction"); + } + + if (!SignalsOptInRBF(wtx)) { + throw JSONRPCError(RPC_WALLET_ERROR, "Transaction is not BIP 125 replaceable"); + } + + if (wtx.mapValue.count("replaced_by_txid")) { + throw JSONRPCError(RPC_WALLET_ERROR, strprintf("Cannot bump transaction %s which was already bumped by transaction %s", hash.ToString(), wtx.mapValue.at("replaced_by_txid"))); + } + + // check that original tx consists entirely of our inputs + // if not, we can't bump the fee, because the wallet has no way of knowing the value of the other inputs (thus the fee) + if (!pwallet->IsAllFromMe(wtx, ISMINE_SPENDABLE)) { + throw JSONRPCError(RPC_WALLET_ERROR, "Transaction contains inputs that don't belong to this wallet"); + } + + // figure out which output was change + // if there was no change output or multiple change outputs, fail + int nOutput = -1; + for (size_t i = 0; i < wtx.tx->vout.size(); ++i) { + if (pwallet->IsChange(wtx.tx->vout[i])) { + if (nOutput != -1) { + throw JSONRPCError(RPC_WALLET_ERROR, "Transaction has multiple change outputs"); + } + nOutput = i; + } + } + if (nOutput == -1) { + throw JSONRPCError(RPC_WALLET_ERROR, "Transaction does not have a change output"); + } + + // Calculate the expected size of the new transaction. + int64_t txSize = GetVirtualTransactionSize(*(wtx.tx)); + const int64_t maxNewTxSize = CalculateMaximumSignedTxSize(*wtx.tx, *pwallet); + + // optional parameters + bool specifiedConfirmTarget = false; + int newConfirmTarget = nTxConfirmTarget; + CAmount totalFee = 0; + bool replaceable = true; + if (request.params.size() > 1) { + UniValue options = request.params[1]; + RPCTypeCheckObj(options, + { + {"confTarget", UniValueType(UniValue::VNUM)}, + {"totalFee", UniValueType(UniValue::VNUM)}, + {"replaceable", UniValueType(UniValue::VBOOL)}, + }, + true, true); + + if (options.exists("confTarget") && options.exists("totalFee")) { + throw JSONRPCError(RPC_INVALID_PARAMETER, "confTarget and totalFee options should not both be set. Please provide either a confirmation target for fee estimation or an explicit total fee for the transaction."); + } else if (options.exists("confTarget")) { + specifiedConfirmTarget = true; + newConfirmTarget = options["confTarget"].get_int(); + if (newConfirmTarget <= 0) { // upper-bound will be checked by estimatefee/smartfee + throw JSONRPCError(RPC_INVALID_PARAMETER, "Invalid confTarget (cannot be <= 0)"); + } + } else if (options.exists("totalFee")) { + totalFee = options["totalFee"].get_int64(); + CAmount requiredFee = CWallet::GetRequiredFee(maxNewTxSize); + if (totalFee < requiredFee ) { + throw JSONRPCError(RPC_INVALID_PARAMETER, + strprintf("Insufficient totalFee (cannot be less than required fee %s)", + FormatMoney(requiredFee))); + } + } + + if (options.exists("replaceable")) { + replaceable = options["replaceable"].get_bool(); + } + } + + // calculate the old fee and fee-rate + CAmount nOldFee = wtx.GetDebit(ISMINE_SPENDABLE) - wtx.tx->GetValueOut(); + CFeeRate nOldFeeRate(nOldFee, txSize); + CAmount nNewFee; + CFeeRate nNewFeeRate; + // The wallet uses a conservative WALLET_INCREMENTAL_RELAY_FEE value to + // future proof against changes to network wide policy for incremental relay + // fee that our node may not be aware of. + CFeeRate walletIncrementalRelayFee = CFeeRate(WALLET_INCREMENTAL_RELAY_FEE); + if (::incrementalRelayFee > walletIncrementalRelayFee) { + walletIncrementalRelayFee = ::incrementalRelayFee; + } + + if (totalFee > 0) { + CAmount minTotalFee = nOldFeeRate.GetFee(maxNewTxSize) + ::incrementalRelayFee.GetFee(maxNewTxSize); + if (totalFee < minTotalFee) { + throw JSONRPCError(RPC_INVALID_PARAMETER, strprintf("Insufficient totalFee, must be at least %s (oldFee %s + incrementalFee %s)", + FormatMoney(minTotalFee), FormatMoney(nOldFeeRate.GetFee(maxNewTxSize)), FormatMoney(::incrementalRelayFee.GetFee(maxNewTxSize)))); + } + nNewFee = totalFee; + nNewFeeRate = CFeeRate(totalFee, maxNewTxSize); + } else { + // if user specified a confirm target then don't consider any global payTxFee + if (specifiedConfirmTarget) { + nNewFee = CWallet::GetMinimumFee(maxNewTxSize, newConfirmTarget, mempool, CAmount(0)); + } + // otherwise use the regular wallet logic to select payTxFee or default confirm target + else { + nNewFee = CWallet::GetMinimumFee(maxNewTxSize, newConfirmTarget, mempool); + } + + nNewFeeRate = CFeeRate(nNewFee, maxNewTxSize); + + // New fee rate must be at least old rate + minimum incremental relay rate + // walletIncrementalRelayFee.GetFeePerK() should be exact, because it's initialized + // in that unit (fee per kb). + // However, nOldFeeRate is a calculated value from the tx fee/size, so + // add 1 satoshi to the result, because it may have been rounded down. + if (nNewFeeRate.GetFeePerK() < nOldFeeRate.GetFeePerK() + 1 + walletIncrementalRelayFee.GetFeePerK()) { + nNewFeeRate = CFeeRate(nOldFeeRate.GetFeePerK() + 1 + walletIncrementalRelayFee.GetFeePerK()); + nNewFee = nNewFeeRate.GetFee(maxNewTxSize); + } + } + + // Check that in all cases the new fee doesn't violate maxTxFee + if (nNewFee > maxTxFee) { + throw JSONRPCError(RPC_WALLET_ERROR, + strprintf("Specified or calculated fee %s is too high (cannot be higher than maxTxFee %s)", + FormatMoney(nNewFee), FormatMoney(maxTxFee))); + } + + // check that fee rate is higher than mempool's minimum fee + // (no point in bumping fee if we know that the new tx won't be accepted to the mempool) + // This may occur if the user set TotalFee or paytxfee too low, if fallbackfee is too low, or, perhaps, + // in a rare situation where the mempool minimum fee increased significantly since the fee estimation just a + // moment earlier. In this case, we report an error to the user, who may use totalFee to make an adjustment. + CFeeRate minMempoolFeeRate = mempool.GetMinFee(GetArg("-maxmempool", DEFAULT_MAX_MEMPOOL_SIZE) * 1000000); + if (nNewFeeRate.GetFeePerK() < minMempoolFeeRate.GetFeePerK()) { + throw JSONRPCError(RPC_WALLET_ERROR, strprintf("New fee rate (%s) is less than the minimum fee rate (%s) to get into the mempool. totalFee value should to be at least %s or settxfee value should be at least %s to add transaction.", FormatMoney(nNewFeeRate.GetFeePerK()), FormatMoney(minMempoolFeeRate.GetFeePerK()), FormatMoney(minMempoolFeeRate.GetFee(maxNewTxSize)), FormatMoney(minMempoolFeeRate.GetFeePerK()))); + } + + // Now modify the output to increase the fee. + // If the output is not large enough to pay the fee, fail. + CAmount nDelta = nNewFee - nOldFee; + assert(nDelta > 0); + CMutableTransaction tx(*(wtx.tx)); + CTxOut* poutput = &(tx.vout[nOutput]); + if (poutput->nValue < nDelta) { + throw JSONRPCError(RPC_WALLET_ERROR, "Change output is too small to bump the fee"); + } + + // If the output would become dust, discard it (converting the dust to fee) + poutput->nValue -= nDelta; + if (poutput->nValue <= poutput->GetDustThreshold(::dustRelayFee)) { + LogPrint("rpc", "Bumping fee and discarding dust output\n"); + nNewFee += poutput->nValue; + tx.vout.erase(tx.vout.begin() + nOutput); + } + + // Mark new tx not replaceable, if requested. + if (!replaceable) { + for (auto& input : tx.vin) { + if (input.nSequence < 0xfffffffe) input.nSequence = 0xfffffffe; + } + } + + // sign the new tx + CTransaction txNewConst(tx); + int nIn = 0; + for (auto& input : tx.vin) { + std::map<uint256, CWalletTx>::const_iterator mi = pwallet->mapWallet.find(input.prevout.hash); + assert(mi != pwallet->mapWallet.end() && input.prevout.n < mi->second.tx->vout.size()); + const CScript& scriptPubKey = mi->second.tx->vout[input.prevout.n].scriptPubKey; + const CAmount& amount = mi->second.tx->vout[input.prevout.n].nValue; + SignatureData sigdata; + if (!ProduceSignature(TransactionSignatureCreator(pwallet, &txNewConst, nIn, amount, SIGHASH_ALL), scriptPubKey, sigdata)) { + throw JSONRPCError(RPC_WALLET_ERROR, "Can't sign transaction."); + } + UpdateTransaction(tx, nIn, sigdata); + nIn++; + } + + // commit/broadcast the tx + CReserveKey reservekey(pwallet); + CWalletTx wtxBumped(pwallet, MakeTransactionRef(std::move(tx))); + wtxBumped.mapValue = wtx.mapValue; + wtxBumped.mapValue["replaces_txid"] = hash.ToString(); + wtxBumped.vOrderForm = wtx.vOrderForm; + wtxBumped.strFromAccount = wtx.strFromAccount; + wtxBumped.fTimeReceivedIsTxTime = true; + wtxBumped.fFromMe = true; + CValidationState state; + if (!pwallet->CommitTransaction(wtxBumped, reservekey, g_connman.get(), state)) { + // NOTE: CommitTransaction never returns false, so this should never happen. + throw JSONRPCError(RPC_WALLET_ERROR, strprintf("Error: The transaction was rejected! Reason given: %s", state.GetRejectReason())); + } + + UniValue vErrors(UniValue::VARR); + if (state.IsInvalid()) { + // This can happen if the mempool rejected the transaction. Report + // what happened in the "errors" response. + vErrors.push_back(strprintf("Error: The transaction was rejected: %s", FormatStateMessage(state))); + } + + // mark the original tx as bumped + if (!pwallet->MarkReplaced(wtx.GetHash(), wtxBumped.GetHash())) { + // TODO: see if JSON-RPC has a standard way of returning a response + // along with an exception. It would be good to return information about + // wtxBumped to the caller even if marking the original transaction + // replaced does not succeed for some reason. + vErrors.push_back("Error: Created new bumpfee transaction but could not mark the original transaction as replaced."); + } + + UniValue result(UniValue::VOBJ); + result.push_back(Pair("txid", wtxBumped.GetHash().GetHex())); + result.push_back(Pair("origfee", ValueFromAmount(nOldFee))); + result.push_back(Pair("fee", ValueFromAmount(nNewFee))); + result.push_back(Pair("errors", vErrors)); + + return result; +} + extern UniValue dumpprivkey(const JSONRPCRequest& request); // in rpcdump.cpp extern UniValue importprivkey(const JSONRPCRequest& request); extern UniValue importaddress(const JSONRPCRequest& request); @@ -2595,53 +3103,54 @@ extern UniValue importmulti(const JSONRPCRequest& request); static const CRPCCommand commands[] = { // category name actor (function) okSafeMode // --------------------- ------------------------ ----------------------- ---------- - { "rawtransactions", "fundrawtransaction", &fundrawtransaction, false }, - { "hidden", "resendwallettransactions", &resendwallettransactions, true }, - { "wallet", "abandontransaction", &abandontransaction, false }, - { "wallet", "addmultisigaddress", &addmultisigaddress, true }, - { "wallet", "addwitnessaddress", &addwitnessaddress, true }, - { "wallet", "backupwallet", &backupwallet, true }, - { "wallet", "dumpprivkey", &dumpprivkey, true }, - { "wallet", "dumpwallet", &dumpwallet, true }, - { "wallet", "encryptwallet", &encryptwallet, true }, - { "wallet", "getaccountaddress", &getaccountaddress, true }, - { "wallet", "getaccount", &getaccount, true }, - { "wallet", "getaddressesbyaccount", &getaddressesbyaccount, true }, - { "wallet", "getbalance", &getbalance, false }, - { "wallet", "getnewaddress", &getnewaddress, true }, - { "wallet", "getrawchangeaddress", &getrawchangeaddress, true }, - { "wallet", "getreceivedbyaccount", &getreceivedbyaccount, false }, - { "wallet", "getreceivedbyaddress", &getreceivedbyaddress, false }, - { "wallet", "gettransaction", &gettransaction, false }, - { "wallet", "getunconfirmedbalance", &getunconfirmedbalance, false }, - { "wallet", "getwalletinfo", &getwalletinfo, false }, - { "wallet", "importmulti", &importmulti, true }, - { "wallet", "importprivkey", &importprivkey, true }, - { "wallet", "importwallet", &importwallet, true }, - { "wallet", "importaddress", &importaddress, true }, - { "wallet", "importprunedfunds", &importprunedfunds, true }, - { "wallet", "importpubkey", &importpubkey, true }, - { "wallet", "keypoolrefill", &keypoolrefill, true }, - { "wallet", "listaccounts", &listaccounts, false }, - { "wallet", "listaddressgroupings", &listaddressgroupings, false }, - { "wallet", "listlockunspent", &listlockunspent, false }, - { "wallet", "listreceivedbyaccount", &listreceivedbyaccount, false }, - { "wallet", "listreceivedbyaddress", &listreceivedbyaddress, false }, - { "wallet", "listsinceblock", &listsinceblock, false }, - { "wallet", "listtransactions", &listtransactions, false }, - { "wallet", "listunspent", &listunspent, false }, - { "wallet", "lockunspent", &lockunspent, true }, - { "wallet", "move", &movecmd, false }, - { "wallet", "sendfrom", &sendfrom, false }, - { "wallet", "sendmany", &sendmany, false }, - { "wallet", "sendtoaddress", &sendtoaddress, false }, - { "wallet", "setaccount", &setaccount, true }, - { "wallet", "settxfee", &settxfee, true }, - { "wallet", "signmessage", &signmessage, true }, - { "wallet", "walletlock", &walletlock, true }, - { "wallet", "walletpassphrasechange", &walletpassphrasechange, true }, - { "wallet", "walletpassphrase", &walletpassphrase, true }, - { "wallet", "removeprunedfunds", &removeprunedfunds, true }, + { "rawtransactions", "fundrawtransaction", &fundrawtransaction, false, {"hexstring","options"} }, + { "hidden", "resendwallettransactions", &resendwallettransactions, true, {} }, + { "wallet", "abandontransaction", &abandontransaction, false, {"txid"} }, + { "wallet", "addmultisigaddress", &addmultisigaddress, true, {"nrequired","keys","account"} }, + { "wallet", "addwitnessaddress", &addwitnessaddress, true, {"address"} }, + { "wallet", "backupwallet", &backupwallet, true, {"destination"} }, + { "wallet", "bumpfee", &bumpfee, true, {"txid", "options"} }, + { "wallet", "dumpprivkey", &dumpprivkey, true, {"address"} }, + { "wallet", "dumpwallet", &dumpwallet, true, {"filename"} }, + { "wallet", "encryptwallet", &encryptwallet, true, {"passphrase"} }, + { "wallet", "getaccountaddress", &getaccountaddress, true, {"account"} }, + { "wallet", "getaccount", &getaccount, true, {"address"} }, + { "wallet", "getaddressesbyaccount", &getaddressesbyaccount, true, {"account"} }, + { "wallet", "getbalance", &getbalance, false, {"account","minconf","include_watchonly"} }, + { "wallet", "getnewaddress", &getnewaddress, true, {"account"} }, + { "wallet", "getrawchangeaddress", &getrawchangeaddress, true, {} }, + { "wallet", "getreceivedbyaccount", &getreceivedbyaccount, false, {"account","minconf"} }, + { "wallet", "getreceivedbyaddress", &getreceivedbyaddress, false, {"address","minconf"} }, + { "wallet", "gettransaction", &gettransaction, false, {"txid","include_watchonly"} }, + { "wallet", "getunconfirmedbalance", &getunconfirmedbalance, false, {} }, + { "wallet", "getwalletinfo", &getwalletinfo, false, {} }, + { "wallet", "importmulti", &importmulti, true, {"requests","options"} }, + { "wallet", "importprivkey", &importprivkey, true, {"privkey","label","rescan"} }, + { "wallet", "importwallet", &importwallet, true, {"filename"} }, + { "wallet", "importaddress", &importaddress, true, {"address","label","rescan","p2sh"} }, + { "wallet", "importprunedfunds", &importprunedfunds, true, {"rawtransaction","txoutproof"} }, + { "wallet", "importpubkey", &importpubkey, true, {"pubkey","label","rescan"} }, + { "wallet", "keypoolrefill", &keypoolrefill, true, {"newsize"} }, + { "wallet", "listaccounts", &listaccounts, false, {"minconf","include_watchonly"} }, + { "wallet", "listaddressgroupings", &listaddressgroupings, false, {} }, + { "wallet", "listlockunspent", &listlockunspent, false, {} }, + { "wallet", "listreceivedbyaccount", &listreceivedbyaccount, false, {"minconf","include_empty","include_watchonly"} }, + { "wallet", "listreceivedbyaddress", &listreceivedbyaddress, false, {"minconf","include_empty","include_watchonly"} }, + { "wallet", "listsinceblock", &listsinceblock, false, {"blockhash","target_confirmations","include_watchonly"} }, + { "wallet", "listtransactions", &listtransactions, false, {"account","count","skip","include_watchonly"} }, + { "wallet", "listunspent", &listunspent, false, {"minconf","maxconf","addresses","include_unsafe"} }, + { "wallet", "lockunspent", &lockunspent, true, {"unlock","transactions"} }, + { "wallet", "move", &movecmd, false, {"fromaccount","toaccount","amount","minconf","comment"} }, + { "wallet", "sendfrom", &sendfrom, false, {"fromaccount","toaddress","amount","minconf","comment","comment_to"} }, + { "wallet", "sendmany", &sendmany, false, {"fromaccount","amounts","minconf","comment","subtractfeefrom"} }, + { "wallet", "sendtoaddress", &sendtoaddress, false, {"address","amount","comment","comment_to","subtractfeefromamount"} }, + { "wallet", "setaccount", &setaccount, true, {"address","account"} }, + { "wallet", "settxfee", &settxfee, true, {"amount"} }, + { "wallet", "signmessage", &signmessage, true, {"address","message"} }, + { "wallet", "walletlock", &walletlock, true, {} }, + { "wallet", "walletpassphrasechange", &walletpassphrasechange, true, {"oldpassphrase","newpassphrase"} }, + { "wallet", "walletpassphrase", &walletpassphrase, true, {"passphrase","timeout"} }, + { "wallet", "removeprunedfunds", &removeprunedfunds, true, {"txid"} }, }; void RegisterWalletRPCCommands(CRPCTable &t) diff --git a/src/wallet/rpcwallet.h b/src/wallet/rpcwallet.h index 3a68ccf1b2..bd5dad18ca 100644 --- a/src/wallet/rpcwallet.h +++ b/src/wallet/rpcwallet.h @@ -6,7 +6,20 @@ #define BITCOIN_WALLET_RPCWALLET_H class CRPCTable; +class JSONRPCRequest; void RegisterWalletRPCCommands(CRPCTable &t); +/** + * Figures out what wallet, if any, to use for a JSONRPCRequest. + * + * @param[in] request JSONRPCRequest that wishes to access a wallet + * @return NULL if no wallet should be used, or a pointer to the CWallet + */ +CWallet *GetWalletForJSONRPCRequest(const JSONRPCRequest&); + +std::string HelpRequiringPassphrase(CWallet *); +void EnsureWalletIsUnlocked(CWallet *); +bool EnsureWalletIsAvailable(CWallet *, bool avoidException); + #endif //BITCOIN_WALLET_RPCWALLET_H diff --git a/src/wallet/test/wallet_tests.cpp b/src/wallet/test/wallet_tests.cpp index c7ce6fd243..67e5e90224 100644 --- a/src/wallet/test/wallet_tests.cpp +++ b/src/wallet/test/wallet_tests.cpp @@ -9,10 +9,16 @@ #include <utility> #include <vector> +#include "rpc/server.h" +#include "test/test_bitcoin.h" +#include "validation.h" #include "wallet/test/wallet_test_fixture.h" #include <boost/foreach.hpp> #include <boost/test/unit_test.hpp> +#include <univalue.h> + +extern UniValue importmulti(const JSONRPCRequest& request); // how many times to run all the tests to have a chance to catch errors that only show up with particular random shuffles #define RUN_TESTS 100 @@ -21,14 +27,14 @@ // we repeat those tests this many times and only complain if all iterations of the test fail #define RANDOM_REPEATS 5 -using namespace std; +std::vector<std::unique_ptr<CWalletTx>> wtxn; -typedef set<pair<const CWalletTx*,unsigned int> > CoinSet; +typedef std::set<std::pair<const CWalletTx*,unsigned int> > CoinSet; BOOST_FIXTURE_TEST_SUITE(wallet_tests, WalletTestingSetup) -static const CWallet wallet; -static vector<COutput> vCoins; +static const CWallet testWallet; +static std::vector<COutput> vCoins; static void add_coin(const CAmount& nValue, int nAge = 6*24, bool fIsFromMe = false, int nInput=0) { @@ -42,26 +48,26 @@ static void add_coin(const CAmount& nValue, int nAge = 6*24, bool fIsFromMe = fa // so stop vin being empty, and cache a non-zero Debit to fake out IsFromMe() tx.vin.resize(1); } - CWalletTx* wtx = new CWalletTx(&wallet, MakeTransactionRef(std::move(tx))); + std::unique_ptr<CWalletTx> wtx(new CWalletTx(&testWallet, MakeTransactionRef(std::move(tx)))); if (fIsFromMe) { wtx->fDebitCached = true; wtx->nDebitCached = 1; } - COutput output(wtx, nInput, nAge, true, true); + COutput output(wtx.get(), nInput, nAge, true /* spendable */, true /* solvable */, true /* safe */); vCoins.push_back(output); + wtxn.emplace_back(std::move(wtx)); } static void empty_wallet(void) { - BOOST_FOREACH(COutput output, vCoins) - delete output.tx; vCoins.clear(); + wtxn.clear(); } static bool equal_sets(CoinSet a, CoinSet b) { - pair<CoinSet::iterator, CoinSet::iterator> ret = mismatch(a.begin(), a.end(), b.begin()); + std::pair<CoinSet::iterator, CoinSet::iterator> ret = mismatch(a.begin(), a.end(), b.begin()); return ret.first == a.end() && ret.second == b.end(); } @@ -70,7 +76,7 @@ BOOST_AUTO_TEST_CASE(coin_selection_tests) CoinSet setCoinsRet, setCoinsRet2; CAmount nValueRet; - LOCK(wallet.cs_wallet); + LOCK(testWallet.cs_wallet); // test multiple times to allow for differences in the shuffle order for (int i = 0; i < RUN_TESTS; i++) @@ -78,24 +84,24 @@ BOOST_AUTO_TEST_CASE(coin_selection_tests) empty_wallet(); // with an empty wallet we can't even pay one cent - BOOST_CHECK(!wallet.SelectCoinsMinConf( 1 * CENT, 1, 6, 0, vCoins, setCoinsRet, nValueRet)); + BOOST_CHECK(!testWallet.SelectCoinsMinConf( 1 * CENT, 1, 6, 0, vCoins, setCoinsRet, nValueRet)); add_coin(1*CENT, 4); // add a new 1 cent coin // with a new 1 cent coin, we still can't find a mature 1 cent - BOOST_CHECK(!wallet.SelectCoinsMinConf( 1 * CENT, 1, 6, 0, vCoins, setCoinsRet, nValueRet)); + BOOST_CHECK(!testWallet.SelectCoinsMinConf( 1 * CENT, 1, 6, 0, vCoins, setCoinsRet, nValueRet)); // but we can find a new 1 cent - BOOST_CHECK( wallet.SelectCoinsMinConf( 1 * CENT, 1, 1, 0, vCoins, setCoinsRet, nValueRet)); + BOOST_CHECK( testWallet.SelectCoinsMinConf( 1 * CENT, 1, 1, 0, vCoins, setCoinsRet, nValueRet)); BOOST_CHECK_EQUAL(nValueRet, 1 * CENT); add_coin(2*CENT); // add a mature 2 cent coin // we can't make 3 cents of mature coins - BOOST_CHECK(!wallet.SelectCoinsMinConf( 3 * CENT, 1, 6, 0, vCoins, setCoinsRet, nValueRet)); + BOOST_CHECK(!testWallet.SelectCoinsMinConf( 3 * CENT, 1, 6, 0, vCoins, setCoinsRet, nValueRet)); // we can make 3 cents of new coins - BOOST_CHECK( wallet.SelectCoinsMinConf( 3 * CENT, 1, 1, 0, vCoins, setCoinsRet, nValueRet)); + BOOST_CHECK( testWallet.SelectCoinsMinConf( 3 * CENT, 1, 1, 0, vCoins, setCoinsRet, nValueRet)); BOOST_CHECK_EQUAL(nValueRet, 3 * CENT); add_coin(5*CENT); // add a mature 5 cent coin, @@ -105,33 +111,33 @@ BOOST_AUTO_TEST_CASE(coin_selection_tests) // now we have new: 1+10=11 (of which 10 was self-sent), and mature: 2+5+20=27. total = 38 // we can't make 38 cents only if we disallow new coins: - BOOST_CHECK(!wallet.SelectCoinsMinConf(38 * CENT, 1, 6, 0, vCoins, setCoinsRet, nValueRet)); + BOOST_CHECK(!testWallet.SelectCoinsMinConf(38 * CENT, 1, 6, 0, vCoins, setCoinsRet, nValueRet)); // we can't even make 37 cents if we don't allow new coins even if they're from us - BOOST_CHECK(!wallet.SelectCoinsMinConf(38 * CENT, 6, 6, 0, vCoins, setCoinsRet, nValueRet)); + BOOST_CHECK(!testWallet.SelectCoinsMinConf(38 * CENT, 6, 6, 0, vCoins, setCoinsRet, nValueRet)); // but we can make 37 cents if we accept new coins from ourself - BOOST_CHECK( wallet.SelectCoinsMinConf(37 * CENT, 1, 6, 0, vCoins, setCoinsRet, nValueRet)); + BOOST_CHECK( testWallet.SelectCoinsMinConf(37 * CENT, 1, 6, 0, vCoins, setCoinsRet, nValueRet)); BOOST_CHECK_EQUAL(nValueRet, 37 * CENT); // and we can make 38 cents if we accept all new coins - BOOST_CHECK( wallet.SelectCoinsMinConf(38 * CENT, 1, 1, 0, vCoins, setCoinsRet, nValueRet)); + BOOST_CHECK( testWallet.SelectCoinsMinConf(38 * CENT, 1, 1, 0, vCoins, setCoinsRet, nValueRet)); BOOST_CHECK_EQUAL(nValueRet, 38 * CENT); // try making 34 cents from 1,2,5,10,20 - we can't do it exactly - BOOST_CHECK( wallet.SelectCoinsMinConf(34 * CENT, 1, 1, 0, vCoins, setCoinsRet, nValueRet)); + BOOST_CHECK( testWallet.SelectCoinsMinConf(34 * CENT, 1, 1, 0, vCoins, setCoinsRet, nValueRet)); BOOST_CHECK_EQUAL(nValueRet, 35 * CENT); // but 35 cents is closest BOOST_CHECK_EQUAL(setCoinsRet.size(), 3U); // the best should be 20+10+5. it's incredibly unlikely the 1 or 2 got included (but possible) // when we try making 7 cents, the smaller coins (1,2,5) are enough. We should see just 2+5 - BOOST_CHECK( wallet.SelectCoinsMinConf( 7 * CENT, 1, 1, 0, vCoins, setCoinsRet, nValueRet)); + BOOST_CHECK( testWallet.SelectCoinsMinConf( 7 * CENT, 1, 1, 0, vCoins, setCoinsRet, nValueRet)); BOOST_CHECK_EQUAL(nValueRet, 7 * CENT); BOOST_CHECK_EQUAL(setCoinsRet.size(), 2U); // when we try making 8 cents, the smaller coins (1,2,5) are exactly enough. - BOOST_CHECK( wallet.SelectCoinsMinConf( 8 * CENT, 1, 1, 0, vCoins, setCoinsRet, nValueRet)); + BOOST_CHECK( testWallet.SelectCoinsMinConf( 8 * CENT, 1, 1, 0, vCoins, setCoinsRet, nValueRet)); BOOST_CHECK(nValueRet == 8 * CENT); BOOST_CHECK_EQUAL(setCoinsRet.size(), 3U); // when we try making 9 cents, no subset of smaller coins is enough, and we get the next bigger coin (10) - BOOST_CHECK( wallet.SelectCoinsMinConf( 9 * CENT, 1, 1, 0, vCoins, setCoinsRet, nValueRet)); + BOOST_CHECK( testWallet.SelectCoinsMinConf( 9 * CENT, 1, 1, 0, vCoins, setCoinsRet, nValueRet)); BOOST_CHECK_EQUAL(nValueRet, 10 * CENT); BOOST_CHECK_EQUAL(setCoinsRet.size(), 1U); @@ -145,30 +151,30 @@ BOOST_AUTO_TEST_CASE(coin_selection_tests) add_coin(30*CENT); // now we have 6+7+8+20+30 = 71 cents total // check that we have 71 and not 72 - BOOST_CHECK( wallet.SelectCoinsMinConf(71 * CENT, 1, 1, 0, vCoins, setCoinsRet, nValueRet)); - BOOST_CHECK(!wallet.SelectCoinsMinConf(72 * CENT, 1, 1, 0, vCoins, setCoinsRet, nValueRet)); + BOOST_CHECK( testWallet.SelectCoinsMinConf(71 * CENT, 1, 1, 0, vCoins, setCoinsRet, nValueRet)); + BOOST_CHECK(!testWallet.SelectCoinsMinConf(72 * CENT, 1, 1, 0, vCoins, setCoinsRet, nValueRet)); // now try making 16 cents. the best smaller coins can do is 6+7+8 = 21; not as good at the next biggest coin, 20 - BOOST_CHECK( wallet.SelectCoinsMinConf(16 * CENT, 1, 1, 0, vCoins, setCoinsRet, nValueRet)); + BOOST_CHECK( testWallet.SelectCoinsMinConf(16 * CENT, 1, 1, 0, vCoins, setCoinsRet, nValueRet)); BOOST_CHECK_EQUAL(nValueRet, 20 * CENT); // we should get 20 in one coin BOOST_CHECK_EQUAL(setCoinsRet.size(), 1U); add_coin( 5*CENT); // now we have 5+6+7+8+20+30 = 75 cents total // now if we try making 16 cents again, the smaller coins can make 5+6+7 = 18 cents, better than the next biggest coin, 20 - BOOST_CHECK( wallet.SelectCoinsMinConf(16 * CENT, 1, 1, 0, vCoins, setCoinsRet, nValueRet)); + BOOST_CHECK( testWallet.SelectCoinsMinConf(16 * CENT, 1, 1, 0, vCoins, setCoinsRet, nValueRet)); BOOST_CHECK_EQUAL(nValueRet, 18 * CENT); // we should get 18 in 3 coins BOOST_CHECK_EQUAL(setCoinsRet.size(), 3U); add_coin( 18*CENT); // now we have 5+6+7+8+18+20+30 // and now if we try making 16 cents again, the smaller coins can make 5+6+7 = 18 cents, the same as the next biggest coin, 18 - BOOST_CHECK( wallet.SelectCoinsMinConf(16 * CENT, 1, 1, 0, vCoins, setCoinsRet, nValueRet)); + BOOST_CHECK( testWallet.SelectCoinsMinConf(16 * CENT, 1, 1, 0, vCoins, setCoinsRet, nValueRet)); BOOST_CHECK_EQUAL(nValueRet, 18 * CENT); // we should get 18 in 1 coin BOOST_CHECK_EQUAL(setCoinsRet.size(), 1U); // because in the event of a tie, the biggest coin wins // now try making 11 cents. we should get 5+6 - BOOST_CHECK( wallet.SelectCoinsMinConf(11 * CENT, 1, 1, 0, vCoins, setCoinsRet, nValueRet)); + BOOST_CHECK( testWallet.SelectCoinsMinConf(11 * CENT, 1, 1, 0, vCoins, setCoinsRet, nValueRet)); BOOST_CHECK_EQUAL(nValueRet, 11 * CENT); BOOST_CHECK_EQUAL(setCoinsRet.size(), 2U); @@ -177,11 +183,11 @@ BOOST_AUTO_TEST_CASE(coin_selection_tests) add_coin( 2*COIN); add_coin( 3*COIN); add_coin( 4*COIN); // now we have 5+6+7+8+18+20+30+100+200+300+400 = 1094 cents - BOOST_CHECK( wallet.SelectCoinsMinConf(95 * CENT, 1, 1, 0, vCoins, setCoinsRet, nValueRet)); + BOOST_CHECK( testWallet.SelectCoinsMinConf(95 * CENT, 1, 1, 0, vCoins, setCoinsRet, nValueRet)); BOOST_CHECK_EQUAL(nValueRet, 1 * COIN); // we should get 1 BTC in 1 coin BOOST_CHECK_EQUAL(setCoinsRet.size(), 1U); - BOOST_CHECK( wallet.SelectCoinsMinConf(195 * CENT, 1, 1, 0, vCoins, setCoinsRet, nValueRet)); + BOOST_CHECK( testWallet.SelectCoinsMinConf(195 * CENT, 1, 1, 0, vCoins, setCoinsRet, nValueRet)); BOOST_CHECK_EQUAL(nValueRet, 2 * COIN); // we should get 2 BTC in 1 coin BOOST_CHECK_EQUAL(setCoinsRet.size(), 1U); @@ -196,14 +202,14 @@ BOOST_AUTO_TEST_CASE(coin_selection_tests) // try making 1 * MIN_CHANGE from the 1.5 * MIN_CHANGE // we'll get change smaller than MIN_CHANGE whatever happens, so can expect MIN_CHANGE exactly - BOOST_CHECK( wallet.SelectCoinsMinConf(MIN_CHANGE, 1, 1, 0, vCoins, setCoinsRet, nValueRet)); + BOOST_CHECK( testWallet.SelectCoinsMinConf(MIN_CHANGE, 1, 1, 0, vCoins, setCoinsRet, nValueRet)); BOOST_CHECK_EQUAL(nValueRet, MIN_CHANGE); // but if we add a bigger coin, small change is avoided add_coin(1111*MIN_CHANGE); // try making 1 from 0.1 + 0.2 + 0.3 + 0.4 + 0.5 + 1111 = 1112.5 - BOOST_CHECK( wallet.SelectCoinsMinConf(1 * MIN_CHANGE, 1, 1, 0, vCoins, setCoinsRet, nValueRet)); + BOOST_CHECK( testWallet.SelectCoinsMinConf(1 * MIN_CHANGE, 1, 1, 0, vCoins, setCoinsRet, nValueRet)); BOOST_CHECK_EQUAL(nValueRet, 1 * MIN_CHANGE); // we should get the exact amount // if we add more small coins: @@ -211,7 +217,7 @@ BOOST_AUTO_TEST_CASE(coin_selection_tests) add_coin(MIN_CHANGE * 7 / 10); // and try again to make 1.0 * MIN_CHANGE - BOOST_CHECK( wallet.SelectCoinsMinConf(1 * MIN_CHANGE, 1, 1, 0, vCoins, setCoinsRet, nValueRet)); + BOOST_CHECK( testWallet.SelectCoinsMinConf(1 * MIN_CHANGE, 1, 1, 0, vCoins, setCoinsRet, nValueRet)); BOOST_CHECK_EQUAL(nValueRet, 1 * MIN_CHANGE); // we should get the exact amount // run the 'mtgox' test (see http://blockexplorer.com/tx/29a3efd3ef04f9153d47a990bd7b048a4b2d213daaa5fb8ed670fb85f13bdbcf) @@ -220,7 +226,7 @@ BOOST_AUTO_TEST_CASE(coin_selection_tests) for (int j = 0; j < 20; j++) add_coin(50000 * COIN); - BOOST_CHECK( wallet.SelectCoinsMinConf(500000 * COIN, 1, 1, 0, vCoins, setCoinsRet, nValueRet)); + BOOST_CHECK( testWallet.SelectCoinsMinConf(500000 * COIN, 1, 1, 0, vCoins, setCoinsRet, nValueRet)); BOOST_CHECK_EQUAL(nValueRet, 500000 * COIN); // we should get the exact amount BOOST_CHECK_EQUAL(setCoinsRet.size(), 10U); // in ten coins @@ -233,7 +239,7 @@ BOOST_AUTO_TEST_CASE(coin_selection_tests) add_coin(MIN_CHANGE * 6 / 10); add_coin(MIN_CHANGE * 7 / 10); add_coin(1111 * MIN_CHANGE); - BOOST_CHECK( wallet.SelectCoinsMinConf(1 * MIN_CHANGE, 1, 1, 0, vCoins, setCoinsRet, nValueRet)); + BOOST_CHECK( testWallet.SelectCoinsMinConf(1 * MIN_CHANGE, 1, 1, 0, vCoins, setCoinsRet, nValueRet)); BOOST_CHECK_EQUAL(nValueRet, 1111 * MIN_CHANGE); // we get the bigger coin BOOST_CHECK_EQUAL(setCoinsRet.size(), 1U); @@ -243,7 +249,7 @@ BOOST_AUTO_TEST_CASE(coin_selection_tests) add_coin(MIN_CHANGE * 6 / 10); add_coin(MIN_CHANGE * 8 / 10); add_coin(1111 * MIN_CHANGE); - BOOST_CHECK( wallet.SelectCoinsMinConf(MIN_CHANGE, 1, 1, 0, vCoins, setCoinsRet, nValueRet)); + BOOST_CHECK( testWallet.SelectCoinsMinConf(MIN_CHANGE, 1, 1, 0, vCoins, setCoinsRet, nValueRet)); BOOST_CHECK_EQUAL(nValueRet, MIN_CHANGE); // we should get the exact amount BOOST_CHECK_EQUAL(setCoinsRet.size(), 2U); // in two coins 0.4+0.6 @@ -254,12 +260,12 @@ BOOST_AUTO_TEST_CASE(coin_selection_tests) add_coin(MIN_CHANGE * 100); // trying to make 100.01 from these three coins - BOOST_CHECK(wallet.SelectCoinsMinConf(MIN_CHANGE * 10001 / 100, 1, 1, 0, vCoins, setCoinsRet, nValueRet)); + BOOST_CHECK(testWallet.SelectCoinsMinConf(MIN_CHANGE * 10001 / 100, 1, 1, 0, vCoins, setCoinsRet, nValueRet)); BOOST_CHECK_EQUAL(nValueRet, MIN_CHANGE * 10105 / 100); // we should get all coins BOOST_CHECK_EQUAL(setCoinsRet.size(), 3U); // but if we try to make 99.9, we should take the bigger of the two small coins to avoid small change - BOOST_CHECK(wallet.SelectCoinsMinConf(MIN_CHANGE * 9990 / 100, 1, 1, 0, vCoins, setCoinsRet, nValueRet)); + BOOST_CHECK(testWallet.SelectCoinsMinConf(MIN_CHANGE * 9990 / 100, 1, 1, 0, vCoins, setCoinsRet, nValueRet)); BOOST_CHECK_EQUAL(nValueRet, 101 * MIN_CHANGE); BOOST_CHECK_EQUAL(setCoinsRet.size(), 2U); @@ -269,7 +275,7 @@ BOOST_AUTO_TEST_CASE(coin_selection_tests) // Create 676 inputs (= (old MAX_STANDARD_TX_SIZE == 100000) / 148 bytes per input) for (uint16_t j = 0; j < 676; j++) add_coin(amt); - BOOST_CHECK(wallet.SelectCoinsMinConf(2000, 1, 1, 0, vCoins, setCoinsRet, nValueRet)); + BOOST_CHECK(testWallet.SelectCoinsMinConf(2000, 1, 1, 0, vCoins, setCoinsRet, nValueRet)); if (amt - 2000 < MIN_CHANGE) { // needs more than one input: uint16_t returnSize = std::ceil((2000.0 + MIN_CHANGE)/amt); @@ -291,8 +297,8 @@ BOOST_AUTO_TEST_CASE(coin_selection_tests) // picking 50 from 100 coins doesn't depend on the shuffle, // but does depend on randomness in the stochastic approximation code - BOOST_CHECK(wallet.SelectCoinsMinConf(50 * COIN, 1, 6, 0, vCoins, setCoinsRet , nValueRet)); - BOOST_CHECK(wallet.SelectCoinsMinConf(50 * COIN, 1, 6, 0, vCoins, setCoinsRet2, nValueRet)); + BOOST_CHECK(testWallet.SelectCoinsMinConf(50 * COIN, 1, 6, 0, vCoins, setCoinsRet , nValueRet)); + BOOST_CHECK(testWallet.SelectCoinsMinConf(50 * COIN, 1, 6, 0, vCoins, setCoinsRet2, nValueRet)); BOOST_CHECK(!equal_sets(setCoinsRet, setCoinsRet2)); int fails = 0; @@ -300,8 +306,8 @@ BOOST_AUTO_TEST_CASE(coin_selection_tests) { // selecting 1 from 100 identical coins depends on the shuffle; this test will fail 1% of the time // run the test RANDOM_REPEATS times and only complain if all of them fail - BOOST_CHECK(wallet.SelectCoinsMinConf(COIN, 1, 6, 0, vCoins, setCoinsRet , nValueRet)); - BOOST_CHECK(wallet.SelectCoinsMinConf(COIN, 1, 6, 0, vCoins, setCoinsRet2, nValueRet)); + BOOST_CHECK(testWallet.SelectCoinsMinConf(COIN, 1, 6, 0, vCoins, setCoinsRet , nValueRet)); + BOOST_CHECK(testWallet.SelectCoinsMinConf(COIN, 1, 6, 0, vCoins, setCoinsRet2, nValueRet)); if (equal_sets(setCoinsRet, setCoinsRet2)) fails++; } @@ -321,8 +327,8 @@ BOOST_AUTO_TEST_CASE(coin_selection_tests) { // selecting 1 from 100 identical coins depends on the shuffle; this test will fail 1% of the time // run the test RANDOM_REPEATS times and only complain if all of them fail - BOOST_CHECK(wallet.SelectCoinsMinConf(90*CENT, 1, 6, 0, vCoins, setCoinsRet , nValueRet)); - BOOST_CHECK(wallet.SelectCoinsMinConf(90*CENT, 1, 6, 0, vCoins, setCoinsRet2, nValueRet)); + BOOST_CHECK(testWallet.SelectCoinsMinConf(90*CENT, 1, 6, 0, vCoins, setCoinsRet , nValueRet)); + BOOST_CHECK(testWallet.SelectCoinsMinConf(90*CENT, 1, 6, 0, vCoins, setCoinsRet2, nValueRet)); if (equal_sets(setCoinsRet, setCoinsRet2)) fails++; } @@ -337,7 +343,7 @@ BOOST_AUTO_TEST_CASE(ApproximateBestSubset) CoinSet setCoinsRet; CAmount nValueRet; - LOCK(wallet.cs_wallet); + LOCK(testWallet.cs_wallet); empty_wallet(); @@ -346,9 +352,156 @@ BOOST_AUTO_TEST_CASE(ApproximateBestSubset) add_coin(1000 * COIN); add_coin(3 * COIN); - BOOST_CHECK(wallet.SelectCoinsMinConf(1003 * COIN, 1, 6, 0, vCoins, setCoinsRet, nValueRet)); + BOOST_CHECK(testWallet.SelectCoinsMinConf(1003 * COIN, 1, 6, 0, vCoins, setCoinsRet, nValueRet)); BOOST_CHECK_EQUAL(nValueRet, 1003 * COIN); BOOST_CHECK_EQUAL(setCoinsRet.size(), 2U); + + empty_wallet(); +} + +BOOST_FIXTURE_TEST_CASE(rescan, TestChain100Setup) +{ + LOCK(cs_main); + + // Cap last block file size, and mine new block in a new block file. + CBlockIndex* oldTip = chainActive.Tip(); + GetBlockFileInfo(oldTip->GetBlockPos().nFile)->nSize = MAX_BLOCKFILE_SIZE; + CreateAndProcessBlock({}, GetScriptForRawPubKey(coinbaseKey.GetPubKey())); + CBlockIndex* newTip = chainActive.Tip(); + + // Verify ScanForWalletTransactions picks up transactions in both the old + // and new block files. + { + CWallet wallet; + LOCK(wallet.cs_wallet); + wallet.AddKeyPubKey(coinbaseKey, coinbaseKey.GetPubKey()); + BOOST_CHECK_EQUAL(oldTip, wallet.ScanForWalletTransactions(oldTip)); + BOOST_CHECK_EQUAL(wallet.GetImmatureBalance(), 100 * COIN); + } + + // Prune the older block file. + PruneOneBlockFile(oldTip->GetBlockPos().nFile); + UnlinkPrunedFiles({oldTip->GetBlockPos().nFile}); + + // Verify ScanForWalletTransactions only picks transactions in the new block + // file. + { + CWallet wallet; + LOCK(wallet.cs_wallet); + wallet.AddKeyPubKey(coinbaseKey, coinbaseKey.GetPubKey()); + BOOST_CHECK_EQUAL(newTip, wallet.ScanForWalletTransactions(oldTip)); + BOOST_CHECK_EQUAL(wallet.GetImmatureBalance(), 50 * COIN); + } + + // Verify importmulti RPC returns failure for a key whose creation time is + // before the missing block, and success for a key whose creation time is + // after. + { + CWallet wallet; + CWallet *backup = ::pwalletMain; + ::pwalletMain = &wallet; + UniValue keys; + keys.setArray(); + UniValue key; + key.setObject(); + key.pushKV("scriptPubKey", HexStr(GetScriptForRawPubKey(coinbaseKey.GetPubKey()))); + key.pushKV("timestamp", 0); + key.pushKV("internal", UniValue(true)); + keys.push_back(key); + key.clear(); + key.setObject(); + CKey futureKey; + futureKey.MakeNewKey(true); + key.pushKV("scriptPubKey", HexStr(GetScriptForRawPubKey(futureKey.GetPubKey()))); + key.pushKV("timestamp", newTip->GetBlockTimeMax() + TIMESTAMP_WINDOW); + key.pushKV("internal", UniValue(true)); + keys.push_back(key); + JSONRPCRequest request; + request.params.setArray(); + request.params.push_back(keys); + + UniValue response = importmulti(request); + BOOST_CHECK_EQUAL(response.write(), strprintf("[{\"success\":false,\"error\":{\"code\":-1,\"message\":\"Failed to rescan before time %d, transactions may be missing.\"}},{\"success\":true}]", newTip->GetBlockTimeMax())); + ::pwalletMain = backup; + } +} + +// Check that GetImmatureCredit() returns a newly calculated value instead of +// the cached value after a MarkDirty() call. +// +// This is a regression test written to verify a bugfix for the immature credit +// function. Similar tests probably should be written for the other credit and +// debit functions. +BOOST_FIXTURE_TEST_CASE(coin_mark_dirty_immature_credit, TestChain100Setup) +{ + CWallet wallet; + CWalletTx wtx(&wallet, MakeTransactionRef(coinbaseTxns.back())); + LOCK2(cs_main, wallet.cs_wallet); + wtx.hashBlock = chainActive.Tip()->GetBlockHash(); + wtx.nIndex = 0; + + // Call GetImmatureCredit() once before adding the key to the wallet to + // cache the current immature credit amount, which is 0. + BOOST_CHECK_EQUAL(wtx.GetImmatureCredit(), 0); + + // Invalidate the cached value, add the key, and make sure a new immature + // credit amount is calculated. + wtx.MarkDirty(); + wallet.AddKeyPubKey(coinbaseKey, coinbaseKey.GetPubKey()); + BOOST_CHECK_EQUAL(wtx.GetImmatureCredit(), 50*COIN); +} + +static int64_t AddTx(CWallet& wallet, uint32_t lockTime, int64_t mockTime, int64_t blockTime) +{ + CMutableTransaction tx; + tx.nLockTime = lockTime; + SetMockTime(mockTime); + CBlockIndex* block = nullptr; + if (blockTime > 0) { + auto inserted = mapBlockIndex.emplace(GetRandHash(), new CBlockIndex); + assert(inserted.second); + const uint256& hash = inserted.first->first; + block = inserted.first->second; + block->nTime = blockTime; + block->phashBlock = &hash; + } + + CWalletTx wtx(&wallet, MakeTransactionRef(tx)); + if (block) { + wtx.SetMerkleBranch(block, 0); + } + wallet.AddToWallet(wtx); + return wallet.mapWallet.at(wtx.GetHash()).nTimeSmart; +} + +// Simple test to verify assignment of CWalletTx::nSmartTime value. Could be +// expanded to cover more corner cases of smart time logic. +BOOST_AUTO_TEST_CASE(ComputeTimeSmart) +{ + CWallet wallet; + + // New transaction should use clock time if lower than block time. + BOOST_CHECK_EQUAL(AddTx(wallet, 1, 100, 120), 100); + + // Test that updating existing transaction does not change smart time. + BOOST_CHECK_EQUAL(AddTx(wallet, 1, 200, 220), 100); + + // New transaction should use clock time if there's no block time. + BOOST_CHECK_EQUAL(AddTx(wallet, 2, 300, 0), 300); + + // New transaction should use block time if lower than clock time. + BOOST_CHECK_EQUAL(AddTx(wallet, 3, 420, 400), 400); + + // New transaction should use latest entry time if higher than + // min(block time, clock time). + BOOST_CHECK_EQUAL(AddTx(wallet, 4, 500, 390), 400); + + // If there are future entries, new transaction should use time of the + // newest entry that is no more than 300 seconds ahead of the clock time. + BOOST_CHECK_EQUAL(AddTx(wallet, 5, 50, 600), 300); + + // Reset mock time for other tests. + SetMockTime(0); } BOOST_AUTO_TEST_SUITE_END() diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp index 2775f4def3..9e3c8be3f2 100644 --- a/src/wallet/wallet.cpp +++ b/src/wallet/wallet.cpp @@ -20,6 +20,7 @@ #include "primitives/transaction.h" #include "script/script.h" #include "script/sign.h" +#include "scheduler.h" #include "timedata.h" #include "txmempool.h" #include "util.h" @@ -32,14 +33,11 @@ #include <boost/filesystem.hpp> #include <boost/thread.hpp> -using namespace std; - CWallet* pwalletMain = NULL; /** Transaction fee set by the user */ CFeeRate payTxFee(DEFAULT_TRANSACTION_FEE); unsigned int nTxConfirmTarget = DEFAULT_TX_CONFIRM_TARGET; bool bSpendZeroConfChange = DEFAULT_SPEND_ZEROCONF_CHANGE; -bool fSendFreeTransactions = DEFAULT_SEND_FREE_TRANSACTIONS; bool fWalletRbf = DEFAULT_WALLET_RBF; const char * DEFAULT_WALLET_DAT = "wallet.dat"; @@ -66,8 +64,8 @@ const uint256 CMerkleTx::ABANDON_HASH(uint256S("00000000000000000000000000000000 struct CompareValueOnly { - bool operator()(const pair<CAmount, pair<const CWalletTx*, unsigned int> >& t1, - const pair<CAmount, pair<const CWalletTx*, unsigned int> >& t2) const + bool operator()(const std::pair<CAmount, std::pair<const CWalletTx*, unsigned int> >& t1, + const std::pair<CAmount, std::pair<const CWalletTx*, unsigned int> >& t2) const { return t1.first < t2.first; } @@ -113,8 +111,7 @@ CPubKey CWallet::GenerateNewKey() assert(secret.VerifyPubKey(pubkey)); mapKeyMetadata[pubkey.GetID()] = metadata; - if (!nTimeFirstKey || nCreationTime < nTimeFirstKey) - nTimeFirstKey = nCreationTime; + UpdateTimeFirstKey(nCreationTime); if (!AddKeyPubKey(secret, pubkey)) throw std::runtime_error(std::string(__func__) + ": AddKey failed"); @@ -187,7 +184,7 @@ bool CWallet::AddKeyPubKey(const CKey& secret, const CPubKey &pubkey) } bool CWallet::AddCryptedKey(const CPubKey &vchPubKey, - const vector<unsigned char> &vchCryptedSecret) + const std::vector<unsigned char> &vchCryptedSecret) { if (!CCryptoKeyStore::AddCryptedKey(vchPubKey, vchCryptedSecret)) return false; @@ -207,13 +204,11 @@ bool CWallet::AddCryptedKey(const CPubKey &vchPubKey, return false; } -bool CWallet::LoadKeyMetadata(const CPubKey &pubkey, const CKeyMetadata &meta) +bool CWallet::LoadKeyMetadata(const CTxDestination& keyID, const CKeyMetadata &meta) { AssertLockHeld(cs_wallet); // mapKeyMetadata - if (meta.nCreateTime && (!nTimeFirstKey || meta.nCreateTime < nTimeFirstKey)) - nTimeFirstKey = meta.nCreateTime; - - mapKeyMetadata[pubkey.GetID()] = meta; + UpdateTimeFirstKey(meta.nCreateTime); + mapKeyMetadata[keyID] = meta; return true; } @@ -222,6 +217,18 @@ bool CWallet::LoadCryptedKey(const CPubKey &vchPubKey, const std::vector<unsigne return CCryptoKeyStore::AddCryptedKey(vchPubKey, vchCryptedSecret); } +void CWallet::UpdateTimeFirstKey(int64_t nCreateTime) +{ + AssertLockHeld(cs_wallet); + if (nCreateTime <= 1) { + // Cannot determine birthday information, so set the wallet birthday to + // the beginning of time. + nTimeFirstKey = 1; + } else if (!nTimeFirstKey || nCreateTime < nTimeFirstKey) { + nTimeFirstKey = nCreateTime; + } +} + bool CWallet::AddCScript(const CScript& redeemScript) { if (!CCryptoKeyStore::AddCScript(redeemScript)) @@ -247,15 +254,22 @@ bool CWallet::LoadCScript(const CScript& redeemScript) return CCryptoKeyStore::AddCScript(redeemScript); } -bool CWallet::AddWatchOnly(const CScript &dest) +bool CWallet::AddWatchOnly(const CScript& dest) { if (!CCryptoKeyStore::AddWatchOnly(dest)) return false; - nTimeFirstKey = 1; // No birthday information for watch-only keys. + const CKeyMetadata& meta = mapKeyMetadata[CScriptID(dest)]; + UpdateTimeFirstKey(meta.nCreateTime); NotifyWatchonlyChanged(true); if (!fFileBacked) return true; - return CWalletDB(strWalletFile).WriteWatchOnly(dest); + return CWalletDB(strWalletFile).WriteWatchOnly(dest, meta); +} + +bool CWallet::AddWatchOnly(const CScript& dest, int64_t nCreateTime) +{ + mapKeyMetadata[CScriptID(dest)].nCreateTime = nCreateTime; + return AddWatchOnly(dest); } bool CWallet::RemoveWatchOnly(const CScript &dest) @@ -280,7 +294,7 @@ bool CWallet::LoadWatchOnly(const CScript &dest) bool CWallet::Unlock(const SecureString& strWalletPassphrase) { CCrypter crypter; - CKeyingMaterial vMasterKey; + CKeyingMaterial _vMasterKey; { LOCK(cs_wallet); @@ -288,9 +302,9 @@ bool CWallet::Unlock(const SecureString& strWalletPassphrase) { if(!crypter.SetKeyFromPassphrase(strWalletPassphrase, pMasterKey.second.vchSalt, pMasterKey.second.nDeriveIterations, pMasterKey.second.nDerivationMethod)) return false; - if (!crypter.Decrypt(pMasterKey.second.vchCryptedKey, vMasterKey)) + if (!crypter.Decrypt(pMasterKey.second.vchCryptedKey, _vMasterKey)) continue; // try another master key - if (CCryptoKeyStore::Unlock(vMasterKey)) + if (CCryptoKeyStore::Unlock(_vMasterKey)) return true; } } @@ -306,14 +320,14 @@ bool CWallet::ChangeWalletPassphrase(const SecureString& strOldWalletPassphrase, Lock(); CCrypter crypter; - CKeyingMaterial vMasterKey; + CKeyingMaterial _vMasterKey; BOOST_FOREACH(MasterKeyMap::value_type& pMasterKey, mapMasterKeys) { if(!crypter.SetKeyFromPassphrase(strOldWalletPassphrase, pMasterKey.second.vchSalt, pMasterKey.second.nDeriveIterations, pMasterKey.second.nDerivationMethod)) return false; - if (!crypter.Decrypt(pMasterKey.second.vchCryptedKey, vMasterKey)) + if (!crypter.Decrypt(pMasterKey.second.vchCryptedKey, _vMasterKey)) return false; - if (CCryptoKeyStore::Unlock(vMasterKey)) + if (CCryptoKeyStore::Unlock(_vMasterKey)) { int64_t nStartTime = GetTimeMillis(); crypter.SetKeyFromPassphrase(strNewWalletPassphrase, pMasterKey.second.vchSalt, pMasterKey.second.nDeriveIterations, pMasterKey.second.nDerivationMethod); @@ -330,7 +344,7 @@ bool CWallet::ChangeWalletPassphrase(const SecureString& strOldWalletPassphrase, if (!crypter.SetKeyFromPassphrase(strNewWalletPassphrase, pMasterKey.second.vchSalt, pMasterKey.second.nDeriveIterations, pMasterKey.second.nDerivationMethod)) return false; - if (!crypter.Encrypt(vMasterKey, pMasterKey.second.vchCryptedKey)) + if (!crypter.Encrypt(_vMasterKey, pMasterKey.second.vchCryptedKey)) return false; CWalletDB(strWalletFile).WriteMasterKey(pMasterKey.first, pMasterKey.second); if (fWasLocked) @@ -388,9 +402,9 @@ bool CWallet::SetMaxVersion(int nVersion) return true; } -set<uint256> CWallet::GetConflicts(const uint256& txid) const +std::set<uint256> CWallet::GetConflicts(const uint256& txid) const { - set<uint256> result; + std::set<uint256> result; AssertLockHeld(cs_wallet); std::map<uint256, CWalletTx>::const_iterator it = mapWallet.find(txid); @@ -411,6 +425,13 @@ set<uint256> CWallet::GetConflicts(const uint256& txid) const return result; } +bool CWallet::HasWalletSpend(const uint256& txid) const +{ + AssertLockHeld(cs_wallet); + auto iter = mapTxSpends.lower_bound(COutPoint(txid, 0)); + return (iter != mapTxSpends.end() && iter->first.hash == txid); +} + void CWallet::Flush(bool shutdown) { bitdb.Flush(shutdown); @@ -421,61 +442,34 @@ bool CWallet::Verify() if (GetBoolArg("-disablewallet", DEFAULT_DISABLE_WALLET)) return true; - LogPrintf("Using BerkeleyDB version %s\n", DbEnv::version(0, 0, 0)); - std::string walletFile = GetArg("-wallet", DEFAULT_WALLET_DAT); - - LogPrintf("Using wallet %s\n", walletFile); uiInterface.InitMessage(_("Verifying wallet...")); + std::string walletFile = GetArg("-wallet", DEFAULT_WALLET_DAT); - // Wallet file must be a plain filename without a directory - if (walletFile != boost::filesystem::basename(walletFile) + boost::filesystem::extension(walletFile)) - return InitError(strprintf(_("Wallet %s resides outside data directory %s"), walletFile, GetDataDir().string())); + std::string strError; + if (!CWalletDB::VerifyEnvironment(walletFile, GetDataDir().string(), strError)) + return InitError(strError); - if (!bitdb.Open(GetDataDir())) - { - // try moving the database env out of the way - boost::filesystem::path pathDatabase = GetDataDir() / "database"; - boost::filesystem::path pathDatabaseBak = GetDataDir() / strprintf("database.%d.bak", GetTime()); - try { - boost::filesystem::rename(pathDatabase, pathDatabaseBak); - LogPrintf("Moved old %s to %s. Retrying.\n", pathDatabase.string(), pathDatabaseBak.string()); - } catch (const boost::filesystem::filesystem_error&) { - // failure is ok (well, not really, but it's not worse than what we started with) - } - - // try again - if (!bitdb.Open(GetDataDir())) { - // if it still fails, it probably means we can't even create the database env - return InitError(strprintf(_("Error initializing wallet database environment %s!"), GetDataDir())); - } - } - if (GetBoolArg("-salvagewallet", false)) { // Recover readable keypairs: - if (!CWalletDB::Recover(bitdb, walletFile, true)) + CWallet dummyWallet; + if (!CWalletDB::Recover(walletFile, (void *)&dummyWallet, CWalletDB::RecoverKeysOnlyFilter)) return false; } - - if (boost::filesystem::exists(GetDataDir() / walletFile)) + + std::string strWarning; + bool dbV = CWalletDB::VerifyDatabaseFile(walletFile, GetDataDir().string(), strWarning, strError); + if (!strWarning.empty()) + InitWarning(strWarning); + if (!dbV) { - CDBEnv::VerifyResult r = bitdb.Verify(walletFile, CWalletDB::Recover); - if (r == CDBEnv::RECOVER_OK) - { - InitWarning(strprintf(_("Warning: Wallet file corrupt, data salvaged!" - " Original %s saved as %s in %s; if" - " your balance or transactions are incorrect you should" - " restore from a backup."), - walletFile, "wallet.{timestamp}.bak", GetDataDir())); - } - if (r == CDBEnv::RECOVER_FAIL) - return InitError(strprintf(_("%s corrupt, salvage failed"), walletFile)); + InitError(strError); + return false; } - return true; } -void CWallet::SyncMetaData(pair<TxSpends::iterator, TxSpends::iterator> range) +void CWallet::SyncMetaData(std::pair<TxSpends::iterator, TxSpends::iterator> range) { // We want all the wallet transactions in range to have the same metadata as // the oldest (smallest nOrderPos). @@ -519,7 +513,7 @@ void CWallet::SyncMetaData(pair<TxSpends::iterator, TxSpends::iterator> range) bool CWallet::IsSpent(const uint256& hash, unsigned int n) const { const COutPoint outpoint(hash, n); - pair<TxSpends::const_iterator, TxSpends::const_iterator> range; + std::pair<TxSpends::const_iterator, TxSpends::const_iterator> range; range = mapTxSpends.equal_range(outpoint); for (TxSpends::const_iterator it = range.first; it != range.second; ++it) @@ -537,9 +531,9 @@ bool CWallet::IsSpent(const uint256& hash, unsigned int n) const void CWallet::AddToSpends(const COutPoint& outpoint, const uint256& wtxid) { - mapTxSpends.insert(make_pair(outpoint, wtxid)); + mapTxSpends.insert(std::make_pair(outpoint, wtxid)); - pair<TxSpends::iterator, TxSpends::iterator> range; + std::pair<TxSpends::iterator, TxSpends::iterator> range; range = mapTxSpends.equal_range(outpoint); SyncMetaData(range); } @@ -561,10 +555,10 @@ bool CWallet::EncryptWallet(const SecureString& strWalletPassphrase) if (IsCrypted()) return false; - CKeyingMaterial vMasterKey; + CKeyingMaterial _vMasterKey; - vMasterKey.resize(WALLET_CRYPTO_KEY_SIZE); - GetStrongRandBytes(&vMasterKey[0], WALLET_CRYPTO_KEY_SIZE); + _vMasterKey.resize(WALLET_CRYPTO_KEY_SIZE); + GetStrongRandBytes(&_vMasterKey[0], WALLET_CRYPTO_KEY_SIZE); CMasterKey kMasterKey; @@ -587,7 +581,7 @@ bool CWallet::EncryptWallet(const SecureString& strWalletPassphrase) if (!crypter.SetKeyFromPassphrase(strWalletPassphrase, kMasterKey.vchSalt, kMasterKey.nDeriveIterations, kMasterKey.nDerivationMethod)) return false; - if (!crypter.Encrypt(vMasterKey, kMasterKey.vchCryptedKey)) + if (!crypter.Encrypt(_vMasterKey, kMasterKey.vchCryptedKey)) return false; { @@ -605,7 +599,7 @@ bool CWallet::EncryptWallet(const SecureString& strWalletPassphrase) pwalletdbEncryption->WriteMasterKey(nMasterKeyMaxID, kMasterKey); } - if (!EncryptKeys(vMasterKey)) + if (!EncryptKeys(_vMasterKey)) { if (fFileBacked) { pwalletdbEncryption->TxnAbort(); @@ -665,20 +659,20 @@ DBErrors CWallet::ReorderTransactions() // Probably a bad idea to change the output of this // First: get all CWalletTx and CAccountingEntry into a sorted-by-time multimap. - typedef pair<CWalletTx*, CAccountingEntry*> TxPair; - typedef multimap<int64_t, TxPair > TxItems; + typedef std::pair<CWalletTx*, CAccountingEntry*> TxPair; + typedef std::multimap<int64_t, TxPair > TxItems; TxItems txByTime; - for (map<uint256, CWalletTx>::iterator it = mapWallet.begin(); it != mapWallet.end(); ++it) + for (std::map<uint256, CWalletTx>::iterator it = mapWallet.begin(); it != mapWallet.end(); ++it) { CWalletTx* wtx = &((*it).second); - txByTime.insert(make_pair(wtx->nTimeReceived, TxPair(wtx, (CAccountingEntry*)0))); + txByTime.insert(std::make_pair(wtx->nTimeReceived, TxPair(wtx, (CAccountingEntry*)0))); } - list<CAccountingEntry> acentries; + std::list<CAccountingEntry> acentries; walletdb.ListAccountCreditDebit("", acentries); BOOST_FOREACH(CAccountingEntry& entry, acentries) { - txByTime.insert(make_pair(entry.nTime, TxPair((CWalletTx*)0, &entry))); + txByTime.insert(std::make_pair(entry.nTime, TxPair((CWalletTx*)0, &entry))); } nOrderPosNext = 0; @@ -792,7 +786,7 @@ bool CWallet::GetAccountPubkey(CPubKey &pubKey, std::string strAccount, bool bFo else { // Check if the current key has been used CScript scriptPubKey = GetScriptForDestination(account.vchPubKey.GetID()); - for (map<uint256, CWalletTx>::iterator it = mapWallet.begin(); + for (std::map<uint256, CWalletTx>::iterator it = mapWallet.begin(); it != mapWallet.end() && account.vchPubKey.IsValid(); ++it) BOOST_FOREACH(const CTxOut& txout, (*it).second.tx->vout) @@ -826,6 +820,35 @@ void CWallet::MarkDirty() } } +bool CWallet::MarkReplaced(const uint256& originalHash, const uint256& newHash) +{ + LOCK(cs_wallet); + + auto mi = mapWallet.find(originalHash); + + // There is a bug if MarkReplaced is not called on an existing wallet transaction. + assert(mi != mapWallet.end()); + + CWalletTx& wtx = (*mi).second; + + // Ensure for now that we're not overwriting data + assert(wtx.mapValue.count("replaced_by_txid") == 0); + + wtx.mapValue["replaced_by_txid"] = newHash.ToString(); + + CWalletDB walletdb(strWalletFile, "r+"); + + bool success = true; + if (!walletdb.WriteTx(wtx)) { + LogPrintf("%s: Updating walletdb tx %s failed", __func__, wtx.GetHash().ToString()); + success = false; + } + + NotifyTransactionChanged(this, originalHash, CT_UPDATED); + + return success; +} + bool CWallet::AddToWallet(const CWalletTx& wtxIn, bool fFlushOnClose) { LOCK(cs_wallet); @@ -835,7 +858,7 @@ bool CWallet::AddToWallet(const CWalletTx& wtxIn, bool fFlushOnClose) uint256 hash = wtxIn.GetHash(); // Inserts only if not already there, returns tx inserted or tx found - pair<map<uint256, CWalletTx>::iterator, bool> ret = mapWallet.insert(make_pair(hash, wtxIn)); + std::pair<std::map<uint256, CWalletTx>::iterator, bool> ret = mapWallet.insert(std::make_pair(hash, wtxIn)); CWalletTx& wtx = (*ret.first).second; wtx.BindWallet(this); bool fInsertedNew = ret.second; @@ -843,52 +866,8 @@ bool CWallet::AddToWallet(const CWalletTx& wtxIn, bool fFlushOnClose) { wtx.nTimeReceived = GetAdjustedTime(); wtx.nOrderPos = IncOrderPosNext(&walletdb); - wtxOrdered.insert(make_pair(wtx.nOrderPos, TxPair(&wtx, (CAccountingEntry*)0))); - - wtx.nTimeSmart = wtx.nTimeReceived; - if (!wtxIn.hashUnset()) - { - if (mapBlockIndex.count(wtxIn.hashBlock)) - { - int64_t latestNow = wtx.nTimeReceived; - int64_t latestEntry = 0; - { - // Tolerate times up to the last timestamp in the wallet not more than 5 minutes into the future - int64_t latestTolerated = latestNow + 300; - const TxItems & txOrdered = wtxOrdered; - for (TxItems::const_reverse_iterator it = txOrdered.rbegin(); it != txOrdered.rend(); ++it) - { - CWalletTx *const pwtx = (*it).second.first; - if (pwtx == &wtx) - continue; - CAccountingEntry *const pacentry = (*it).second.second; - int64_t nSmartTime; - if (pwtx) - { - nSmartTime = pwtx->nTimeSmart; - if (!nSmartTime) - nSmartTime = pwtx->nTimeReceived; - } - else - nSmartTime = pacentry->nTime; - if (nSmartTime <= latestTolerated) - { - latestEntry = nSmartTime; - if (nSmartTime > latestNow) - latestNow = nSmartTime; - break; - } - } - } - - int64_t blocktime = mapBlockIndex[wtxIn.hashBlock]->GetBlockTime(); - wtx.nTimeSmart = std::max(latestEntry, std::min(blocktime, latestNow)); - } - else - LogPrintf("AddToWallet(): found %s in block %s not in index\n", - wtxIn.GetHash().ToString(), - wtxIn.hashBlock.ToString()); - } + wtxOrdered.insert(std::make_pair(wtx.nOrderPos, TxPair(&wtx, (CAccountingEntry*)0))); + wtx.nTimeSmart = ComputeTimeSmart(wtx); AddToSpends(hash); } @@ -952,7 +931,7 @@ bool CWallet::LoadToWallet(const CWalletTx& wtxIn) mapWallet[hash] = wtxIn; CWalletTx& wtx = mapWallet[hash]; wtx.BindWallet(this); - wtxOrdered.insert(make_pair(wtx.nOrderPos, TxPair(&wtx, (CAccountingEntry*)0))); + wtxOrdered.insert(std::make_pair(wtx.nOrderPos, TxPair(&wtx, (CAccountingEntry*)0))); AddToSpends(hash); BOOST_FOREACH(const CTxIn& txin, wtx.tx->vin) { if (mapWallet.count(txin.prevout.hash)) { @@ -967,9 +946,17 @@ bool CWallet::LoadToWallet(const CWalletTx& wtxIn) } /** - * Add a transaction to the wallet, or update it. - * pblock is optional, but should be provided if the transaction is known to be in a block. + * Add a transaction to the wallet, or update it. pIndex and posInBlock should + * be set when the transaction was known to be included in a block. When + * posInBlock = SYNC_TRANSACTION_NOT_IN_BLOCK (-1) , then wallet state is not + * updated in AddToWallet, but notifications happen and cached balances are + * marked dirty. * If fUpdate is true, existing transactions will be updated. + * TODO: One exception to this is that the abandoned state is cleared under the + * assumption that any further notification of a transaction that was considered + * abandoned is an indication that it is not safe to be considered abandoned. + * Abandoned state should probably be more carefully tracked via different + * posInBlock signals or by checking mempool presence when necessary. */ bool CWallet::AddToWalletIfInvolvingMe(const CTransaction& tx, const CBlockIndex* pIndex, int posInBlock, bool fUpdate) { @@ -1143,7 +1130,7 @@ isminetype CWallet::IsMine(const CTxIn &txin) const { { LOCK(cs_wallet); - map<uint256, CWalletTx>::const_iterator mi = mapWallet.find(txin.prevout.hash); + std::map<uint256, CWalletTx>::const_iterator mi = mapWallet.find(txin.prevout.hash); if (mi != mapWallet.end()) { const CWalletTx& prev = (*mi).second; @@ -1154,11 +1141,13 @@ isminetype CWallet::IsMine(const CTxIn &txin) const return ISMINE_NO; } +// Note that this function doesn't distinguish between a 0-valued input, +// and a not-"is mine" (according to the filter) input. CAmount CWallet::GetDebit(const CTxIn &txin, const isminefilter& filter) const { { LOCK(cs_wallet); - map<uint256, CWalletTx>::const_iterator mi = mapWallet.find(txin.prevout.hash); + std::map<uint256, CWalletTx>::const_iterator mi = mapWallet.find(txin.prevout.hash); if (mi != mapWallet.end()) { const CWalletTx& prev = (*mi).second; @@ -1236,6 +1225,27 @@ CAmount CWallet::GetDebit(const CTransaction& tx, const isminefilter& filter) co return nDebit; } +bool CWallet::IsAllFromMe(const CTransaction& tx, const isminefilter& filter) const +{ + LOCK(cs_wallet); + + BOOST_FOREACH(const CTxIn& txin, tx.vin) + { + auto mi = mapWallet.find(txin.prevout.hash); + if (mi == mapWallet.end()) + return false; // any unknown inputs can't be from us + + const CWalletTx& prev = (*mi).second; + + if (txin.prevout.n >= prev.tx->vout.size()) + return false; // invalid input! + + if (!(IsMine(prev.tx->vout[txin.prevout.n]) & filter)) + return false; + } + return true; +} + CAmount CWallet::GetCredit(const CTransaction& tx, const isminefilter& filter) const { CAmount nCredit = 0; @@ -1311,13 +1321,13 @@ bool CWallet::SetHDChain(const CHDChain& chain, bool memonly) { LOCK(cs_wallet); if (!memonly && !CWalletDB(strWalletFile).WriteHDChain(chain)) - throw runtime_error(std::string(__func__) + ": writing chain failed"); + throw std::runtime_error(std::string(__func__) + ": writing chain failed"); hdChain = chain; return true; } -bool CWallet::IsHDEnabled() +bool CWallet::IsHDEnabled() const { return !hdChain.masterKeyID.IsNull(); } @@ -1339,7 +1349,7 @@ int CWalletTx::GetRequestCount() const // Generated block if (!hashUnset()) { - map<uint256, int>::const_iterator mi = pwallet->mapRequestCount.find(hashBlock); + std::map<uint256, int>::const_iterator mi = pwallet->mapRequestCount.find(hashBlock); if (mi != pwallet->mapRequestCount.end()) nRequests = (*mi).second; } @@ -1347,7 +1357,7 @@ int CWalletTx::GetRequestCount() const else { // Did anyone request this transaction? - map<uint256, int>::const_iterator mi = pwallet->mapRequestCount.find(GetHash()); + std::map<uint256, int>::const_iterator mi = pwallet->mapRequestCount.find(GetHash()); if (mi != pwallet->mapRequestCount.end()) { nRequests = (*mi).second; @@ -1355,7 +1365,7 @@ int CWalletTx::GetRequestCount() const // How about the block it's in? if (nRequests == 0 && !hashUnset()) { - map<uint256, int>::const_iterator _mi = pwallet->mapRequestCount.find(hashBlock); + std::map<uint256, int>::const_iterator _mi = pwallet->mapRequestCount.find(hashBlock); if (_mi != pwallet->mapRequestCount.end()) nRequests = (*_mi).second; else @@ -1367,8 +1377,8 @@ int CWalletTx::GetRequestCount() const return nRequests; } -void CWalletTx::GetAmounts(list<COutputEntry>& listReceived, - list<COutputEntry>& listSent, CAmount& nFee, string& strSentAccount, const isminefilter& filter) const +void CWalletTx::GetAmounts(std::list<COutputEntry>& listReceived, + std::list<COutputEntry>& listSent, CAmount& nFee, std::string& strSentAccount, const isminefilter& filter) const { nFee = 0; listReceived.clear(); @@ -1423,15 +1433,15 @@ void CWalletTx::GetAmounts(list<COutputEntry>& listReceived, } -void CWalletTx::GetAccountAmounts(const string& strAccount, CAmount& nReceived, +void CWalletTx::GetAccountAmounts(const std::string& strAccount, CAmount& nReceived, CAmount& nSent, CAmount& nFee, const isminefilter& filter) const { nReceived = nSent = nFee = 0; CAmount allFee; - string strSentAccount; - list<COutputEntry> listReceived; - list<COutputEntry> listSent; + std::string strSentAccount; + std::list<COutputEntry> listReceived; + std::list<COutputEntry> listSent; GetAmounts(listReceived, listSent, allFee, strSentAccount, filter); if (strAccount == strSentAccount) @@ -1446,7 +1456,7 @@ void CWalletTx::GetAccountAmounts(const string& strAccount, CAmount& nReceived, { if (pwallet->mapAddressBook.count(r.destination)) { - map<CTxDestination, CAddressBookData>::const_iterator mi = pwallet->mapAddressBook.find(r.destination); + std::map<CTxDestination, CAddressBookData>::const_iterator mi = pwallet->mapAddressBook.find(r.destination); if (mi != pwallet->mapAddressBook.end() && (*mi).second.name == strAccount) nReceived += r.amount; } @@ -1462,10 +1472,14 @@ void CWalletTx::GetAccountAmounts(const string& strAccount, CAmount& nReceived, * Scan the block chain (starting in pindexStart) for transactions * from or to us. If fUpdate is true, found transactions that already * exist in the wallet will be updated. + * + * Returns pointer to the first block in the last contiguous range that was + * successfully scanned. + * */ -int CWallet::ScanForWalletTransactions(CBlockIndex* pindexStart, bool fUpdate) +CBlockIndex* CWallet::ScanForWalletTransactions(CBlockIndex* pindexStart, bool fUpdate) { - int ret = 0; + CBlockIndex* ret = nullptr; int64_t nNow = GetTime(); const CChainParams& chainParams = Params(); @@ -1475,29 +1489,32 @@ int CWallet::ScanForWalletTransactions(CBlockIndex* pindexStart, bool fUpdate) // no need to read and scan block, if block was created before // our wallet birthday (as adjusted for block time variability) - while (pindex && nTimeFirstKey && (pindex->GetBlockTime() < (nTimeFirstKey - 7200))) + while (pindex && nTimeFirstKey && (pindex->GetBlockTime() < (nTimeFirstKey - TIMESTAMP_WINDOW))) pindex = chainActive.Next(pindex); ShowProgress(_("Rescanning..."), 0); // show rescan progress in GUI as dialog or on splashscreen, if -rescan on startup - double dProgressStart = Checkpoints::GuessVerificationProgress(chainParams.Checkpoints(), pindex, false); - double dProgressTip = Checkpoints::GuessVerificationProgress(chainParams.Checkpoints(), chainActive.Tip(), false); + double dProgressStart = GuessVerificationProgress(chainParams.TxData(), pindex); + double dProgressTip = GuessVerificationProgress(chainParams.TxData(), chainActive.Tip()); while (pindex) { if (pindex->nHeight % 100 == 0 && dProgressTip - dProgressStart > 0.0) - ShowProgress(_("Rescanning..."), std::max(1, std::min(99, (int)((Checkpoints::GuessVerificationProgress(chainParams.Checkpoints(), pindex, false) - dProgressStart) / (dProgressTip - dProgressStart) * 100)))); + ShowProgress(_("Rescanning..."), std::max(1, std::min(99, (int)((GuessVerificationProgress(chainParams.TxData(), pindex) - dProgressStart) / (dProgressTip - dProgressStart) * 100)))); CBlock block; - ReadBlockFromDisk(block, pindex, Params().GetConsensus()); - int posInBlock; - for (posInBlock = 0; posInBlock < (int)block.vtx.size(); posInBlock++) - { - if (AddToWalletIfInvolvingMe(*block.vtx[posInBlock], pindex, posInBlock, fUpdate)) - ret++; + if (ReadBlockFromDisk(block, pindex, Params().GetConsensus())) { + for (size_t posInBlock = 0; posInBlock < block.vtx.size(); ++posInBlock) { + AddToWalletIfInvolvingMe(*block.vtx[posInBlock], pindex, posInBlock, fUpdate); + } + if (!ret) { + ret = pindex; + } + } else { + ret = nullptr; } pindex = chainActive.Next(pindex); if (GetTime() >= nNow + 60) { nNow = GetTime(); - LogPrintf("Still rescanning. At block %d. Progress=%f\n", pindex->nHeight, Checkpoints::GuessVerificationProgress(chainParams.Checkpoints(), pindex)); + LogPrintf("Still rescanning. At block %d. Progress=%f\n", pindex->nHeight, GuessVerificationProgress(chainParams.TxData(), pindex)); } } ShowProgress(_("Rescanning..."), 100); // hide progress dialog in GUI @@ -1560,9 +1577,9 @@ bool CWalletTx::RelayWalletTransaction(CConnman* connman) return false; } -set<uint256> CWalletTx::GetConflicts() const +std::set<uint256> CWalletTx::GetConflicts() const { - set<uint256> result; + std::set<uint256> result; if (pwallet != NULL) { uint256 myHash = GetHash(); @@ -1787,14 +1804,14 @@ std::vector<uint256> CWallet::ResendWalletTransactionsBefore(int64_t nTime, CCon LOCK(cs_wallet); // Sort them in chronological order - multimap<unsigned int, CWalletTx*> mapSorted; + std::multimap<unsigned int, CWalletTx*> mapSorted; BOOST_FOREACH(PAIRTYPE(const uint256, CWalletTx)& item, mapWallet) { CWalletTx& wtx = item.second; // Don't rebroadcast if newer than nTime: if (wtx.nTimeReceived > nTime) continue; - mapSorted.insert(make_pair(wtx.nTimeReceived, &wtx)); + mapSorted.insert(std::make_pair(wtx.nTimeReceived, &wtx)); } BOOST_FOREACH(PAIRTYPE(const unsigned int, CWalletTx*)& item, mapSorted) { @@ -1844,7 +1861,7 @@ CAmount CWallet::GetBalance() const CAmount nTotal = 0; { LOCK2(cs_main, cs_wallet); - for (map<uint256, CWalletTx>::const_iterator it = mapWallet.begin(); it != mapWallet.end(); ++it) + for (std::map<uint256, CWalletTx>::const_iterator it = mapWallet.begin(); it != mapWallet.end(); ++it) { const CWalletTx* pcoin = &(*it).second; if (pcoin->IsTrusted()) @@ -1860,7 +1877,7 @@ CAmount CWallet::GetUnconfirmedBalance() const CAmount nTotal = 0; { LOCK2(cs_main, cs_wallet); - for (map<uint256, CWalletTx>::const_iterator it = mapWallet.begin(); it != mapWallet.end(); ++it) + for (std::map<uint256, CWalletTx>::const_iterator it = mapWallet.begin(); it != mapWallet.end(); ++it) { const CWalletTx* pcoin = &(*it).second; if (!pcoin->IsTrusted() && pcoin->GetDepthInMainChain() == 0 && pcoin->InMempool()) @@ -1875,7 +1892,7 @@ CAmount CWallet::GetImmatureBalance() const CAmount nTotal = 0; { LOCK2(cs_main, cs_wallet); - for (map<uint256, CWalletTx>::const_iterator it = mapWallet.begin(); it != mapWallet.end(); ++it) + for (std::map<uint256, CWalletTx>::const_iterator it = mapWallet.begin(); it != mapWallet.end(); ++it) { const CWalletTx* pcoin = &(*it).second; nTotal += pcoin->GetImmatureCredit(); @@ -1889,7 +1906,7 @@ CAmount CWallet::GetWatchOnlyBalance() const CAmount nTotal = 0; { LOCK2(cs_main, cs_wallet); - for (map<uint256, CWalletTx>::const_iterator it = mapWallet.begin(); it != mapWallet.end(); ++it) + for (std::map<uint256, CWalletTx>::const_iterator it = mapWallet.begin(); it != mapWallet.end(); ++it) { const CWalletTx* pcoin = &(*it).second; if (pcoin->IsTrusted()) @@ -1905,7 +1922,7 @@ CAmount CWallet::GetUnconfirmedWatchOnlyBalance() const CAmount nTotal = 0; { LOCK2(cs_main, cs_wallet); - for (map<uint256, CWalletTx>::const_iterator it = mapWallet.begin(); it != mapWallet.end(); ++it) + for (std::map<uint256, CWalletTx>::const_iterator it = mapWallet.begin(); it != mapWallet.end(); ++it) { const CWalletTx* pcoin = &(*it).second; if (!pcoin->IsTrusted() && pcoin->GetDepthInMainChain() == 0 && pcoin->InMempool()) @@ -1920,7 +1937,7 @@ CAmount CWallet::GetImmatureWatchOnlyBalance() const CAmount nTotal = 0; { LOCK2(cs_main, cs_wallet); - for (map<uint256, CWalletTx>::const_iterator it = mapWallet.begin(); it != mapWallet.end(); ++it) + for (std::map<uint256, CWalletTx>::const_iterator it = mapWallet.begin(); it != mapWallet.end(); ++it) { const CWalletTx* pcoin = &(*it).second; nTotal += pcoin->GetImmatureWatchOnlyCredit(); @@ -1929,13 +1946,13 @@ CAmount CWallet::GetImmatureWatchOnlyBalance() const return nTotal; } -void CWallet::AvailableCoins(vector<COutput>& vCoins, bool fOnlyConfirmed, const CCoinControl *coinControl, bool fIncludeZeroValue) const +void CWallet::AvailableCoins(std::vector<COutput>& vCoins, bool fOnlySafe, const CCoinControl *coinControl, bool fIncludeZeroValue) const { vCoins.clear(); { LOCK2(cs_main, cs_wallet); - for (map<uint256, CWalletTx>::const_iterator it = mapWallet.begin(); it != mapWallet.end(); ++it) + for (std::map<uint256, CWalletTx>::const_iterator it = mapWallet.begin(); it != mapWallet.end(); ++it) { const uint256& wtxid = it->first; const CWalletTx* pcoin = &(*it).second; @@ -1943,9 +1960,6 @@ void CWallet::AvailableCoins(vector<COutput>& vCoins, bool fOnlyConfirmed, const if (!CheckFinalTx(*pcoin)) continue; - if (fOnlyConfirmed && !pcoin->IsTrusted()) - continue; - if (pcoin->IsCoinBase() && pcoin->GetBlocksToMaturity() > 0) continue; @@ -1958,6 +1972,43 @@ void CWallet::AvailableCoins(vector<COutput>& vCoins, bool fOnlyConfirmed, const if (nDepth == 0 && !pcoin->InMempool()) continue; + bool safeTx = pcoin->IsTrusted(); + + // We should not consider coins from transactions that are replacing + // other transactions. + // + // Example: There is a transaction A which is replaced by bumpfee + // transaction B. In this case, we want to prevent creation of + // a transaction B' which spends an output of B. + // + // Reason: If transaction A were initially confirmed, transactions B + // and B' would no longer be valid, so the user would have to create + // a new transaction C to replace B'. However, in the case of a + // one-block reorg, transactions B' and C might BOTH be accepted, + // when the user only wanted one of them. Specifically, there could + // be a 1-block reorg away from the chain where transactions A and C + // were accepted to another chain where B, B', and C were all + // accepted. + if (nDepth == 0 && pcoin->mapValue.count("replaces_txid")) { + safeTx = false; + } + + // Similarly, we should not consider coins from transactions that + // have been replaced. In the example above, we would want to prevent + // creation of a transaction A' spending an output of A, because if + // transaction B were initially confirmed, conflicting with A and + // A', we wouldn't want to the user to create a transaction D + // intending to replace A', but potentially resulting in a scenario + // where A, A', and D could all be accepted (instead of just B and + // D, or just A and A' like the user would want). + if (nDepth == 0 && pcoin->mapValue.count("replaced_by_txid")) { + safeTx = false; + } + + if (fOnlySafe && !safeTx) { + continue; + } + for (unsigned int i = 0; i < pcoin->tx->vout.size(); i++) { isminetype mine = IsMine(pcoin->tx->vout[i]); if (!(IsSpent(wtxid, i)) && mine != ISMINE_NO && @@ -1966,16 +2017,16 @@ void CWallet::AvailableCoins(vector<COutput>& vCoins, bool fOnlyConfirmed, const vCoins.push_back(COutput(pcoin, i, nDepth, ((mine & ISMINE_SPENDABLE) != ISMINE_NO) || (coinControl && coinControl->fAllowWatchOnly && (mine & ISMINE_WATCH_SOLVABLE) != ISMINE_NO), - (mine & (ISMINE_SPENDABLE | ISMINE_WATCH_SOLVABLE)) != ISMINE_NO)); + (mine & (ISMINE_SPENDABLE | ISMINE_WATCH_SOLVABLE)) != ISMINE_NO, safeTx)); } } } } -static void ApproximateBestSubset(vector<pair<CAmount, pair<const CWalletTx*,unsigned int> > >vValue, const CAmount& nTotalLower, const CAmount& nTargetValue, - vector<char>& vfBest, CAmount& nBest, int iterations = 1000) +static void ApproximateBestSubset(std::vector<std::pair<CAmount, std::pair<const CWalletTx*,unsigned int> > >vValue, const CAmount& nTotalLower, const CAmount& nTargetValue, + std::vector<char>& vfBest, CAmount& nBest, int iterations = 1000) { - vector<char> vfIncluded; + std::vector<char> vfIncluded; vfBest.assign(vValue.size(), true); nBest = nTotalLower; @@ -2018,17 +2069,17 @@ static void ApproximateBestSubset(vector<pair<CAmount, pair<const CWalletTx*,uns } } -bool CWallet::SelectCoinsMinConf(const CAmount& nTargetValue, const int nConfMine, const int nConfTheirs, const uint64_t nMaxAncestors, vector<COutput> vCoins, - set<pair<const CWalletTx*,unsigned int> >& setCoinsRet, CAmount& nValueRet) const +bool CWallet::SelectCoinsMinConf(const CAmount& nTargetValue, const int nConfMine, const int nConfTheirs, const uint64_t nMaxAncestors, std::vector<COutput> vCoins, + std::set<std::pair<const CWalletTx*,unsigned int> >& setCoinsRet, CAmount& nValueRet) const { setCoinsRet.clear(); nValueRet = 0; // List of values less than target - pair<CAmount, pair<const CWalletTx*,unsigned int> > coinLowestLarger; + std::pair<CAmount, std::pair<const CWalletTx*,unsigned int> > coinLowestLarger; coinLowestLarger.first = std::numeric_limits<CAmount>::max(); coinLowestLarger.second.first = NULL; - vector<pair<CAmount, pair<const CWalletTx*,unsigned int> > > vValue; + std::vector<std::pair<CAmount, std::pair<const CWalletTx*,unsigned int> > > vValue; CAmount nTotalLower = 0; random_shuffle(vCoins.begin(), vCoins.end(), GetRandInt); @@ -2049,7 +2100,7 @@ bool CWallet::SelectCoinsMinConf(const CAmount& nTargetValue, const int nConfMin int i = output.i; CAmount n = pcoin->tx->vout[i].nValue; - pair<CAmount,pair<const CWalletTx*,unsigned int> > coin = make_pair(n,make_pair(pcoin, i)); + std::pair<CAmount,std::pair<const CWalletTx*,unsigned int> > coin = std::make_pair(n,std::make_pair(pcoin, i)); if (n == nTargetValue) { @@ -2090,7 +2141,7 @@ bool CWallet::SelectCoinsMinConf(const CAmount& nTargetValue, const int nConfMin // Solve subset sum by stochastic approximation std::sort(vValue.begin(), vValue.end(), CompareValueOnly()); std::reverse(vValue.begin(), vValue.end()); - vector<char> vfBest; + std::vector<char> vfBest; CAmount nBest; ApproximateBestSubset(vValue, nTotalLower, nTargetValue, vfBest, nBest); @@ -2123,9 +2174,9 @@ bool CWallet::SelectCoinsMinConf(const CAmount& nTargetValue, const int nConfMin return true; } -bool CWallet::SelectCoins(const vector<COutput>& vAvailableCoins, const CAmount& nTargetValue, set<pair<const CWalletTx*,unsigned int> >& setCoinsRet, CAmount& nValueRet, const CCoinControl* coinControl) const +bool CWallet::SelectCoins(const std::vector<COutput>& vAvailableCoins, const CAmount& nTargetValue, std::set<std::pair<const CWalletTx*,unsigned int> >& setCoinsRet, CAmount& nValueRet, const CCoinControl* coinControl) const { - vector<COutput> vCoins(vAvailableCoins); + std::vector<COutput> vCoins(vAvailableCoins); // coin control -> return all selected outputs (we want all selected to go into the transaction for sure) if (coinControl && coinControl->HasSelected() && !coinControl->fAllowOtherInputs) @@ -2135,13 +2186,13 @@ bool CWallet::SelectCoins(const vector<COutput>& vAvailableCoins, const CAmount& if (!out.fSpendable) continue; nValueRet += out.tx->tx->vout[out.i].nValue; - setCoinsRet.insert(make_pair(out.tx, out.i)); + setCoinsRet.insert(std::make_pair(out.tx, out.i)); } return (nValueRet >= nTargetValue); } // calculate value from preset inputs and store them - set<pair<const CWalletTx*, uint32_t> > setPresetCoins; + std::set<std::pair<const CWalletTx*, uint32_t> > setPresetCoins; CAmount nValueFromPresetInputs = 0; std::vector<COutPoint> vPresetInputs; @@ -2149,7 +2200,7 @@ bool CWallet::SelectCoins(const vector<COutput>& vAvailableCoins, const CAmount& coinControl->ListSelected(vPresetInputs); BOOST_FOREACH(const COutPoint& outpoint, vPresetInputs) { - map<uint256, CWalletTx>::const_iterator it = mapWallet.find(outpoint.hash); + std::map<uint256, CWalletTx>::const_iterator it = mapWallet.find(outpoint.hash); if (it != mapWallet.end()) { const CWalletTx* pcoin = &it->second; @@ -2157,15 +2208,15 @@ bool CWallet::SelectCoins(const vector<COutput>& vAvailableCoins, const CAmount& if (pcoin->tx->vout.size() <= outpoint.n) return false; nValueFromPresetInputs += pcoin->tx->vout[outpoint.n].nValue; - setPresetCoins.insert(make_pair(pcoin, outpoint.n)); + setPresetCoins.insert(std::make_pair(pcoin, outpoint.n)); } else return false; // TODO: Allow non-wallet inputs } // remove preset inputs from vCoins - for (vector<COutput>::iterator it = vCoins.begin(); it != vCoins.end() && coinControl && coinControl->HasSelected();) + for (std::vector<COutput>::iterator it = vCoins.begin(); it != vCoins.end() && coinControl && coinControl->HasSelected();) { - if (setPresetCoins.count(make_pair(it->tx, it->i))) + if (setPresetCoins.count(std::make_pair(it->tx, it->i))) it = vCoins.erase(it); else ++it; @@ -2192,14 +2243,15 @@ bool CWallet::SelectCoins(const vector<COutput>& vAvailableCoins, const CAmount& return res; } -bool CWallet::FundTransaction(CMutableTransaction& tx, CAmount& nFeeRet, bool overrideEstimatedFeeRate, const CFeeRate& specificFeeRate, int& nChangePosInOut, std::string& strFailReason, bool includeWatching, bool lockUnspents, const CTxDestination& destChange) +bool CWallet::FundTransaction(CMutableTransaction& tx, CAmount& nFeeRet, bool overrideEstimatedFeeRate, const CFeeRate& specificFeeRate, int& nChangePosInOut, std::string& strFailReason, bool includeWatching, bool lockUnspents, const std::set<int>& setSubtractFeeFromOutputs, bool keepReserveKey, const CTxDestination& destChange) { - vector<CRecipient> vecSend; + std::vector<CRecipient> vecSend; // Turn the txout set into a CRecipient vector - BOOST_FOREACH(const CTxOut& txOut, tx.vout) + for (size_t idx = 0; idx < tx.vout.size(); idx++) { - CRecipient recipient = {txOut.scriptPubKey, txOut.nValue, false}; + const CTxOut& txOut = tx.vout[idx]; + CRecipient recipient = {txOut.scriptPubKey, txOut.nValue, setSubtractFeeFromOutputs.count(idx) == 1}; vecSend.push_back(recipient); } @@ -2221,6 +2273,10 @@ bool CWallet::FundTransaction(CMutableTransaction& tx, CAmount& nFeeRet, bool ov if (nChangePosInOut != -1) tx.vout.insert(tx.vout.begin() + nChangePosInOut, wtx.tx->vout[nChangePosInOut]); + // Copy output sizes from new transaction; they may have had the fee subtracted from them + for (unsigned int idx = 0; idx < tx.vout.size(); idx++) + tx.vout[idx].nValue = wtx.tx->vout[idx].nValue; + // Add new txins (keeping original txin scriptSig/order) BOOST_FOREACH(const CTxIn& txin, wtx.tx->vin) { @@ -2236,10 +2292,14 @@ bool CWallet::FundTransaction(CMutableTransaction& tx, CAmount& nFeeRet, bool ov } } + // optionally keep the change output key + if (keepReserveKey) + reservekey.KeepKey(); + return true; } -bool CWallet::CreateTransaction(const vector<CRecipient>& vecSend, CWalletTx& wtxNew, CReserveKey& reservekey, CAmount& nFeeRet, +bool CWallet::CreateTransaction(const std::vector<CRecipient>& vecSend, CWalletTx& wtxNew, CReserveKey& reservekey, CAmount& nFeeRet, int& nChangePosInOut, std::string& strFailReason, const CCoinControl* coinControl, bool sign) { CAmount nValue = 0; @@ -2300,7 +2360,7 @@ bool CWallet::CreateTransaction(const vector<CRecipient>& vecSend, CWalletTx& wt assert(txNew.nLockTime < LOCKTIME_THRESHOLD); { - set<pair<const CWalletTx*,unsigned int> > setCoins; + std::set<std::pair<const CWalletTx*,unsigned int> > setCoins; LOCK2(cs_main, cs_wallet); { std::vector<COutput> vAvailableCoins; @@ -2319,7 +2379,6 @@ bool CWallet::CreateTransaction(const vector<CRecipient>& vecSend, CWalletTx& wt CAmount nValueToSelect = nValue; if (nSubtractFeeFromAmount == 0) nValueToSelect += nFeeRet; - double dPriority = 0; // vouts to the payees for (const auto& recipient : vecSend) { @@ -2336,7 +2395,7 @@ bool CWallet::CreateTransaction(const vector<CRecipient>& vecSend, CWalletTx& wt } } - if (txout.IsDust(::minRelayTxFee)) + if (txout.IsDust(dustRelayFee)) { if (recipient.fSubtractFeeFromAmount && nFeeRet > 0) { @@ -2360,19 +2419,6 @@ bool CWallet::CreateTransaction(const vector<CRecipient>& vecSend, CWalletTx& wt strFailReason = _("Insufficient funds"); return false; } - for (const auto& pcoin : setCoins) - { - CAmount nCredit = pcoin.first->tx->vout[pcoin.second].nValue; - //The coin age after the next block (depth+1) is used instead of the current, - //reflecting an assumption the user would accept a bit more delay for - //a chance at a free transaction. - //But mempool inputs might still be in the mempool, so their age stays 0 - int age = pcoin.first->GetDepthInMainChain(); - assert(age >= 0); - if (age != 0) - age += 1; - dPriority += (double)nCredit * age; - } const CAmount nChange = nValueIn - nValueToSelect; if (nChange > 0) @@ -2414,16 +2460,16 @@ bool CWallet::CreateTransaction(const vector<CRecipient>& vecSend, CWalletTx& wt // We do not move dust-change to fees, because the sender would end up paying more than requested. // This would be against the purpose of the all-inclusive feature. // So instead we raise the change and deduct from the recipient. - if (nSubtractFeeFromAmount > 0 && newTxOut.IsDust(::minRelayTxFee)) + if (nSubtractFeeFromAmount > 0 && newTxOut.IsDust(dustRelayFee)) { - CAmount nDust = newTxOut.GetDustThreshold(::minRelayTxFee) - newTxOut.nValue; + CAmount nDust = newTxOut.GetDustThreshold(dustRelayFee) - newTxOut.nValue; newTxOut.nValue += nDust; // raise change until no more dust for (unsigned int i = 0; i < vecSend.size(); i++) // subtract from first recipient { if (vecSend[i].fSubtractFeeFromAmount) { txNew.vout[i].nValue -= nDust; - if (txNew.vout[i].IsDust(::minRelayTxFee)) + if (txNew.vout[i].IsDust(dustRelayFee)) { strFailReason = _("The transaction amount is too small to send after the fee has been deducted"); return false; @@ -2435,7 +2481,7 @@ bool CWallet::CreateTransaction(const vector<CRecipient>& vecSend, CWalletTx& wt // Never create dust outputs; if we would, just // add the dust to the fee. - if (newTxOut.IsDust(::minRelayTxFee)) + if (newTxOut.IsDust(dustRelayFee)) { nChangePosInOut = -1; nFeeRet += nChange; @@ -2454,7 +2500,7 @@ bool CWallet::CreateTransaction(const vector<CRecipient>& vecSend, CWalletTx& wt return false; } - vector<CTxOut>::iterator position = txNew.vout.begin()+nChangePosInOut; + std::vector<CTxOut>::iterator position = txNew.vout.begin()+nChangePosInOut; txNew.vout.insert(position, newTxOut); } } @@ -2469,34 +2515,21 @@ bool CWallet::CreateTransaction(const vector<CRecipient>& vecSend, CWalletTx& wt // BIP125 defines opt-in RBF as any nSequence < maxint-1, so // we use the highest possible value in that range (maxint-2) // to avoid conflicting with other possible uses of nSequence, - // and in the spirit of "smallest posible change from prior + // and in the spirit of "smallest possible change from prior // behavior." for (const auto& coin : setCoins) txNew.vin.push_back(CTxIn(coin.first->GetHash(),coin.second,CScript(), std::numeric_limits<unsigned int>::max() - (fWalletRbf ? 2 : 1))); // Fill in dummy signatures for fee calculation. - int nIn = 0; - for (const auto& coin : setCoins) - { - const CScript& scriptPubKey = coin.first->tx->vout[coin.second].scriptPubKey; - SignatureData sigdata; - - if (!ProduceSignature(DummySignatureCreator(this), scriptPubKey, sigdata)) - { - strFailReason = _("Signing transaction failed"); - return false; - } else { - UpdateTransaction(txNew, nIn, sigdata); - } - - nIn++; + if (!DummySignTx(txNew, setCoins)) { + strFailReason = _("Signing transaction failed"); + return false; } unsigned int nBytes = GetVirtualTransactionSize(txNew); CTransaction txNewConst(txNew); - dPriority = txNewConst.ComputePriority(dPriority, nBytes); // Remove scriptSigs to eliminate the fee calculation dummy signatures for (auto& vin : txNew.vin) { @@ -2509,16 +2542,6 @@ bool CWallet::CreateTransaction(const vector<CRecipient>& vecSend, CWalletTx& wt if (coinControl && coinControl->nConfirmTarget > 0) currentConfirmationTarget = coinControl->nConfirmTarget; - // Can we complete this as a free transaction? - if (fSendFreeTransactions && nBytes <= MAX_FREE_TRANSACTION_CREATE_SIZE) - { - // Not enough fee: enough priority? - double dPriorityNeeded = mempool.estimateSmartPriority(currentConfirmationTarget); - // Require at least hard-coded AllowFree. - if (dPriority >= dPriorityNeeded && AllowFree(dPriority)) - break; - } - CAmount nFeeNeeded = GetMinimumFee(nBytes, currentConfirmationTarget, mempool); if (coinControl && nFeeNeeded > 0 && coinControl->nMinimumTotalFee > nFeeNeeded) { nFeeNeeded = coinControl->nMinimumTotalFee; @@ -2547,7 +2570,7 @@ bool CWallet::CreateTransaction(const vector<CRecipient>& vecSend, CWalletTx& wt // to be addressed so we avoid creating too small an output. if (nFeeRet > nFeeNeeded && nChangePosInOut != -1 && nSubtractFeeFromAmount == 0) { CAmount extraFeePaid = nFeeRet - nFeeNeeded; - vector<CTxOut>::iterator change_position = txNew.vout.begin()+nChangePosInOut; + std::vector<CTxOut>::iterator change_position = txNew.vout.begin()+nChangePosInOut; change_position->nValue += extraFeePaid; nFeeRet -= extraFeePaid; } @@ -2557,7 +2580,7 @@ bool CWallet::CreateTransaction(const vector<CRecipient>& vecSend, CWalletTx& wt // Try to reduce change to include necessary fee if (nChangePosInOut != -1 && nSubtractFeeFromAmount == 0) { CAmount additionalFeeNeeded = nFeeNeeded - nFeeRet; - vector<CTxOut>::iterator change_position = txNew.vout.begin()+nChangePosInOut; + std::vector<CTxOut>::iterator change_position = txNew.vout.begin()+nChangePosInOut; // Only reduce change if remaining amount is still a large enough output. if (change_position->nValue >= MIN_FINAL_CHANGE + additionalFeeNeeded) { change_position->nValue -= additionalFeeNeeded; @@ -2607,7 +2630,7 @@ bool CWallet::CreateTransaction(const vector<CRecipient>& vecSend, CWalletTx& wt if (GetBoolArg("-walletrejectlongchains", DEFAULT_WALLET_REJECT_LONG_CHAINS)) { // Lastly, ensure this tx will pass the mempool's chain limits LockPoints lp; - CTxMemPoolEntry entry(wtxNew.tx, 0, 0, 0, 0, 0, false, 0, lp); + CTxMemPoolEntry entry(wtxNew.tx, 0, 0, 0, false, 0, lp); CTxMemPool::setEntries setAncestors; size_t nLimitAncestors = GetArg("-limitancestorcount", DEFAULT_ANCESTOR_LIMIT); size_t nLimitAncestorSize = GetArg("-limitancestorsize", DEFAULT_ANCESTOR_SIZE_LIMIT)*1000; @@ -2683,7 +2706,7 @@ bool CWallet::AddAccountingEntry(const CAccountingEntry& acentry, CWalletDB *pwa laccentries.push_back(acentry); CAccountingEntry & entry = laccentries.back(); - wtxOrdered.insert(make_pair(entry.nOrderPos, TxPair((CWalletTx*)0, &entry))); + wtxOrdered.insert(std::make_pair(entry.nOrderPos, TxPair((CWalletTx*)0, &entry))); return true; } @@ -2695,8 +2718,13 @@ CAmount CWallet::GetRequiredFee(unsigned int nTxBytes) CAmount CWallet::GetMinimumFee(unsigned int nTxBytes, unsigned int nConfirmTarget, const CTxMemPool& pool) { - // payTxFee is user-set "I want to pay this much" - CAmount nFeeNeeded = payTxFee.GetFee(nTxBytes); + // payTxFee is the user-set global for desired feerate + return GetMinimumFee(nTxBytes, nConfirmTarget, pool, payTxFee.GetFee(nTxBytes)); +} + +CAmount CWallet::GetMinimumFee(unsigned int nTxBytes, unsigned int nConfirmTarget, const CTxMemPool& pool, CAmount targetFee) +{ + CAmount nFeeNeeded = targetFee; // User didn't set: use -txconfirmtarget to estimate... if (nFeeNeeded == 0) { int estimateFoundTarget = nConfirmTarget; @@ -2743,16 +2771,20 @@ DBErrors CWallet::LoadWallet(bool& fFirstRunRet) return DB_LOAD_OK; } -DBErrors CWallet::ZapSelectTx(vector<uint256>& vHashIn, vector<uint256>& vHashOut) +DBErrors CWallet::ZapSelectTx(std::vector<uint256>& vHashIn, std::vector<uint256>& vHashOut) { if (!fFileBacked) return DB_LOAD_OK; - DBErrors nZapSelectTxRet = CWalletDB(strWalletFile,"cr+").ZapSelectTx(this, vHashIn, vHashOut); + AssertLockHeld(cs_wallet); // mapWallet + vchDefaultKey = CPubKey(); + DBErrors nZapSelectTxRet = CWalletDB(strWalletFile,"cr+").ZapSelectTx(vHashIn, vHashOut); + for (uint256 hash : vHashOut) + mapWallet.erase(hash); + if (nZapSelectTxRet == DB_NEED_REWRITE) { if (CDB::Rewrite(strWalletFile, "\x04pool")) { - LOCK(cs_wallet); setKeyPool.clear(); // Note: can't top-up keypool here, because wallet is locked. // User will be prompted to unlock wallet the next operation @@ -2773,7 +2805,8 @@ DBErrors CWallet::ZapWalletTx(std::vector<CWalletTx>& vWtx) { if (!fFileBacked) return DB_LOAD_OK; - DBErrors nZapWalletTxRet = CWalletDB(strWalletFile,"cr+").ZapWalletTx(this, vWtx); + vchDefaultKey = CPubKey(); + DBErrors nZapWalletTxRet = CWalletDB(strWalletFile,"cr+").ZapWalletTx(vWtx); if (nZapWalletTxRet == DB_NEED_REWRITE) { if (CDB::Rewrite(strWalletFile, "\x04pool")) @@ -2793,7 +2826,7 @@ DBErrors CWallet::ZapWalletTx(std::vector<CWalletTx>& vWtx) } -bool CWallet::SetAddressBook(const CTxDestination& address, const string& strName, const string& strPurpose) +bool CWallet::SetAddressBook(const CTxDestination& address, const std::string& strName, const std::string& strPurpose) { bool fUpdated = false; { @@ -2822,7 +2855,7 @@ bool CWallet::DelAddressBook(const CTxDestination& address) { // Delete destdata tuples associated with address std::string strAddress = CBitcoinAddress(address).ToString(); - BOOST_FOREACH(const PAIRTYPE(string, string) &item, mapAddressBook[address].destdata) + BOOST_FOREACH(const PAIRTYPE(std::string, std::string) &item, mapAddressBook[address].destdata) { CWalletDB(strWalletFile).EraseDestData(strAddress, item.first); } @@ -2865,7 +2898,7 @@ bool CWallet::NewKeyPool() if (IsLocked()) return false; - int64_t nKeys = max(GetArg("-keypool", DEFAULT_KEYPOOL_SIZE), (int64_t)0); + int64_t nKeys = std::max(GetArg("-keypool", DEFAULT_KEYPOOL_SIZE), (int64_t)0); for (int i = 0; i < nKeys; i++) { int64_t nIndex = i+1; @@ -2892,7 +2925,7 @@ bool CWallet::TopUpKeyPool(unsigned int kpSize) if (kpSize > 0) nTargetSize = kpSize; else - nTargetSize = max(GetArg("-keypool", DEFAULT_KEYPOOL_SIZE), (int64_t) 0); + nTargetSize = std::max(GetArg("-keypool", DEFAULT_KEYPOOL_SIZE), (int64_t) 0); while (setKeyPool.size() < (nTargetSize + 1)) { @@ -2900,7 +2933,7 @@ bool CWallet::TopUpKeyPool(unsigned int kpSize) if (!setKeyPool.empty()) nEnd = *(--setKeyPool.end()) + 1; if (!walletdb.WritePool(nEnd, CKeyPool(GenerateNewKey()))) - throw runtime_error(std::string(__func__) + ": writing generated key failed"); + throw std::runtime_error(std::string(__func__) + ": writing generated key failed"); setKeyPool.insert(nEnd); LogPrintf("keypool added key %d, size=%u\n", nEnd, setKeyPool.size()); } @@ -2927,9 +2960,9 @@ void CWallet::ReserveKeyFromKeyPool(int64_t& nIndex, CKeyPool& keypool) nIndex = *(setKeyPool.begin()); setKeyPool.erase(setKeyPool.begin()); if (!walletdb.ReadPool(nIndex, keypool)) - throw runtime_error(std::string(__func__) + ": read failed"); + throw std::runtime_error(std::string(__func__) + ": read failed"); if (!HaveKey(keypool.vchPubKey.GetID())) - throw runtime_error(std::string(__func__) + ": unknown key in key pool"); + throw std::runtime_error(std::string(__func__) + ": unknown key in key pool"); assert(keypool.vchPubKey.IsValid()); LogPrintf("keypool reserve %d\n", nIndex); } @@ -2988,14 +3021,14 @@ int64_t CWallet::GetOldestKeyPoolTime() CWalletDB walletdb(strWalletFile); int64_t nIndex = *(setKeyPool.begin()); if (!walletdb.ReadPool(nIndex, keypool)) - throw runtime_error(std::string(__func__) + ": read oldest key in keypool failed"); + throw std::runtime_error(std::string(__func__) + ": read oldest key in keypool failed"); assert(keypool.vchPubKey.IsValid()); return keypool.nTime; } std::map<CTxDestination, CAmount> CWallet::GetAddressBalances() { - map<CTxDestination, CAmount> balances; + std::map<CTxDestination, CAmount> balances; { LOCK(cs_wallet); @@ -3033,11 +3066,11 @@ std::map<CTxDestination, CAmount> CWallet::GetAddressBalances() return balances; } -set< set<CTxDestination> > CWallet::GetAddressGroupings() +std::set< std::set<CTxDestination> > CWallet::GetAddressGroupings() { AssertLockHeld(cs_wallet); // mapWallet - set< set<CTxDestination> > groupings; - set<CTxDestination> grouping; + std::set< std::set<CTxDestination> > groupings; + std::set<CTxDestination> grouping; BOOST_FOREACH(PAIRTYPE(uint256, CWalletTx) walletEntry, mapWallet) { @@ -3090,20 +3123,20 @@ set< set<CTxDestination> > CWallet::GetAddressGroupings() } } - set< set<CTxDestination>* > uniqueGroupings; // a set of pointers to groups of addresses - map< CTxDestination, set<CTxDestination>* > setmap; // map addresses to the unique group containing it - BOOST_FOREACH(set<CTxDestination> _grouping, groupings) + std::set< std::set<CTxDestination>* > uniqueGroupings; // a set of pointers to groups of addresses + std::map< CTxDestination, std::set<CTxDestination>* > setmap; // map addresses to the unique group containing it + BOOST_FOREACH(std::set<CTxDestination> _grouping, groupings) { // make a set of all the groups hit by this new group - set< set<CTxDestination>* > hits; - map< CTxDestination, set<CTxDestination>* >::iterator it; + std::set< std::set<CTxDestination>* > hits; + std::map< CTxDestination, std::set<CTxDestination>* >::iterator it; BOOST_FOREACH(CTxDestination address, _grouping) if ((it = setmap.find(address)) != setmap.end()) hits.insert((*it).second); // merge all hit groups into a new single group and delete old groups - set<CTxDestination>* merged = new set<CTxDestination>(_grouping); - BOOST_FOREACH(set<CTxDestination>* hit, hits) + std::set<CTxDestination>* merged = new std::set<CTxDestination>(_grouping); + BOOST_FOREACH(std::set<CTxDestination>* hit, hits) { merged->insert(hit->begin(), hit->end()); uniqueGroupings.erase(hit); @@ -3116,8 +3149,8 @@ set< set<CTxDestination> > CWallet::GetAddressGroupings() setmap[element] = merged; } - set< set<CTxDestination> > ret; - BOOST_FOREACH(set<CTxDestination>* uniqueGrouping, uniqueGroupings) + std::set< std::set<CTxDestination> > ret; + BOOST_FOREACH(std::set<CTxDestination>* uniqueGrouping, uniqueGroupings) { ret.insert(*uniqueGrouping); delete uniqueGrouping; @@ -3137,7 +3170,7 @@ CAmount CWallet::GetAccountBalance(CWalletDB& walletdb, const std::string& strAc CAmount nBalance = 0; // Tally wallet transactions - for (map<uint256, CWalletTx>::iterator it = mapWallet.begin(); it != mapWallet.end(); ++it) + for (std::map<uint256, CWalletTx>::iterator it = mapWallet.begin(); it != mapWallet.end(); ++it) { const CWalletTx& wtx = (*it).second; if (!CheckFinalTx(wtx) || wtx.GetBlocksToMaturity() > 0 || wtx.GetDepthInMainChain() < 0) @@ -3160,11 +3193,11 @@ CAmount CWallet::GetAccountBalance(CWalletDB& walletdb, const std::string& strAc std::set<CTxDestination> CWallet::GetAccountAddresses(const std::string& strAccount) const { LOCK(cs_wallet); - set<CTxDestination> result; + std::set<CTxDestination> result; BOOST_FOREACH(const PAIRTYPE(CTxDestination, CAddressBookData)& item, mapAddressBook) { const CTxDestination& address = item.first; - const string& strName = item.second.name; + const std::string& strName = item.second.name; if (strName == strAccount) result.insert(address); } @@ -3204,7 +3237,7 @@ void CReserveKey::ReturnKey() vchPubKey = CPubKey(); } -void CWallet::GetAllReserveKeys(set<CKeyID>& setAddress) const +void CWallet::GetAllReserveKeys(std::set<CKeyID>& setAddress) const { setAddress.clear(); @@ -3215,11 +3248,11 @@ void CWallet::GetAllReserveKeys(set<CKeyID>& setAddress) const { CKeyPool keypool; if (!walletdb.ReadPool(id, keypool)) - throw runtime_error(std::string(__func__) + ": read failed"); + throw std::runtime_error(std::string(__func__) + ": read failed"); assert(keypool.vchPubKey.IsValid()); CKeyID keyID = keypool.vchPubKey.GetID(); if (!HaveKey(keyID)) - throw runtime_error(std::string(__func__) + ": unknown key in key pool"); + throw std::runtime_error(std::string(__func__) + ": unknown key in key pool"); setAddress.insert(keyID); } } @@ -3229,7 +3262,7 @@ void CWallet::UpdatedTransaction(const uint256 &hashTx) { LOCK(cs_wallet); // Only notify UI if this transaction is in this wallet - map<uint256, CWalletTx>::const_iterator mi = mapWallet.find(hashTx); + std::map<uint256, CWalletTx>::const_iterator mi = mapWallet.find(hashTx); if (mi != mapWallet.end()) NotifyTransactionChanged(this, hashTx, CT_UPDATED); } @@ -3316,14 +3349,16 @@ public: void operator()(const CNoDestination &none) {} }; -void CWallet::GetKeyBirthTimes(std::map<CKeyID, int64_t> &mapKeyBirth) const { +void CWallet::GetKeyBirthTimes(std::map<CTxDestination, int64_t> &mapKeyBirth) const { AssertLockHeld(cs_wallet); // mapKeyMetadata mapKeyBirth.clear(); // get birth times for keys with metadata - for (std::map<CKeyID, CKeyMetadata>::const_iterator it = mapKeyMetadata.begin(); it != mapKeyMetadata.end(); it++) - if (it->second.nCreateTime) - mapKeyBirth[it->first] = it->second.nCreateTime; + for (const auto& entry : mapKeyMetadata) { + if (entry.second.nCreateTime) { + mapKeyBirth[entry.first] = entry.second.nCreateTime; + } + } // map in which we'll infer heights of other keys CBlockIndex *pindexMax = chainActive[std::max(0, chainActive.Height() - 144)]; // the tip can be reorganized; use a 144-block safety margin @@ -3365,7 +3400,72 @@ void CWallet::GetKeyBirthTimes(std::map<CKeyID, int64_t> &mapKeyBirth) const { // Extract block timestamps for those keys for (std::map<CKeyID, CBlockIndex*>::const_iterator it = mapKeyFirstBlock.begin(); it != mapKeyFirstBlock.end(); it++) - mapKeyBirth[it->first] = it->second->GetBlockTime() - 7200; // block times can be 2h off + mapKeyBirth[it->first] = it->second->GetBlockTime() - TIMESTAMP_WINDOW; // block times can be 2h off +} + +/** + * Compute smart timestamp for a transaction being added to the wallet. + * + * Logic: + * - If sending a transaction, assign its timestamp to the current time. + * - If receiving a transaction outside a block, assign its timestamp to the + * current time. + * - If receiving a block with a future timestamp, assign all its (not already + * known) transactions' timestamps to the current time. + * - If receiving a block with a past timestamp, before the most recent known + * transaction (that we care about), assign all its (not already known) + * transactions' timestamps to the same timestamp as that most-recent-known + * transaction. + * - If receiving a block with a past timestamp, but after the most recent known + * transaction, assign all its (not already known) transactions' timestamps to + * the block time. + * + * For more information see CWalletTx::nTimeSmart, + * https://bitcointalk.org/?topic=54527, or + * https://github.com/bitcoin/bitcoin/pull/1393. + */ +unsigned int CWallet::ComputeTimeSmart(const CWalletTx& wtx) const +{ + unsigned int nTimeSmart = wtx.nTimeReceived; + if (!wtx.hashUnset()) { + if (mapBlockIndex.count(wtx.hashBlock)) { + int64_t latestNow = wtx.nTimeReceived; + int64_t latestEntry = 0; + + // Tolerate times up to the last timestamp in the wallet not more than 5 minutes into the future + int64_t latestTolerated = latestNow + 300; + const TxItems& txOrdered = wtxOrdered; + for (auto it = txOrdered.rbegin(); it != txOrdered.rend(); ++it) { + CWalletTx* const pwtx = it->second.first; + if (pwtx == &wtx) { + continue; + } + CAccountingEntry* const pacentry = it->second.second; + int64_t nSmartTime; + if (pwtx) { + nSmartTime = pwtx->nTimeSmart; + if (!nSmartTime) { + nSmartTime = pwtx->nTimeReceived; + } + } else { + nSmartTime = pacentry->nTime; + } + if (nSmartTime <= latestTolerated) { + latestEntry = nSmartTime; + if (nSmartTime > latestNow) { + latestNow = nSmartTime; + } + break; + } + } + + int64_t blocktime = mapBlockIndex[wtx.hashBlock]->GetBlockTime(); + nTimeSmart = std::max(latestEntry, std::min(blocktime, latestNow)); + } else { + LogPrintf("%s: found %s in block %s not in index\n", __func__, wtx.GetHash().ToString(), wtx.hashBlock.ToString()); + } + } + return nTimeSmart; } bool CWallet::AddDestData(const CTxDestination &dest, const std::string &key, const std::string &value) @@ -3423,8 +3523,6 @@ std::string CWallet::GetWalletHelpString(bool showDebug) CURRENCY_UNIT, FormatMoney(payTxFee.GetFeePerK()))); strUsage += HelpMessageOpt("-rescan", _("Rescan the block chain for missing wallet transactions on startup")); strUsage += HelpMessageOpt("-salvagewallet", _("Attempt to recover private keys from a corrupt wallet on startup")); - if (showDebug) - strUsage += HelpMessageOpt("-sendfreetransactions", strprintf(_("Send transactions as zero-fee transactions if possible (default: %u)"), DEFAULT_SEND_FREE_TRANSACTIONS)); strUsage += HelpMessageOpt("-spendzeroconfchange", strprintf(_("Spend unconfirmed change when sending transactions (default: %u)"), DEFAULT_SPEND_ZEROCONF_CHANGE)); strUsage += HelpMessageOpt("-txconfirmtarget=<n>", strprintf(_("If paytxfee is not set, include enough fee so transactions begin confirmation on average within n blocks (default: %u)"), DEFAULT_TX_CONFIRM_TARGET)); strUsage += HelpMessageOpt("-usehd", _("Use hierarchical deterministic key generation (HD) after BIP32. Only has effect during wallet creation/first start") + " " + strprintf(_("(default: %u)"), DEFAULT_USE_HD_WALLET)); @@ -3556,17 +3654,13 @@ CWallet* CWallet::CreateWalletFromFile(const std::string walletFile) RegisterValidationInterface(walletInstance); - CBlockIndex *pindexRescan = chainActive.Tip(); - if (GetBoolArg("-rescan", false)) - pindexRescan = chainActive.Genesis(); - else + CBlockIndex *pindexRescan = chainActive.Genesis(); + if (!GetBoolArg("-rescan", false)) { CWalletDB walletdb(walletFile); CBlockLocator locator; if (walletdb.ReadBestBlock(locator)) pindexRescan = FindForkInGlobalIndex(chainActive, locator); - else - pindexRescan = chainActive.Genesis(); } if (chainActive.Tip() && chainActive.Tip() != pindexRescan) { @@ -3591,7 +3685,7 @@ CWallet* CWallet::CreateWalletFromFile(const std::string walletFile) walletInstance->ScanForWalletTransactions(pindexRescan, true); LogPrintf(" rescan %15dms\n", GetTimeMillis() - nStart); walletInstance->SetBestChain(chainActive.GetLocator()); - nWalletDBUpdated++; + CWalletDB::IncrementUpdateCounter(); // Restore wallet transaction metadata after -zapwallettxes=1 if (GetBoolArg("-zapwallettxes", false) && GetArg("-zapwallettxes", "1") != "2") @@ -3640,6 +3734,12 @@ bool CWallet::InitLoadWallet() std::string walletFile = GetArg("-wallet", DEFAULT_WALLET_DAT); + if (walletFile.find_first_of("/\\") != std::string::npos) { + return InitError(_("-wallet parameter must only specify a filename (not a path)")); + } else if (SanitizeString(walletFile, SAFE_CHARS_FILENAME) != walletFile) { + return InitError(_("Invalid characters in -wallet filename")); + } + CWallet * const pwallet = CreateWalletFromFile(walletFile); if (!pwallet) { return false; @@ -3649,17 +3749,17 @@ bool CWallet::InitLoadWallet() return true; } -std::atomic<bool> CWallet::fFlushThreadRunning(false); +std::atomic<bool> CWallet::fFlushScheduled(false); -void CWallet::postInitProcess(boost::thread_group& threadGroup) +void CWallet::postInitProcess(CScheduler& scheduler) { // Add wallet transactions that aren't already in a block to mempool // Do this here as mempool requires genesis block to be loaded ReacceptWalletTransactions(); // Run a thread to flush wallet periodically - if (!CWallet::fFlushThreadRunning.exchange(true)) { - threadGroup.create_thread(ThreadFlushWalletDB); + if (!CWallet::fFlushScheduled.exchange(true)) { + scheduler.scheduleEvery(MaybeCompactWalletDB, 500); } } @@ -3743,12 +3843,8 @@ bool CWallet::ParameterInteraction() } nTxConfirmTarget = GetArg("-txconfirmtarget", DEFAULT_TX_CONFIRM_TARGET); bSpendZeroConfChange = GetBoolArg("-spendzeroconfchange", DEFAULT_SPEND_ZEROCONF_CHANGE); - fSendFreeTransactions = GetBoolArg("-sendfreetransactions", DEFAULT_SEND_FREE_TRANSACTIONS); fWalletRbf = GetBoolArg("-walletrbf", DEFAULT_WALLET_RBF); - if (fSendFreeTransactions && GetArg("-limitfreerelay", DEFAULT_LIMITFREERELAY) <= 0) - return InitError("Creation of free transactions with their relay disabled is not supported."); - return true; } @@ -3774,11 +3870,7 @@ bool CWallet::BackupWallet(const std::string& strDest) pathDest /= strWalletFile; try { -#if BOOST_VERSION >= 104000 boost::filesystem::copy_file(pathSrc, pathDest, boost::filesystem::copy_option::overwrite_if_exists); -#else - boost::filesystem::copy_file(pathSrc, pathDest); -#endif LogPrintf("copied %s to %s\n", strWalletFile, pathDest.string()); return true; } catch (const boost::filesystem::filesystem_error& e) { @@ -3841,11 +3933,11 @@ int CMerkleTx::GetBlocksToMaturity() const { if (!IsCoinBase()) return 0; - return max(0, (COINBASE_MATURITY+1) - GetDepthInMainChain()); + return std::max(0, (COINBASE_MATURITY+1) - GetDepthInMainChain()); } bool CMerkleTx::AcceptToMemoryPool(const CAmount& nAbsurdFee, CValidationState& state) { - return ::AcceptToMemoryPool(mempool, state, tx, true, NULL, false, nAbsurdFee); + return ::AcceptToMemoryPool(mempool, state, tx, true, NULL, NULL, false, nAbsurdFee); } diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h index b9fa6bb24b..80201e8ce0 100644 --- a/src/wallet/wallet.h +++ b/src/wallet/wallet.h @@ -13,6 +13,7 @@ #include "utilstrencodings.h" #include "validationinterface.h" #include "script/ismine.h" +#include "script/sign.h" #include "wallet/crypter.h" #include "wallet/walletdb.h" #include "wallet/rpcwallet.h" @@ -28,7 +29,6 @@ #include <vector> #include <boost/shared_ptr.hpp> -#include <boost/thread.hpp> extern CWallet* pwalletMain; @@ -38,7 +38,6 @@ extern CWallet* pwalletMain; extern CFeeRate payTxFee; extern unsigned int nTxConfirmTarget; extern bool bSpendZeroConfChange; -extern bool fSendFreeTransactions; extern bool fWalletRbf; static const unsigned int DEFAULT_KEYPOOL_SIZE = 100; @@ -48,22 +47,20 @@ static const CAmount DEFAULT_TRANSACTION_FEE = 0; static const CAmount DEFAULT_FALLBACK_FEE = 20000; //! -mintxfee default static const CAmount DEFAULT_TRANSACTION_MINFEE = 1000; +//! minimum recommended increment for BIP 125 replacement txs +static const CAmount WALLET_INCREMENTAL_RELAY_FEE = 5000; //! target minimum change amount static const CAmount MIN_CHANGE = CENT; //! final minimum change amount after paying for fees static const CAmount MIN_FINAL_CHANGE = MIN_CHANGE/2; //! Default for -spendzeroconfchange static const bool DEFAULT_SPEND_ZEROCONF_CHANGE = true; -//! Default for -sendfreetransactions -static const bool DEFAULT_SEND_FREE_TRANSACTIONS = false; //! Default for -walletrejectlongchains static const bool DEFAULT_WALLET_REJECT_LONG_CHAINS = false; //! -txconfirmtarget default static const unsigned int DEFAULT_TX_CONFIRM_TARGET = 6; //! -walletrbf default static const bool DEFAULT_WALLET_RBF = false; -//! Largest (in bytes) free transaction we're willing to create -static const unsigned int MAX_FREE_TRANSACTION_CREATE_SIZE = 1000; static const bool DEFAULT_WALLETBROADCAST = true; static const bool DEFAULT_DISABLE_WALLET = false; //! if set, all keys will be derived by using BIP32 @@ -76,6 +73,7 @@ class CCoinControl; class COutput; class CReserveKey; class CScript; +class CScheduler; class CTxMemPool; class CWalletTx; @@ -253,11 +251,50 @@ private: const CWallet* pwallet; public: + /** + * Key/value map with information about the transaction. + * + * The following keys can be read and written through the map and are + * serialized in the wallet database: + * + * "comment", "to" - comment strings provided to sendtoaddress, + * sendfrom, sendmany wallet RPCs + * "replaces_txid" - txid (as HexStr) of transaction replaced by + * bumpfee on transaction created by bumpfee + * "replaced_by_txid" - txid (as HexStr) of transaction created by + * bumpfee on transaction replaced by bumpfee + * "from", "message" - obsolete fields that could be set in UI prior to + * 2011 (removed in commit 4d9b223) + * + * The following keys are serialized in the wallet database, but shouldn't + * be read or written through the map (they will be temporarily added and + * removed from the map during serialization): + * + * "fromaccount" - serialized strFromAccount value + * "n" - serialized nOrderPos value + * "timesmart" - serialized nTimeSmart value + * "spent" - serialized vfSpent value that existed prior to + * 2014 (removed in commit 93a18a3) + */ mapValue_t mapValue; std::vector<std::pair<std::string, std::string> > vOrderForm; unsigned int fTimeReceivedIsTxTime; unsigned int nTimeReceived; //!< time received by this node + /** + * Stable timestamp that never changes, and reflects the order a transaction + * was added to the wallet. Timestamp is based on the block time for a + * transaction added as part of a block, or else the time when the + * transaction was received if it wasn't part of a block, with the timestamp + * adjusted in both cases so timestamp order matches the order transactions + * were added to the wallet. More details can be found in + * CWallet::ComputeTimeSmart(). + */ unsigned int nTimeSmart; + /** + * From me flag is set to 1 for transactions that were created by the wallet + * on this bitcoin node, and set to 0 for transactions that were created + * externally and came in through the network or sendrawtransaction RPC. + */ char fFromMe; std::string strFromAccount; int64_t nOrderPos; //!< position in ordered transaction list @@ -361,7 +398,6 @@ public: } mapValue.erase("fromaccount"); - mapValue.erase("version"); mapValue.erase("spent"); mapValue.erase("n"); mapValue.erase("timesmart"); @@ -430,12 +466,23 @@ public: const CWalletTx *tx; int i; int nDepth; + + /** Whether we have the private keys to spend this output */ bool fSpendable; + + /** Whether we know how to spend this output, ignoring the lack of keys */ bool fSolvable; - COutput(const CWalletTx *txIn, int iIn, int nDepthIn, bool fSpendableIn, bool fSolvableIn) + /** + * Whether this output is considered safe to spend. Unconfirmed transactions + * from outside keys and unconfirmed replacement transactions are considered + * unsafe and will not be used to fund new spending transactions. + */ + bool fSafe; + + COutput(const CWalletTx *txIn, int iIn, int nDepthIn, bool fSpendableIn, bool fSolvableIn, bool fSafeIn) { - tx = txIn; i = iIn; nDepth = nDepthIn; fSpendable = fSpendableIn; fSolvable = fSolvableIn; + tx = txIn; i = iIn; nDepth = nDepthIn; fSpendable = fSpendableIn; fSolvable = fSolvableIn; fSafe = fSafeIn; } std::string ToString() const; @@ -561,7 +608,7 @@ private: class CWallet : public CCryptoKeyStore, public CValidationInterface { private: - static std::atomic<bool> fFlushThreadRunning; + static std::atomic<bool> fFlushScheduled; /** * Select a set of coins such that nValueRet >= nTargetValue and at least @@ -603,6 +650,20 @@ private: bool fFileBacked; std::set<int64_t> setKeyPool; + + int64_t nTimeFirstKey; + + /** + * Private version of AddWatchOnly method which does not accept a + * timestamp, and which will reset the wallet's nTimeFirstKey value to 1 if + * the watch key did not previously have a timestamp associated with it. + * Because this is an inherited virtual method, it is accessible despite + * being marked private, but it is marked private anyway to encourage use + * of the other AddWatchOnly which accepts a timestamp and sets + * nTimeFirstKey more intelligently for more efficient rescans. + */ + bool AddWatchOnly(const CScript& dest) override; + public: /* * Main wallet lock. @@ -627,7 +688,9 @@ public: mapKeyMetadata[keyid] = CKeyMetadata(keypool.nTime); } - std::map<CKeyID, CKeyMetadata> mapKeyMetadata; + // Map from Key ID (for regular keys) or Script ID (for watch-only keys) to + // key metadata. + std::map<CTxDestination, CKeyMetadata> mapKeyMetadata; typedef std::map<unsigned int, CMasterKey> MasterKeyMap; MasterKeyMap mapMasterKeys; @@ -680,8 +743,6 @@ public: std::set<COutPoint> setLockedCoins; - int64_t nTimeFirstKey; - const CWalletTx* GetWalletTx(const uint256& hash) const; //! check whether we are allowed to upgrade (or already support) to the named feature @@ -690,7 +751,7 @@ public: /** * populate vCoins with vector of available COutputs. */ - void AvailableCoins(std::vector<COutput>& vCoins, bool fOnlyConfirmed=true, const CCoinControl *coinControl = NULL, bool fIncludeZeroValue=false) const; + void AvailableCoins(std::vector<COutput>& vCoins, bool fOnlySafe=true, const CCoinControl *coinControl = NULL, bool fIncludeZeroValue=false) const; /** * Shuffle and select coins until nTargetValue is reached while avoiding @@ -715,19 +776,20 @@ public: CPubKey GenerateNewKey(); void DeriveNewChildKey(CKeyMetadata& metadata, CKey& secret); //! Adds a key to the store, and saves it to disk. - bool AddKeyPubKey(const CKey& key, const CPubKey &pubkey); + bool AddKeyPubKey(const CKey& key, const CPubKey &pubkey) override; //! Adds a key to the store, without saving it to disk (used by LoadWallet) bool LoadKey(const CKey& key, const CPubKey &pubkey) { return CCryptoKeyStore::AddKeyPubKey(key, pubkey); } //! Load metadata (used by LoadWallet) - bool LoadKeyMetadata(const CPubKey &pubkey, const CKeyMetadata &metadata); + bool LoadKeyMetadata(const CTxDestination& pubKey, const CKeyMetadata &metadata); bool LoadMinVersion(int nVersion) { AssertLockHeld(cs_wallet); nWalletVersion = nVersion; nWalletMaxVersion = std::max(nWalletMaxVersion, nVersion); return true; } + void UpdateTimeFirstKey(int64_t nCreateTime); //! Adds an encrypted key to the store, and saves it to disk. - bool AddCryptedKey(const CPubKey &vchPubKey, const std::vector<unsigned char> &vchCryptedSecret); + bool AddCryptedKey(const CPubKey &vchPubKey, const std::vector<unsigned char> &vchCryptedSecret) override; //! Adds an encrypted key to the store, without saving it to disk (used by LoadWallet) bool LoadCryptedKey(const CPubKey &vchPubKey, const std::vector<unsigned char> &vchCryptedSecret); - bool AddCScript(const CScript& redeemScript); + bool AddCScript(const CScript& redeemScript) override; bool LoadCScript(const CScript& redeemScript); //! Adds a destination data tuple to the store, and saves it to disk @@ -740,16 +802,20 @@ public: bool GetDestData(const CTxDestination &dest, const std::string &key, std::string *value) const; //! Adds a watch-only address to the store, and saves it to disk. - bool AddWatchOnly(const CScript &dest); - bool RemoveWatchOnly(const CScript &dest); + bool AddWatchOnly(const CScript& dest, int64_t nCreateTime); + bool RemoveWatchOnly(const CScript &dest) override; //! Adds a watch-only address to the store, without saving it to disk (used by LoadWallet) bool LoadWatchOnly(const CScript &dest); + //! Holds a timestamp at which point the wallet is scheduled (externally) to be relocked. Caller must arrange for actual relocking to occur via Lock(). + int64_t nRelockTime; + bool Unlock(const SecureString& strWalletPassphrase); bool ChangeWalletPassphrase(const SecureString& strOldWalletPassphrase, const SecureString& strNewWalletPassphrase); bool EncryptWallet(const SecureString& strWalletPassphrase); - void GetKeyBirthTimes(std::map<CKeyID, int64_t> &mapKeyBirth) const; + void GetKeyBirthTimes(std::map<CTxDestination, int64_t> &mapKeyBirth) const; + unsigned int ComputeTimeSmart(const CWalletTx& wtx) const; /** * Increment the next transaction order id @@ -763,11 +829,11 @@ public: void MarkDirty(); bool AddToWallet(const CWalletTx& wtxIn, bool fFlushOnClose=true); bool LoadToWallet(const CWalletTx& wtxIn); - void SyncTransaction(const CTransaction& tx, const CBlockIndex *pindex, int posInBlock); + void SyncTransaction(const CTransaction& tx, const CBlockIndex *pindex, int posInBlock) override; bool AddToWalletIfInvolvingMe(const CTransaction& tx, const CBlockIndex* pIndex, int posInBlock, bool fUpdate); - int ScanForWalletTransactions(CBlockIndex* pindexStart, bool fUpdate = false); + CBlockIndex* ScanForWalletTransactions(CBlockIndex* pindexStart, bool fUpdate = false); void ReacceptWalletTransactions(); - void ResendWalletTransactions(int64_t nBestBlockTime, CConnman* connman); + void ResendWalletTransactions(int64_t nBestBlockTime, CConnman* connman) override; std::vector<uint256> ResendWalletTransactionsBefore(int64_t nTime, CConnman* connman); CAmount GetBalance() const; CAmount GetUnconfirmedBalance() const; @@ -780,7 +846,7 @@ public: * Insert additional inputs into the transaction by * calling CreateTransaction(); */ - bool FundTransaction(CMutableTransaction& tx, CAmount& nFeeRet, bool overrideEstimatedFeeRate, const CFeeRate& specificFeeRate, int& nChangePosInOut, std::string& strFailReason, bool includeWatching, bool lockUnspents, const CTxDestination& destChange = CNoDestination()); + bool FundTransaction(CMutableTransaction& tx, CAmount& nFeeRet, bool overrideEstimatedFeeRate, const CFeeRate& specificFeeRate, int& nChangePosInOut, std::string& strFailReason, bool includeWatching, bool lockUnspents, const std::set<int>& setSubtractFeeFromOutputs, bool keepReserveKey = true, const CTxDestination& destChange = CNoDestination()); /** * Create a new transaction paying the recipients with a set of coins @@ -794,6 +860,8 @@ public: void ListAccountCreditDebit(const std::string& strAccount, std::list<CAccountingEntry>& entries); bool AddAccountingEntry(const CAccountingEntry&); bool AddAccountingEntry(const CAccountingEntry&, CWalletDB *pwalletdb); + template <typename ContainerType> + bool DummySignTx(CMutableTransaction &txNew, const ContainerType &coins); static CFeeRate minTxFee; static CFeeRate fallbackFee; @@ -803,6 +871,11 @@ public: */ static CAmount GetMinimumFee(unsigned int nTxBytes, unsigned int nConfirmTarget, const CTxMemPool& pool); /** + * Estimate the minimum fee considering required fee and targetFee or if 0 + * then fee estimation for nConfirmTarget + */ + static CAmount GetMinimumFee(unsigned int nTxBytes, unsigned int nConfirmTarget, const CTxMemPool& pool, CAmount targetFee); + /** * Return the minimum required fee taking into account the * floating relay fee and user set minimum transaction fee */ @@ -825,6 +898,10 @@ public: std::set<CTxDestination> GetAccountAddresses(const std::string& strAccount) const; isminetype IsMine(const CTxIn& txin) const; + /** + * Returns amount of debit if the input matches the + * filter, otherwise returns 0 + */ CAmount GetDebit(const CTxIn& txin, const isminefilter& filter) const; isminetype IsMine(const CTxOut& txout) const; CAmount GetCredit(const CTxOut& txout, const isminefilter& filter) const; @@ -834,9 +911,11 @@ public: /** should probably be renamed to IsRelevantToMe */ bool IsFromMe(const CTransaction& tx) const; CAmount GetDebit(const CTransaction& tx, const isminefilter& filter) const; + /** Returns whether all of the inputs match the filter */ + bool IsAllFromMe(const CTransaction& tx, const isminefilter& filter) const; CAmount GetCredit(const CTransaction& tx, const isminefilter& filter) const; CAmount GetChange(const CTransaction& tx) const; - void SetBestChain(const CBlockLocator& loc); + void SetBestChain(const CBlockLocator& loc) override; DBErrors LoadWallet(bool& fFirstRunRet); DBErrors ZapWalletTx(std::vector<CWalletTx>& vWtx); @@ -846,9 +925,9 @@ public: bool DelAddressBook(const CTxDestination& address); - void UpdatedTransaction(const uint256 &hashTx); + void UpdatedTransaction(const uint256 &hashTx) override; - void Inventory(const uint256 &hash) + void Inventory(const uint256 &hash) override { { LOCK(cs_wallet); @@ -858,8 +937,8 @@ public: } } - void GetScriptForMining(boost::shared_ptr<CReserveScript> &script); - void ResetRequestCount(const uint256 &hash) + void GetScriptForMining(boost::shared_ptr<CReserveScript> &script) override; + void ResetRequestCount(const uint256 &hash) override { LOCK(cs_wallet); mapRequestCount[hash] = 0; @@ -885,6 +964,9 @@ public: //! Get wallet transactions that conflict with given transaction (spend same outputs) std::set<uint256> GetConflicts(const uint256& txid) const; + //! Check if a given transaction has any of its outputs spent by another transaction in the wallet + bool HasWalletSpend(const uint256& txid) const; + //! Flush wallet (bitdb flush) void Flush(bool shutdown=false); @@ -921,6 +1003,9 @@ public: /* Mark a transaction (and it in-wallet descendants) as abandoned so its inputs may be respent. */ bool AbandonTransaction(const uint256& hashTx); + /** Mark a transaction as replaced by another transaction (e.g., BIP 125). */ + bool MarkReplaced(const uint256& originalHash, const uint256& newHash); + /* Returns the wallets help message */ static std::string GetWalletHelpString(bool showDebug); @@ -932,7 +1017,7 @@ public: * Wallet post-init setup * Gives the wallet a chance to register repetitive tasks and complete post-init tasks */ - void postInitProcess(boost::thread_group& threadGroup); + void postInitProcess(CScheduler& scheduler); /* Wallets parameter interaction */ static bool ParameterInteraction(); @@ -941,10 +1026,10 @@ public: /* Set the HD chain model (chain child index counters) */ bool SetHDChain(const CHDChain& chain, bool memonly); - const CHDChain& GetHDChain() { return hdChain; } + const CHDChain& GetHDChain() const { return hdChain; } /* Returns true if HD is enabled */ - bool IsHDEnabled(); + bool IsHDEnabled() const; /* Generates a new HD master key (will not be activated) */ CPubKey GenerateNewHDMasterKey(); @@ -967,6 +1052,10 @@ public: pwallet = pwalletIn; } + CReserveKey() = default; + CReserveKey(const CReserveKey&) = delete; + CReserveKey& operator=(const CReserveKey&) = delete; + ~CReserveKey() { ReturnKey(); @@ -1009,4 +1098,28 @@ public: } }; +// Helper for producing a bunch of max-sized low-S signatures (eg 72 bytes) +// ContainerType is meant to hold pair<CWalletTx *, int>, and be iterable +// so that each entry corresponds to each vIn, in order. +template <typename ContainerType> +bool CWallet::DummySignTx(CMutableTransaction &txNew, const ContainerType &coins) +{ + // Fill in dummy signatures for fee calculation. + int nIn = 0; + for (const auto& coin : coins) + { + const CScript& scriptPubKey = coin.first->tx->vout[coin.second].scriptPubKey; + SignatureData sigdata; + + if (!ProduceSignature(DummySignatureCreator(this), scriptPubKey, sigdata)) + { + return false; + } else { + UpdateTransaction(txNew, nIn, sigdata); + } + + nIn++; + } + return true; +} #endif // BITCOIN_WALLET_WALLET_H diff --git a/src/wallet/walletdb.cpp b/src/wallet/walletdb.cpp index 9cd19ab619..d017965385 100644 --- a/src/wallet/walletdb.cpp +++ b/src/wallet/walletdb.cpp @@ -15,60 +15,62 @@ #include "utiltime.h" #include "wallet/wallet.h" +#include <atomic> + #include <boost/version.hpp> #include <boost/filesystem.hpp> #include <boost/foreach.hpp> #include <boost/thread.hpp> -using namespace std; - static uint64_t nAccountingEntryNumber = 0; +static std::atomic<unsigned int> nWalletDBUpdateCounter; + // // CWalletDB // -bool CWalletDB::WriteName(const string& strAddress, const string& strName) +bool CWalletDB::WriteName(const std::string& strAddress, const std::string& strName) { - nWalletDBUpdated++; - return Write(make_pair(string("name"), strAddress), strName); + nWalletDBUpdateCounter++; + return Write(make_pair(std::string("name"), strAddress), strName); } -bool CWalletDB::EraseName(const string& strAddress) +bool CWalletDB::EraseName(const std::string& strAddress) { // This should only be used for sending addresses, never for receiving addresses, // receiving addresses must always have an address book entry if they're not change return. - nWalletDBUpdated++; - return Erase(make_pair(string("name"), strAddress)); + nWalletDBUpdateCounter++; + return Erase(make_pair(std::string("name"), strAddress)); } -bool CWalletDB::WritePurpose(const string& strAddress, const string& strPurpose) +bool CWalletDB::WritePurpose(const std::string& strAddress, const std::string& strPurpose) { - nWalletDBUpdated++; - return Write(make_pair(string("purpose"), strAddress), strPurpose); + nWalletDBUpdateCounter++; + return Write(make_pair(std::string("purpose"), strAddress), strPurpose); } -bool CWalletDB::ErasePurpose(const string& strPurpose) +bool CWalletDB::ErasePurpose(const std::string& strPurpose) { - nWalletDBUpdated++; - return Erase(make_pair(string("purpose"), strPurpose)); + nWalletDBUpdateCounter++; + return Erase(make_pair(std::string("purpose"), strPurpose)); } bool CWalletDB::WriteTx(const CWalletTx& wtx) { - nWalletDBUpdated++; + nWalletDBUpdateCounter++; return Write(std::make_pair(std::string("tx"), wtx.GetHash()), wtx); } bool CWalletDB::EraseTx(uint256 hash) { - nWalletDBUpdated++; + nWalletDBUpdateCounter++; return Erase(std::make_pair(std::string("tx"), hash)); } bool CWalletDB::WriteKey(const CPubKey& vchPubKey, const CPrivKey& vchPrivKey, const CKeyMetadata& keyMeta) { - nWalletDBUpdated++; + nWalletDBUpdateCounter++; if (!Write(std::make_pair(std::string("keymeta"), vchPubKey), keyMeta, false)) @@ -88,7 +90,7 @@ bool CWalletDB::WriteCryptedKey(const CPubKey& vchPubKey, const CKeyMetadata &keyMeta) { const bool fEraseUnencryptedKey = true; - nWalletDBUpdated++; + nWalletDBUpdateCounter++; if (!Write(std::make_pair(std::string("keymeta"), vchPubKey), keyMeta)) @@ -106,31 +108,35 @@ bool CWalletDB::WriteCryptedKey(const CPubKey& vchPubKey, bool CWalletDB::WriteMasterKey(unsigned int nID, const CMasterKey& kMasterKey) { - nWalletDBUpdated++; + nWalletDBUpdateCounter++; return Write(std::make_pair(std::string("mkey"), nID), kMasterKey, true); } bool CWalletDB::WriteCScript(const uint160& hash, const CScript& redeemScript) { - nWalletDBUpdated++; + nWalletDBUpdateCounter++; return Write(std::make_pair(std::string("cscript"), hash), *(const CScriptBase*)(&redeemScript), false); } -bool CWalletDB::WriteWatchOnly(const CScript &dest) +bool CWalletDB::WriteWatchOnly(const CScript &dest, const CKeyMetadata& keyMeta) { - nWalletDBUpdated++; + nWalletDBUpdateCounter++; + if (!Write(std::make_pair(std::string("watchmeta"), *(const CScriptBase*)(&dest)), keyMeta)) + return false; return Write(std::make_pair(std::string("watchs"), *(const CScriptBase*)(&dest)), '1'); } bool CWalletDB::EraseWatchOnly(const CScript &dest) { - nWalletDBUpdated++; + nWalletDBUpdateCounter++; + if (!Erase(std::make_pair(std::string("watchmeta"), *(const CScriptBase*)(&dest)))) + return false; return Erase(std::make_pair(std::string("watchs"), *(const CScriptBase*)(&dest))); } bool CWalletDB::WriteBestBlock(const CBlockLocator& locator) { - nWalletDBUpdated++; + nWalletDBUpdateCounter++; Write(std::string("bestblock"), CBlockLocator()); // Write empty block locator so versions that require a merkle branch automatically rescan return Write(std::string("bestblock_nomerkle"), locator); } @@ -143,13 +149,13 @@ bool CWalletDB::ReadBestBlock(CBlockLocator& locator) bool CWalletDB::WriteOrderPosNext(int64_t nOrderPosNext) { - nWalletDBUpdated++; + nWalletDBUpdateCounter++; return Write(std::string("orderposnext"), nOrderPosNext); } bool CWalletDB::WriteDefaultKey(const CPubKey& vchPubKey) { - nWalletDBUpdated++; + nWalletDBUpdateCounter++; return Write(std::string("defaultkey"), vchPubKey); } @@ -160,13 +166,13 @@ bool CWalletDB::ReadPool(int64_t nPool, CKeyPool& keypool) bool CWalletDB::WritePool(int64_t nPool, const CKeyPool& keypool) { - nWalletDBUpdated++; + nWalletDBUpdateCounter++; return Write(std::make_pair(std::string("pool"), nPool), keypool); } bool CWalletDB::ErasePool(int64_t nPool) { - nWalletDBUpdated++; + nWalletDBUpdateCounter++; return Erase(std::make_pair(std::string("pool"), nPool)); } @@ -175,15 +181,15 @@ bool CWalletDB::WriteMinVersion(int nVersion) return Write(std::string("minversion"), nVersion); } -bool CWalletDB::ReadAccount(const string& strAccount, CAccount& account) +bool CWalletDB::ReadAccount(const std::string& strAccount, CAccount& account) { account.SetNull(); - return Read(make_pair(string("acc"), strAccount), account); + return Read(make_pair(std::string("acc"), strAccount), account); } -bool CWalletDB::WriteAccount(const string& strAccount, const CAccount& account) +bool CWalletDB::WriteAccount(const std::string& strAccount, const CAccount& account) { - return Write(make_pair(string("acc"), strAccount), account); + return Write(make_pair(std::string("acc"), strAccount), account); } bool CWalletDB::WriteAccountingEntry(const uint64_t nAccEntryNum, const CAccountingEntry& acentry) @@ -196,9 +202,9 @@ bool CWalletDB::WriteAccountingEntry_Backend(const CAccountingEntry& acentry) return WriteAccountingEntry(++nAccountingEntryNumber, acentry); } -CAmount CWalletDB::GetAccountCreditDebit(const string& strAccount) +CAmount CWalletDB::GetAccountCreditDebit(const std::string& strAccount) { - list<CAccountingEntry> entries; + std::list<CAccountingEntry> entries; ListAccountCreditDebit(strAccount, entries); CAmount nCreditDebit = 0; @@ -208,20 +214,20 @@ CAmount CWalletDB::GetAccountCreditDebit(const string& strAccount) return nCreditDebit; } -void CWalletDB::ListAccountCreditDebit(const string& strAccount, list<CAccountingEntry>& entries) +void CWalletDB::ListAccountCreditDebit(const std::string& strAccount, std::list<CAccountingEntry>& entries) { bool fAllAccounts = (strAccount == "*"); Dbc* pcursor = GetCursor(); if (!pcursor) - throw runtime_error(std::string(__func__) + ": cannot create DB cursor"); + throw std::runtime_error(std::string(__func__) + ": cannot create DB cursor"); bool setRange = true; while (true) { // Read next record CDataStream ssKey(SER_DISK, CLIENT_VERSION); if (setRange) - ssKey << std::make_pair(std::string("acentry"), std::make_pair((fAllAccounts ? string("") : strAccount), uint64_t(0))); + ssKey << std::make_pair(std::string("acentry"), std::make_pair((fAllAccounts ? std::string("") : strAccount), uint64_t(0))); CDataStream ssValue(SER_DISK, CLIENT_VERSION); int ret = ReadAtCursor(pcursor, ssKey, ssValue, setRange); setRange = false; @@ -230,11 +236,11 @@ void CWalletDB::ListAccountCreditDebit(const string& strAccount, list<CAccountin else if (ret != 0) { pcursor->close(); - throw runtime_error(std::string(__func__) + ": error scanning DB"); + throw std::runtime_error(std::string(__func__) + ": error scanning DB"); } // Unserialize - string strType; + std::string strType; ssKey >> strType; if (strType != "acentry") break; @@ -255,14 +261,15 @@ class CWalletScanState { public: unsigned int nKeys; unsigned int nCKeys; + unsigned int nWatchKeys; unsigned int nKeyMeta; bool fIsEncrypted; bool fAnyUnordered; int nFileVersion; - vector<uint256> vWalletUpgrade; + std::vector<uint256> vWalletUpgrade; CWalletScanState() { - nKeys = nCKeys = nKeyMeta = 0; + nKeys = nCKeys = nWatchKeys = nKeyMeta = 0; fIsEncrypted = false; fAnyUnordered = false; nFileVersion = 0; @@ -271,7 +278,7 @@ public: bool ReadKeyValue(CWallet* pwallet, CDataStream& ssKey, CDataStream& ssValue, - CWalletScanState &wss, string& strType, string& strErr) + CWalletScanState &wss, std::string& strType, std::string& strErr) { try { // Unserialize @@ -280,13 +287,13 @@ ReadKeyValue(CWallet* pwallet, CDataStream& ssKey, CDataStream& ssValue, ssKey >> strType; if (strType == "name") { - string strAddress; + std::string strAddress; ssKey >> strAddress; ssValue >> pwallet->mapAddressBook[CBitcoinAddress(strAddress).Get()].name; } else if (strType == "purpose") { - string strAddress; + std::string strAddress; ssKey >> strAddress; ssValue >> pwallet->mapAddressBook[CBitcoinAddress(strAddress).Get()].purpose; } @@ -327,7 +334,7 @@ ReadKeyValue(CWallet* pwallet, CDataStream& ssKey, CDataStream& ssValue, } else if (strType == "acentry") { - string strAccount; + std::string strAccount; ssKey >> strAccount; uint64_t nNumber; ssKey >> nNumber; @@ -344,16 +351,13 @@ ReadKeyValue(CWallet* pwallet, CDataStream& ssKey, CDataStream& ssValue, } else if (strType == "watchs") { + wss.nWatchKeys++; CScript script; ssKey >> *(CScriptBase*)(&script); char fYes; ssValue >> fYes; if (fYes == '1') pwallet->LoadWatchOnly(script); - - // Watch-only addresses have no birthday information for now, - // so set the wallet birthday to the beginning of time. - pwallet->nTimeFirstKey = 1; } else if (strType == "key" || strType == "wkey") { @@ -443,7 +447,7 @@ ReadKeyValue(CWallet* pwallet, CDataStream& ssKey, CDataStream& ssValue, strErr = "Error reading wallet database: CPubKey corrupt"; return false; } - vector<unsigned char> vchPrivKey; + std::vector<unsigned char> vchPrivKey; ssValue >> vchPrivKey; wss.nCKeys++; @@ -454,20 +458,27 @@ ReadKeyValue(CWallet* pwallet, CDataStream& ssKey, CDataStream& ssValue, } wss.fIsEncrypted = true; } - else if (strType == "keymeta") + else if (strType == "keymeta" || strType == "watchmeta") { - CPubKey vchPubKey; - ssKey >> vchPubKey; + CTxDestination keyID; + if (strType == "keymeta") + { + CPubKey vchPubKey; + ssKey >> vchPubKey; + keyID = vchPubKey.GetID(); + } + else if (strType == "watchmeta") + { + CScript script; + ssKey >> *(CScriptBase*)(&script); + keyID = CScriptID(script); + } + CKeyMetadata keyMeta; ssValue >> keyMeta; wss.nKeyMeta++; - pwallet->LoadKeyMetadata(vchPubKey, keyMeta); - - // find earliest key creation time, as wallet birthday - if (!pwallet->nTimeFirstKey || - (keyMeta.nCreateTime < pwallet->nTimeFirstKey)) - pwallet->nTimeFirstKey = keyMeta.nCreateTime; + pwallet->LoadKeyMetadata(keyID, keyMeta); } else if (strType == "defaultkey") { @@ -533,7 +544,7 @@ ReadKeyValue(CWallet* pwallet, CDataStream& ssKey, CDataStream& ssValue, return true; } -static bool IsKeyType(string strType) +bool CWalletDB::IsKeyType(const std::string& strType) { return (strType== "key" || strType == "wkey" || strType == "mkey" || strType == "ckey"); @@ -546,10 +557,10 @@ DBErrors CWalletDB::LoadWallet(CWallet* pwallet) bool fNoncriticalErrors = false; DBErrors result = DB_LOAD_OK; + LOCK(pwallet->cs_wallet); try { - LOCK(pwallet->cs_wallet); int nMinVersion = 0; - if (Read((string)"minversion", nMinVersion)) + if (Read((std::string)"minversion", nMinVersion)) { if (nMinVersion > CLIENT_VERSION) return DB_TOO_NEW; @@ -579,7 +590,7 @@ DBErrors CWalletDB::LoadWallet(CWallet* pwallet) } // Try to be tolerant of single corrupt records: - string strType, strErr; + std::string strType, strErr; if (!ReadKeyValue(pwallet, ssKey, ssValue, wss, strType, strErr)) { // losing keys is considered a catastrophic error, anything else @@ -621,8 +632,8 @@ DBErrors CWalletDB::LoadWallet(CWallet* pwallet) wss.nKeys, wss.nCKeys, wss.nKeyMeta, wss.nKeys + wss.nCKeys); // nTimeFirstKey is only reliable if all keys have metadata - if ((wss.nKeys + wss.nCKeys) != wss.nKeyMeta) - pwallet->nTimeFirstKey = 1; // 0 would be considered 'no value' + if ((wss.nKeys + wss.nCKeys + wss.nWatchKeys) != wss.nKeyMeta) + pwallet->UpdateTimeFirstKey(1); BOOST_FOREACH(uint256 hash, wss.vWalletUpgrade) WriteTx(pwallet->mapWallet[hash]); @@ -646,20 +657,17 @@ DBErrors CWalletDB::LoadWallet(CWallet* pwallet) return result; } -DBErrors CWalletDB::FindWalletTx(CWallet* pwallet, vector<uint256>& vTxHash, vector<CWalletTx>& vWtx) +DBErrors CWalletDB::FindWalletTx(std::vector<uint256>& vTxHash, std::vector<CWalletTx>& vWtx) { - pwallet->vchDefaultKey = CPubKey(); bool fNoncriticalErrors = false; DBErrors result = DB_LOAD_OK; try { - LOCK(pwallet->cs_wallet); int nMinVersion = 0; - if (Read((string)"minversion", nMinVersion)) + if (Read((std::string)"minversion", nMinVersion)) { if (nMinVersion > CLIENT_VERSION) return DB_TOO_NEW; - pwallet->LoadMinVersion(nMinVersion); } // Get cursor @@ -684,7 +692,7 @@ DBErrors CWalletDB::FindWalletTx(CWallet* pwallet, vector<uint256>& vTxHash, vec return DB_CORRUPT; } - string strType; + std::string strType; ssKey >> strType; if (strType == "tx") { uint256 hash; @@ -712,12 +720,12 @@ DBErrors CWalletDB::FindWalletTx(CWallet* pwallet, vector<uint256>& vTxHash, vec return result; } -DBErrors CWalletDB::ZapSelectTx(CWallet* pwallet, vector<uint256>& vTxHashIn, vector<uint256>& vTxHashOut) +DBErrors CWalletDB::ZapSelectTx(std::vector<uint256>& vTxHashIn, std::vector<uint256>& vTxHashOut) { // build list of wallet TXs and hashes - vector<uint256> vTxHash; - vector<CWalletTx> vWtx; - DBErrors err = FindWalletTx(pwallet, vTxHash, vWtx); + std::vector<uint256> vTxHash; + std::vector<CWalletTx> vWtx; + DBErrors err = FindWalletTx(vTxHash, vWtx); if (err != DB_LOAD_OK) { return err; } @@ -727,7 +735,7 @@ DBErrors CWalletDB::ZapSelectTx(CWallet* pwallet, vector<uint256>& vTxHashIn, ve // erase each matching wallet TX bool delerror = false; - vector<uint256>::iterator it = vTxHashIn.begin(); + std::vector<uint256>::iterator it = vTxHashIn.begin(); BOOST_FOREACH (uint256 hash, vTxHash) { while (it < vTxHashIn.end() && (*it) < hash) { it++; @@ -736,7 +744,6 @@ DBErrors CWalletDB::ZapSelectTx(CWallet* pwallet, vector<uint256>& vTxHashIn, ve break; } else if ((*it) == hash) { - pwallet->mapWallet.erase(hash); if(!EraseTx(hash)) { LogPrint("db", "Transaction was found for deletion but returned database error: %s\n", hash.GetHex()); delerror = true; @@ -751,11 +758,11 @@ DBErrors CWalletDB::ZapSelectTx(CWallet* pwallet, vector<uint256>& vTxHashIn, ve return DB_LOAD_OK; } -DBErrors CWalletDB::ZapWalletTx(CWallet* pwallet, vector<CWalletTx>& vWtx) +DBErrors CWalletDB::ZapWalletTx(std::vector<CWalletTx>& vWtx) { // build list of wallet TXs - vector<uint256> vTxHash; - DBErrors err = FindWalletTx(pwallet, vTxHash, vWtx); + std::vector<uint256> vTxHash; + DBErrors err = FindWalletTx(vTxHash, vWtx); if (err != DB_LOAD_OK) return err; @@ -768,173 +775,108 @@ DBErrors CWalletDB::ZapWalletTx(CWallet* pwallet, vector<CWalletTx>& vWtx) return DB_LOAD_OK; } -void ThreadFlushWalletDB() +void MaybeCompactWalletDB() { - // Make this thread recognisable as the wallet flushing thread - RenameThread("bitcoin-wallet"); - - static bool fOneThread; - if (fOneThread) + static std::atomic<bool> fOneThread; + if (fOneThread.exchange(true)) { return; - fOneThread = true; - if (!GetBoolArg("-flushwallet", DEFAULT_FLUSHWALLET)) + } + if (!GetBoolArg("-flushwallet", DEFAULT_FLUSHWALLET)) { return; + } - unsigned int nLastSeen = nWalletDBUpdated; - unsigned int nLastFlushed = nWalletDBUpdated; - int64_t nLastWalletUpdate = GetTime(); - while (true) - { - MilliSleep(500); - - if (nLastSeen != nWalletDBUpdated) - { - nLastSeen = nWalletDBUpdated; - nLastWalletUpdate = GetTime(); - } + static unsigned int nLastSeen = CWalletDB::GetUpdateCounter(); + static unsigned int nLastFlushed = CWalletDB::GetUpdateCounter(); + static int64_t nLastWalletUpdate = GetTime(); - if (nLastFlushed != nWalletDBUpdated && GetTime() - nLastWalletUpdate >= 2) - { - TRY_LOCK(bitdb.cs_db,lockDb); - if (lockDb) - { - // Don't do this if any databases are in use - int nRefCount = 0; - map<string, int>::iterator mi = bitdb.mapFileUseCount.begin(); - while (mi != bitdb.mapFileUseCount.end()) - { - nRefCount += (*mi).second; - mi++; - } + if (nLastSeen != CWalletDB::GetUpdateCounter()) + { + nLastSeen = CWalletDB::GetUpdateCounter(); + nLastWalletUpdate = GetTime(); + } - if (nRefCount == 0) - { - boost::this_thread::interruption_point(); - const std::string& strFile = pwalletMain->strWalletFile; - map<string, int>::iterator _mi = bitdb.mapFileUseCount.find(strFile); - if (_mi != bitdb.mapFileUseCount.end()) - { - LogPrint("db", "Flushing %s\n", strFile); - nLastFlushed = nWalletDBUpdated; - int64_t nStart = GetTimeMillis(); - - // Flush wallet file so it's self contained - bitdb.CloseDb(strFile); - bitdb.CheckpointLSN(strFile); - - bitdb.mapFileUseCount.erase(_mi++); - LogPrint("db", "Flushed %s %dms\n", strFile, GetTimeMillis() - nStart); - } - } - } - } + if (nLastFlushed != CWalletDB::GetUpdateCounter() && GetTime() - nLastWalletUpdate >= 2) + { + const std::string& strFile = pwalletMain->strWalletFile; + if (CDB::PeriodicFlush(strFile)) + nLastFlushed = CWalletDB::GetUpdateCounter(); } + fOneThread = false; } // // Try to (very carefully!) recover wallet file if there is a problem. // -bool CWalletDB::Recover(CDBEnv& dbenv, const std::string& filename, bool fOnlyKeys) -{ - // Recovery procedure: - // move wallet file to wallet.timestamp.bak - // Call Salvage with fAggressive=true to - // get as much data as possible. - // Rewrite salvaged data to fresh wallet file - // Set -rescan so any missing transactions will be - // found. - int64_t now = GetTime(); - std::string newFilename = strprintf("wallet.%d.bak", now); - - int result = dbenv.dbenv->dbrename(NULL, filename.c_str(), NULL, - newFilename.c_str(), DB_AUTO_COMMIT); - if (result == 0) - LogPrintf("Renamed %s to %s\n", filename, newFilename); - else - { - LogPrintf("Failed to rename %s to %s\n", filename, newFilename); - return false; - } +bool CWalletDB::Recover(const std::string& filename, void *callbackDataIn, bool (*recoverKVcallback)(void* callbackData, CDataStream ssKey, CDataStream ssValue)) +{ + return CDB::Recover(filename, callbackDataIn, recoverKVcallback); +} - std::vector<CDBEnv::KeyValPair> salvagedData; - bool fSuccess = dbenv.Salvage(newFilename, true, salvagedData); - if (salvagedData.empty()) +bool CWalletDB::Recover(const std::string& filename) +{ + // recover without a key filter callback + // results in recovering all record types + return CWalletDB::Recover(filename, NULL, NULL); +} + +bool CWalletDB::RecoverKeysOnlyFilter(void *callbackData, CDataStream ssKey, CDataStream ssValue) +{ + CWallet *dummyWallet = reinterpret_cast<CWallet*>(callbackData); + CWalletScanState dummyWss; + std::string strType, strErr; + bool fReadOK; { - LogPrintf("Salvage(aggressive) found no records in %s.\n", newFilename); - return false; + // Required in LoadKeyMetadata(): + LOCK(dummyWallet->cs_wallet); + fReadOK = ReadKeyValue(dummyWallet, ssKey, ssValue, + dummyWss, strType, strErr); } - LogPrintf("Salvage(aggressive) found %u records\n", salvagedData.size()); - - std::unique_ptr<Db> pdbCopy(new Db(dbenv.dbenv, 0)); - int ret = pdbCopy->open(NULL, // Txn pointer - filename.c_str(), // Filename - "main", // Logical db name - DB_BTREE, // Database type - DB_CREATE, // Flags - 0); - if (ret > 0) + if (!IsKeyType(strType) && strType != "hdchain") + return false; + if (!fReadOK) { - LogPrintf("Cannot create database file %s\n", filename); + LogPrintf("WARNING: CWalletDB::Recover skipping %s: %s\n", strType, strErr); return false; } - CWallet dummyWallet; - CWalletScanState wss; - DbTxn* ptxn = dbenv.TxnBegin(); - BOOST_FOREACH(CDBEnv::KeyValPair& row, salvagedData) - { - if (fOnlyKeys) - { - CDataStream ssKey(row.first, SER_DISK, CLIENT_VERSION); - CDataStream ssValue(row.second, SER_DISK, CLIENT_VERSION); - string strType, strErr; - bool fReadOK; - { - // Required in LoadKeyMetadata(): - LOCK(dummyWallet.cs_wallet); - fReadOK = ReadKeyValue(&dummyWallet, ssKey, ssValue, - wss, strType, strErr); - } - if (!IsKeyType(strType) && strType != "hdchain") - continue; - if (!fReadOK) - { - LogPrintf("WARNING: CWalletDB::Recover skipping %s: %s\n", strType, strErr); - continue; - } - } - Dbt datKey(&row.first[0], row.first.size()); - Dbt datValue(&row.second[0], row.second.size()); - int ret2 = pdbCopy->put(ptxn, &datKey, &datValue, DB_NOOVERWRITE); - if (ret2 > 0) - fSuccess = false; - } - ptxn->commit(0); - pdbCopy->close(0); + return true; +} - return fSuccess; +bool CWalletDB::VerifyEnvironment(const std::string& walletFile, const boost::filesystem::path& dataDir, std::string& errorStr) +{ + return CDB::VerifyEnvironment(walletFile, dataDir, errorStr); } -bool CWalletDB::Recover(CDBEnv& dbenv, const std::string& filename) +bool CWalletDB::VerifyDatabaseFile(const std::string& walletFile, const boost::filesystem::path& dataDir, std::string& warningStr, std::string& errorStr) { - return CWalletDB::Recover(dbenv, filename, false); + return CDB::VerifyDatabaseFile(walletFile, dataDir, errorStr, warningStr, CWalletDB::Recover); } bool CWalletDB::WriteDestData(const std::string &address, const std::string &key, const std::string &value) { - nWalletDBUpdated++; + nWalletDBUpdateCounter++; return Write(std::make_pair(std::string("destdata"), std::make_pair(address, key)), value); } bool CWalletDB::EraseDestData(const std::string &address, const std::string &key) { - nWalletDBUpdated++; + nWalletDBUpdateCounter++; return Erase(std::make_pair(std::string("destdata"), std::make_pair(address, key))); } bool CWalletDB::WriteHDChain(const CHDChain& chain) { - nWalletDBUpdated++; + nWalletDBUpdateCounter++; return Write(std::string("hdchain"), chain); } + +void CWalletDB::IncrementUpdateCounter() +{ + nWalletDBUpdateCounter++; +} + +unsigned int CWalletDB::GetUpdateCounter() +{ + return nWalletDBUpdateCounter; +} diff --git a/src/wallet/walletdb.h b/src/wallet/walletdb.h index b9db55baa4..4d7dfb727e 100644 --- a/src/wallet/walletdb.h +++ b/src/wallet/walletdb.h @@ -116,7 +116,7 @@ public: class CWalletDB : public CDB { public: - CWalletDB(const std::string& strFilename, const char* pszMode = "r+", bool fFlushOnClose = true) : CDB(strFilename, pszMode, fFlushOnClose) + CWalletDB(const std::string& strFilename, const char* pszMode = "r+", bool _fFlushOnClose = true) : CDB(strFilename, pszMode, _fFlushOnClose) { } @@ -135,7 +135,7 @@ public: bool WriteCScript(const uint160& hash, const CScript& redeemScript); - bool WriteWatchOnly(const CScript &script); + bool WriteWatchOnly(const CScript &script, const CKeyMetadata &keymeta); bool EraseWatchOnly(const CScript &script); bool WriteBestBlock(const CBlockLocator& locator); @@ -167,21 +167,33 @@ public: void ListAccountCreditDebit(const std::string& strAccount, std::list<CAccountingEntry>& acentries); DBErrors LoadWallet(CWallet* pwallet); - DBErrors FindWalletTx(CWallet* pwallet, std::vector<uint256>& vTxHash, std::vector<CWalletTx>& vWtx); - DBErrors ZapWalletTx(CWallet* pwallet, std::vector<CWalletTx>& vWtx); - DBErrors ZapSelectTx(CWallet* pwallet, std::vector<uint256>& vHashIn, std::vector<uint256>& vHashOut); - static bool Recover(CDBEnv& dbenv, const std::string& filename, bool fOnlyKeys); - static bool Recover(CDBEnv& dbenv, const std::string& filename); + DBErrors FindWalletTx(std::vector<uint256>& vTxHash, std::vector<CWalletTx>& vWtx); + DBErrors ZapWalletTx(std::vector<CWalletTx>& vWtx); + DBErrors ZapSelectTx(std::vector<uint256>& vHashIn, std::vector<uint256>& vHashOut); + /* Try to (very carefully!) recover wallet database (with a possible key type filter) */ + static bool Recover(const std::string& filename, void *callbackDataIn, bool (*recoverKVcallback)(void* callbackData, CDataStream ssKey, CDataStream ssValue)); + /* Recover convenience-function to bypass the key filter callback, called when verify fails, recovers everything */ + static bool Recover(const std::string& filename); + /* Recover filter (used as callback), will only let keys (cryptographical keys) as KV/key-type pass through */ + static bool RecoverKeysOnlyFilter(void *callbackData, CDataStream ssKey, CDataStream ssValue); + /* Function to determine if a certain KV/key-type is a key (cryptographical key) type */ + static bool IsKeyType(const std::string& strType); + /* verifies the database environment */ + static bool VerifyEnvironment(const std::string& walletFile, const boost::filesystem::path& dataDir, std::string& errorStr); + /* verifies the database file */ + static bool VerifyDatabaseFile(const std::string& walletFile, const boost::filesystem::path& dataDir, std::string& warningStr, std::string& errorStr); //! write the hdchain model (external chain child index counter) bool WriteHDChain(const CHDChain& chain); + static void IncrementUpdateCounter(); + static unsigned int GetUpdateCounter(); private: CWalletDB(const CWalletDB&); void operator=(const CWalletDB&); - }; -void ThreadFlushWalletDB(); +//! Compacts BDB state so that wallet.dat is self-contained (if there are changes) +void MaybeCompactWalletDB(); #endif // BITCOIN_WALLET_WALLETDB_H |