aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/Makefile.am2
-rw-r--r--src/Makefile.qt.include11
-rw-r--r--src/Makefile.test.include1
-rw-r--r--src/blockencodings.cpp180
-rw-r--r--src/blockencodings.h206
-rw-r--r--src/chainparams.cpp8
-rw-r--r--src/chainparams.h4
-rw-r--r--src/init.cpp11
-rw-r--r--src/main.cpp540
-rw-r--r--src/main.h12
-rw-r--r--src/miner.cpp206
-rw-r--r--src/miner.h118
-rw-r--r--src/net.cpp206
-rw-r--r--src/net.h20
-rw-r--r--src/netbase.cpp8
-rw-r--r--src/protocol.cpp13
-rw-r--r--src/protocol.h31
-rw-r--r--src/qt/bitcoin.cpp3
-rw-r--r--src/qt/bitcoin_locale.qrc11
-rw-r--r--src/qt/bitcoinstrings.cpp10
-rw-r--r--src/qt/locale/bitcoin_af.ts509
-rw-r--r--src/qt/locale/bitcoin_af_ZA.ts26
-rw-r--r--src/qt/locale/bitcoin_ar.ts152
-rw-r--r--src/qt/locale/bitcoin_bg.ts10
-rw-r--r--src/qt/locale/bitcoin_ca.ts80
-rw-r--r--src/qt/locale/bitcoin_ca@valencia.ts8
-rw-r--r--src/qt/locale/bitcoin_ca_ES.ts76
-rw-r--r--src/qt/locale/bitcoin_cs.ts376
-rw-r--r--src/qt/locale/bitcoin_cs_CZ.ts24
-rw-r--r--src/qt/locale/bitcoin_da.ts74
-rw-r--r--src/qt/locale/bitcoin_de.ts106
-rw-r--r--src/qt/locale/bitcoin_el_GR.ts13
-rw-r--r--src/qt/locale/bitcoin_en.ts1652
-rw-r--r--src/qt/locale/bitcoin_en_GB.ts66
-rw-r--r--src/qt/locale/bitcoin_eo.ts42
-rw-r--r--src/qt/locale/bitcoin_es.ts242
-rw-r--r--src/qt/locale/bitcoin_es_419.ts173
-rw-r--r--src/qt/locale/bitcoin_es_AR.ts373
-rw-r--r--src/qt/locale/bitcoin_es_CL.ts120
-rw-r--r--src/qt/locale/bitcoin_es_CO.ts542
-rw-r--r--src/qt/locale/bitcoin_es_DO.ts4
-rw-r--r--src/qt/locale/bitcoin_es_MX.ts100
-rw-r--r--src/qt/locale/bitcoin_et.ts4
-rw-r--r--src/qt/locale/bitcoin_fa.ts4
-rw-r--r--src/qt/locale/bitcoin_fi.ts92
-rw-r--r--src/qt/locale/bitcoin_fil.ts157
-rw-r--r--src/qt/locale/bitcoin_fr.ts60
-rw-r--r--src/qt/locale/bitcoin_fr_FR.ts1640
-rw-r--r--src/qt/locale/bitcoin_gl.ts4
-rw-r--r--src/qt/locale/bitcoin_he.ts16
-rw-r--r--src/qt/locale/bitcoin_hr.ts4
-rw-r--r--src/qt/locale/bitcoin_hu.ts8
-rw-r--r--src/qt/locale/bitcoin_id_ID.ts302
-rw-r--r--src/qt/locale/bitcoin_it.ts18
-rw-r--r--src/qt/locale/bitcoin_it_IT.ts325
-rw-r--r--src/qt/locale/bitcoin_ja.ts64
-rw-r--r--src/qt/locale/bitcoin_ka.ts4
-rw-r--r--src/qt/locale/bitcoin_ko_KR.ts1324
-rw-r--r--src/qt/locale/bitcoin_la.ts4
-rw-r--r--src/qt/locale/bitcoin_lt.ts24
-rw-r--r--src/qt/locale/bitcoin_lv_LV.ts4
-rw-r--r--src/qt/locale/bitcoin_nb.ts12
-rw-r--r--src/qt/locale/bitcoin_nl.ts68
-rw-r--r--src/qt/locale/bitcoin_pam.ts4
-rw-r--r--src/qt/locale/bitcoin_pl.ts221
-rw-r--r--src/qt/locale/bitcoin_pt_BR.ts174
-rw-r--r--src/qt/locale/bitcoin_pt_PT.ts894
-rw-r--r--src/qt/locale/bitcoin_ro.ts169
-rw-r--r--src/qt/locale/bitcoin_ro_RO.ts138
-rw-r--r--src/qt/locale/bitcoin_ru.ts36
-rw-r--r--src/qt/locale/bitcoin_ru_RU.ts52
-rw-r--r--src/qt/locale/bitcoin_sk.ts287
-rw-r--r--src/qt/locale/bitcoin_sl_SI.ts20
-rw-r--r--src/qt/locale/bitcoin_sq.ts8
-rw-r--r--src/qt/locale/bitcoin_sr@latin.ts653
-rw-r--r--src/qt/locale/bitcoin_sv.ts64
-rw-r--r--src/qt/locale/bitcoin_ta.ts1029
-rw-r--r--src/qt/locale/bitcoin_th_TH.ts182
-rw-r--r--src/qt/locale/bitcoin_tr.ts72
-rw-r--r--src/qt/locale/bitcoin_tr_TR.ts8
-rw-r--r--src/qt/locale/bitcoin_uk.ts16
-rw-r--r--src/qt/locale/bitcoin_uz@Cyrl.ts4
-rw-r--r--src/qt/locale/bitcoin_uz@Latn.ts169
-rw-r--r--src/qt/locale/bitcoin_zh_CN.ts80
-rw-r--r--src/qt/locale/bitcoin_zh_HK.ts521
-rw-r--r--src/qt/locale/bitcoin_zh_TW.ts178
-rw-r--r--src/qt/splashscreen.cpp5
-rw-r--r--src/qt/winshutdownmonitor.cpp2
-rw-r--r--src/rpc/net.cpp95
-rw-r--r--src/rpc/rawtransaction.cpp9
-rw-r--r--src/serialize.h23
-rw-r--r--src/test/DoS_tests.cpp2
-rw-r--r--src/test/blockencodings_tests.cpp315
-rw-r--r--src/test/miner_tests.cpp109
-rw-r--r--src/test/test_bitcoin.cpp7
-rw-r--r--src/test/test_bitcoin.h1
-rw-r--r--src/txmempool.cpp16
-rw-r--r--src/txmempool.h5
-rw-r--r--src/univalue/Makefile.am9
-rw-r--r--src/univalue/configure.ac6
-rw-r--r--src/univalue/lib/univalue_read.cpp37
-rw-r--r--src/univalue/lib/univalue_utffilter.h119
-rw-r--r--src/univalue/lib/univalue_write.cpp11
-rw-r--r--src/univalue/test/fail38.json1
-rw-r--r--src/univalue/test/fail39.json1
-rw-r--r--src/univalue/test/fail40.json1
-rw-r--r--src/univalue/test/fail41.json1
-rw-r--r--src/univalue/test/round2.json1
-rw-r--r--src/univalue/test/unitester.cpp31
-rw-r--r--src/version.h5
-rw-r--r--src/wallet/rpcdump.cpp7
-rw-r--r--src/wallet/test/wallet_tests.cpp46
-rw-r--r--src/wallet/wallet.cpp2
113 files changed, 13614 insertions, 2739 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index 3df8e267bb..e3eaacdb4c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -74,6 +74,7 @@ BITCOIN_CORE_H = \
addrman.h \
base58.h \
bloom.h \
+ blockencodings.h \
chain.h \
chainparams.h \
chainparamsbase.h \
@@ -163,6 +164,7 @@ libbitcoin_server_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
libbitcoin_server_a_SOURCES = \
addrman.cpp \
bloom.cpp \
+ blockencodings.cpp \
chain.cpp \
checkpoints.cpp \
httprpc.cpp \
diff --git a/src/Makefile.qt.include b/src/Makefile.qt.include
index 9381cca9f2..dc775a3568 100644
--- a/src/Makefile.qt.include
+++ b/src/Makefile.qt.include
@@ -3,6 +3,7 @@ EXTRA_LIBRARIES += qt/libbitcoinqt.a
# bitcoin qt core #
QT_TS = \
+ qt/locale/bitcoin_af.ts \
qt/locale/bitcoin_af_ZA.ts \
qt/locale/bitcoin_ar.ts \
qt/locale/bitcoin_be_BY.ts \
@@ -22,7 +23,10 @@ QT_TS = \
qt/locale/bitcoin_en_GB.ts \
qt/locale/bitcoin_en.ts \
qt/locale/bitcoin_eo.ts \
+ qt/locale/bitcoin_es_419.ts \
+ qt/locale/bitcoin_es_AR.ts \
qt/locale/bitcoin_es_CL.ts \
+ qt/locale/bitcoin_es_CO.ts \
qt/locale/bitcoin_es_DO.ts \
qt/locale/bitcoin_es_ES.ts \
qt/locale/bitcoin_es_MX.ts \
@@ -33,6 +37,7 @@ QT_TS = \
qt/locale/bitcoin_eu_ES.ts \
qt/locale/bitcoin_fa_IR.ts \
qt/locale/bitcoin_fa.ts \
+ qt/locale/bitcoin_fil.ts \
qt/locale/bitcoin_fi.ts \
qt/locale/bitcoin_fr_CA.ts \
qt/locale/bitcoin_fr_FR.ts \
@@ -43,6 +48,7 @@ QT_TS = \
qt/locale/bitcoin_hr.ts \
qt/locale/bitcoin_hu.ts \
qt/locale/bitcoin_id_ID.ts \
+ qt/locale/bitcoin_it_IT.ts \
qt/locale/bitcoin_it.ts \
qt/locale/bitcoin_ja.ts \
qt/locale/bitcoin_ka.ts \
@@ -62,22 +68,27 @@ QT_TS = \
qt/locale/bitcoin_pt_BR.ts \
qt/locale/bitcoin_pt_PT.ts \
qt/locale/bitcoin_ro_RO.ts \
+ qt/locale/bitcoin_ro.ts \
qt/locale/bitcoin_ru_RU.ts \
qt/locale/bitcoin_ru.ts \
qt/locale/bitcoin_sk.ts \
qt/locale/bitcoin_sl_SI.ts \
qt/locale/bitcoin_sq.ts \
+ qt/locale/bitcoin_sr@latin.ts \
qt/locale/bitcoin_sr.ts \
qt/locale/bitcoin_sv.ts \
+ qt/locale/bitcoin_ta.ts \
qt/locale/bitcoin_th_TH.ts \
qt/locale/bitcoin_tr_TR.ts \
qt/locale/bitcoin_tr.ts \
qt/locale/bitcoin_uk.ts \
qt/locale/bitcoin_ur_PK.ts \
qt/locale/bitcoin_uz@Cyrl.ts \
+ qt/locale/bitcoin_uz@Latn.ts \
qt/locale/bitcoin_vi.ts \
qt/locale/bitcoin_vi_VN.ts \
qt/locale/bitcoin_zh_CN.ts \
+ qt/locale/bitcoin_zh_HK.ts \
qt/locale/bitcoin_zh.ts \
qt/locale/bitcoin_zh_TW.ts
diff --git a/src/Makefile.test.include b/src/Makefile.test.include
index 41d811fb54..c8918eb53f 100644
--- a/src/Makefile.test.include
+++ b/src/Makefile.test.include
@@ -45,6 +45,7 @@ BITCOIN_TESTS =\
test/base58_tests.cpp \
test/base64_tests.cpp \
test/bip32_tests.cpp \
+ test/blockencodings_tests.cpp \
test/bloom_tests.cpp \
test/Checkpoints_tests.cpp \
test/coins_tests.cpp \
diff --git a/src/blockencodings.cpp b/src/blockencodings.cpp
new file mode 100644
index 0000000000..7fd6a9cf52
--- /dev/null
+++ b/src/blockencodings.cpp
@@ -0,0 +1,180 @@
+// Copyright (c) 2016 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 "blockencodings.h"
+#include "consensus/consensus.h"
+#include "consensus/validation.h"
+#include "chainparams.h"
+#include "hash.h"
+#include "random.h"
+#include "streams.h"
+#include "txmempool.h"
+#include "main.h"
+#include "util.h"
+
+#include <unordered_map>
+
+#define MIN_TRANSACTION_SIZE (::GetSerializeSize(CTransaction(), SER_NETWORK, PROTOCOL_VERSION))
+
+CBlockHeaderAndShortTxIDs::CBlockHeaderAndShortTxIDs(const CBlock& block) :
+ nonce(GetRand(std::numeric_limits<uint64_t>::max())),
+ shorttxids(block.vtx.size() - 1), prefilledtxn(1), header(block) {
+ FillShortTxIDSelector();
+ //TODO: Use our mempool prior to block acceptance to predictively fill more than just the coinbase
+ prefilledtxn[0] = {0, block.vtx[0]};
+ for (size_t i = 1; i < block.vtx.size(); i++) {
+ const CTransaction& tx = block.vtx[i];
+ shorttxids[i - 1] = GetShortID(tx.GetHash());
+ }
+}
+
+void CBlockHeaderAndShortTxIDs::FillShortTxIDSelector() const {
+ CDataStream stream(SER_NETWORK, PROTOCOL_VERSION);
+ stream << header << nonce;
+ CSHA256 hasher;
+ hasher.Write((unsigned char*)&(*stream.begin()), stream.end() - stream.begin());
+ uint256 shorttxidhash;
+ hasher.Finalize(shorttxidhash.begin());
+ shorttxidk0 = shorttxidhash.GetUint64(0);
+ shorttxidk1 = shorttxidhash.GetUint64(1);
+}
+
+uint64_t CBlockHeaderAndShortTxIDs::GetShortID(const uint256& txhash) const {
+ static_assert(SHORTTXIDS_LENGTH == 6, "shorttxids calculation assumes 6-byte shorttxids");
+ return SipHashUint256(shorttxidk0, shorttxidk1, txhash) & 0xffffffffffffL;
+}
+
+
+
+ReadStatus PartiallyDownloadedBlock::InitData(const CBlockHeaderAndShortTxIDs& cmpctblock) {
+ if (cmpctblock.header.IsNull() || (cmpctblock.shorttxids.empty() && cmpctblock.prefilledtxn.empty()))
+ return READ_STATUS_INVALID;
+ if (cmpctblock.shorttxids.size() + cmpctblock.prefilledtxn.size() > MAX_BLOCK_SIZE / MIN_TRANSACTION_SIZE)
+ return READ_STATUS_INVALID;
+
+ assert(header.IsNull() && txn_available.empty());
+ header = cmpctblock.header;
+ txn_available.resize(cmpctblock.BlockTxCount());
+
+ int32_t lastprefilledindex = -1;
+ for (size_t i = 0; i < cmpctblock.prefilledtxn.size(); i++) {
+ if (cmpctblock.prefilledtxn[i].tx.IsNull())
+ return READ_STATUS_INVALID;
+
+ lastprefilledindex += cmpctblock.prefilledtxn[i].index + 1; //index is a uint16_t, so cant overflow here
+ if (lastprefilledindex > std::numeric_limits<uint16_t>::max())
+ return READ_STATUS_INVALID;
+ if ((uint32_t)lastprefilledindex > cmpctblock.shorttxids.size() + i) {
+ // If we are inserting a tx at an index greater than our full list of shorttxids
+ // plus the number of prefilled txn we've inserted, then we have txn for which we
+ // have neither a prefilled txn or a shorttxid!
+ return READ_STATUS_INVALID;
+ }
+ txn_available[lastprefilledindex] = std::make_shared<CTransaction>(cmpctblock.prefilledtxn[i].tx);
+ }
+ prefilled_count = cmpctblock.prefilledtxn.size();
+
+ // Calculate map of txids -> positions and check mempool to see what we have (or dont)
+ // Because well-formed cmpctblock messages will have a (relatively) uniform distribution
+ // of short IDs, any highly-uneven distribution of elements can be safely treated as a
+ // READ_STATUS_FAILED.
+ std::unordered_map<uint64_t, uint16_t> shorttxids(cmpctblock.shorttxids.size());
+ uint16_t index_offset = 0;
+ for (size_t i = 0; i < cmpctblock.shorttxids.size(); i++) {
+ while (txn_available[i + index_offset])
+ index_offset++;
+ shorttxids[cmpctblock.shorttxids[i]] = i + index_offset;
+ // To determine the chance that the number of entries in a bucket exceeds N,
+ // we use the fact that the number of elements in a single bucket is
+ // binomially distributed (with n = the number of shorttxids S, and p =
+ // 1 / the number of buckets), that in the worst case the number of buckets is
+ // equal to S (due to std::unordered_map having a default load factor of 1.0),
+ // and that the chance for any bucket to exceed N elements is at most
+ // buckets * (the chance that any given bucket is above N elements).
+ // Thus: P(max_elements_per_bucket > N) <= S * (1 - cdf(binomial(n=S,p=1/S), N)).
+ // If we assume blocks of up to 16000, allowing 12 elements per bucket should
+ // only fail once per ~1 million block transfers (per peer and connection).
+ if (shorttxids.bucket_size(shorttxids.bucket(cmpctblock.shorttxids[i])) > 12)
+ return READ_STATUS_FAILED;
+ }
+ // TODO: in the shortid-collision case, we should instead request both transactions
+ // which collided. Falling back to full-block-request here is overkill.
+ if (shorttxids.size() != cmpctblock.shorttxids.size())
+ 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++) {
+ uint64_t shortid = cmpctblock.GetShortID(vTxHashes[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] = vTxHashes[i].second->GetSharedTx();
+ have_txn[idit->second] = true;
+ mempool_count++;
+ } else {
+ // If we find two mempool 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
+ if (txn_available[idit->second]) {
+ txn_available[idit->second].reset();
+ mempool_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(), cmpctblock.GetSerializeSize(SER_NETWORK, PROTOCOL_VERSION));
+
+ return READ_STATUS_OK;
+}
+
+bool PartiallyDownloadedBlock::IsTxAvailable(size_t index) const {
+ assert(!header.IsNull());
+ assert(index < txn_available.size());
+ return txn_available[index] ? true : false;
+}
+
+ReadStatus PartiallyDownloadedBlock::FillBlock(CBlock& block, const std::vector<CTransaction>& vtx_missing) const {
+ assert(!header.IsNull());
+ block = header;
+ block.vtx.resize(txn_available.size());
+
+ size_t tx_missing_offset = 0;
+ for (size_t i = 0; i < txn_available.size(); i++) {
+ if (!txn_available[i]) {
+ if (vtx_missing.size() <= tx_missing_offset)
+ return READ_STATUS_INVALID;
+ block.vtx[i] = vtx_missing[tx_missing_offset++];
+ } else
+ block.vtx[i] = *txn_available[i];
+ }
+ if (vtx_missing.size() != tx_missing_offset)
+ return READ_STATUS_INVALID;
+
+ CValidationState state;
+ if (!CheckBlock(block, state, Params().GetConsensus())) {
+ // TODO: We really want to just check merkle tree manually here,
+ // but that is expensive, and CheckBlock caches a block's
+ // "checked-status" (in the CBlock?). CBlock should be able to
+ // check its own merkle root and cache that check.
+ if (state.CorruptionPossible())
+ return READ_STATUS_FAILED; // Possible Short ID collision
+ return READ_STATUS_INVALID;
+ }
+
+ LogPrint("cmpctblock", "Successfully reconstructed block %s with %lu txn prefilled, %lu txn from mempool and %lu txn requested\n", header.GetHash().ToString(), prefilled_count, mempool_count, vtx_missing.size());
+ if (vtx_missing.size() < 5) {
+ for(const CTransaction& tx : vtx_missing)
+ LogPrint("cmpctblock", "Reconstructed block %s required tx %s\n", header.GetHash().ToString(), tx.GetHash().ToString());
+ }
+
+ return READ_STATUS_OK;
+}
diff --git a/src/blockencodings.h b/src/blockencodings.h
new file mode 100644
index 0000000000..b980e9e286
--- /dev/null
+++ b/src/blockencodings.h
@@ -0,0 +1,206 @@
+// Copyright (c) 2016 The Bitcoin Core developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#ifndef BITCOIN_BLOCK_ENCODINGS_H
+#define BITCOIN_BLOCK_ENCODINGS_H
+
+#include "primitives/block.h"
+
+#include <memory>
+
+class CTxMemPool;
+
+// Dumb helper to handle CTransaction compression at serialize-time
+struct TransactionCompressor {
+private:
+ CTransaction& tx;
+public:
+ TransactionCompressor(CTransaction& txIn) : tx(txIn) {}
+
+ ADD_SERIALIZE_METHODS;
+
+ template <typename Stream, typename Operation>
+ inline void SerializationOp(Stream& s, Operation ser_action, int nType, int nVersion) {
+ READWRITE(tx); //TODO: Compress tx encoding
+ }
+};
+
+class BlockTransactionsRequest {
+public:
+ // A BlockTransactionsRequest message
+ uint256 blockhash;
+ std::vector<uint16_t> indexes;
+
+ ADD_SERIALIZE_METHODS;
+
+ template <typename Stream, typename Operation>
+ inline void SerializationOp(Stream& s, Operation ser_action, int nType, int nVersion) {
+ READWRITE(blockhash);
+ uint64_t indexes_size = (uint64_t)indexes.size();
+ READWRITE(COMPACTSIZE(indexes_size));
+ if (ser_action.ForRead()) {
+ size_t i = 0;
+ while (indexes.size() < indexes_size) {
+ indexes.resize(std::min((uint64_t)(1000 + indexes.size()), indexes_size));
+ for (; i < indexes.size(); i++) {
+ uint64_t index = 0;
+ READWRITE(COMPACTSIZE(index));
+ if (index > std::numeric_limits<uint16_t>::max())
+ throw std::ios_base::failure("index overflowed 16 bits");
+ indexes[i] = index;
+ }
+ }
+
+ uint16_t offset = 0;
+ for (size_t i = 0; i < indexes.size(); i++) {
+ if (uint64_t(indexes[i]) + uint64_t(offset) > std::numeric_limits<uint16_t>::max())
+ throw std::ios_base::failure("indexes overflowed 16 bits");
+ indexes[i] = indexes[i] + offset;
+ offset = indexes[i] + 1;
+ }
+ } else {
+ for (size_t i = 0; i < indexes.size(); i++) {
+ uint64_t index = indexes[i] - (i == 0 ? 0 : (indexes[i - 1] + 1));
+ READWRITE(COMPACTSIZE(index));
+ }
+ }
+ }
+};
+
+class BlockTransactions {
+public:
+ // A BlockTransactions message
+ uint256 blockhash;
+ std::vector<CTransaction> txn;
+
+ BlockTransactions() {}
+ BlockTransactions(const BlockTransactionsRequest& req) :
+ blockhash(req.blockhash), txn(req.indexes.size()) {}
+
+ ADD_SERIALIZE_METHODS;
+
+ template <typename Stream, typename Operation>
+ inline void SerializationOp(Stream& s, Operation ser_action, int nType, int nVersion) {
+ READWRITE(blockhash);
+ uint64_t txn_size = (uint64_t)txn.size();
+ READWRITE(COMPACTSIZE(txn_size));
+ if (ser_action.ForRead()) {
+ size_t i = 0;
+ while (txn.size() < txn_size) {
+ txn.resize(std::min((uint64_t)(1000 + txn.size()), txn_size));
+ for (; i < txn.size(); i++)
+ READWRITE(REF(TransactionCompressor(txn[i])));
+ }
+ } else {
+ for (size_t i = 0; i < txn.size(); i++)
+ READWRITE(REF(TransactionCompressor(txn[i])));
+ }
+ }
+};
+
+// Dumb serialization/storage-helper for CBlockHeaderAndShortTxIDs and PartiallyDownlaodedBlock
+struct PrefilledTransaction {
+ // Used as an offset since last prefilled tx in CBlockHeaderAndShortTxIDs,
+ // as a proper transaction-in-block-index in PartiallyDownloadedBlock
+ uint16_t index;
+ CTransaction tx;
+
+ ADD_SERIALIZE_METHODS;
+
+ template <typename Stream, typename Operation>
+ inline void SerializationOp(Stream& s, Operation ser_action, int nType, int nVersion) {
+ uint64_t idx = index;
+ READWRITE(COMPACTSIZE(idx));
+ if (idx > std::numeric_limits<uint16_t>::max())
+ throw std::ios_base::failure("index overflowed 16-bits");
+ index = idx;
+ READWRITE(REF(TransactionCompressor(tx)));
+ }
+};
+
+typedef enum ReadStatus_t
+{
+ READ_STATUS_OK,
+ READ_STATUS_INVALID, // Invalid object, peer is sending bogus crap
+ READ_STATUS_FAILED, // Failed to process object
+} ReadStatus;
+
+class CBlockHeaderAndShortTxIDs {
+private:
+ mutable uint64_t shorttxidk0, shorttxidk1;
+ uint64_t nonce;
+
+ void FillShortTxIDSelector() const;
+
+ friend class PartiallyDownloadedBlock;
+
+ static const int SHORTTXIDS_LENGTH = 6;
+protected:
+ std::vector<uint64_t> shorttxids;
+ std::vector<PrefilledTransaction> prefilledtxn;
+
+public:
+ CBlockHeader header;
+
+ // Dummy for deserialization
+ CBlockHeaderAndShortTxIDs() {}
+
+ CBlockHeaderAndShortTxIDs(const CBlock& block);
+
+ uint64_t GetShortID(const uint256& txhash) const;
+
+ size_t BlockTxCount() const { return shorttxids.size() + prefilledtxn.size(); }
+
+ ADD_SERIALIZE_METHODS;
+
+ template <typename Stream, typename Operation>
+ inline void SerializationOp(Stream& s, Operation ser_action, int nType, int nVersion) {
+ READWRITE(header);
+ READWRITE(nonce);
+
+ uint64_t shorttxids_size = (uint64_t)shorttxids.size();
+ READWRITE(COMPACTSIZE(shorttxids_size));
+ if (ser_action.ForRead()) {
+ size_t i = 0;
+ while (shorttxids.size() < shorttxids_size) {
+ shorttxids.resize(std::min((uint64_t)(1000 + shorttxids.size()), shorttxids_size));
+ for (; i < shorttxids.size(); i++) {
+ uint32_t lsb = 0; uint16_t msb = 0;
+ READWRITE(lsb);
+ READWRITE(msb);
+ shorttxids[i] = (uint64_t(msb) << 32) | uint64_t(lsb);
+ static_assert(SHORTTXIDS_LENGTH == 6, "shorttxids serialization assumes 6-byte shorttxids");
+ }
+ }
+ } else {
+ for (size_t i = 0; i < shorttxids.size(); i++) {
+ uint32_t lsb = shorttxids[i] & 0xffffffff;
+ uint16_t msb = (shorttxids[i] >> 32) & 0xffff;
+ READWRITE(lsb);
+ READWRITE(msb);
+ }
+ }
+
+ READWRITE(prefilledtxn);
+
+ if (ser_action.ForRead())
+ FillShortTxIDSelector();
+ }
+};
+
+class PartiallyDownloadedBlock {
+protected:
+ std::vector<std::shared_ptr<const CTransaction> > txn_available;
+ size_t prefilled_count = 0, mempool_count = 0;
+ CTxMemPool* pool;
+public:
+ CBlockHeader header;
+ PartiallyDownloadedBlock(CTxMemPool* poolIn) : pool(poolIn) {}
+
+ ReadStatus InitData(const CBlockHeaderAndShortTxIDs& cmpctblock);
+ bool IsTxAvailable(size_t index) const;
+ ReadStatus FillBlock(CBlock& block, const std::vector<CTransaction>& vtx_missing) const;
+};
+
+#endif
diff --git a/src/chainparams.cpp b/src/chainparams.cpp
index 442bc61023..6eb66c78e2 100644
--- a/src/chainparams.cpp
+++ b/src/chainparams.cpp
@@ -16,14 +16,6 @@
#include "chainparamsseeds.h"
-std::string CDNSSeedData::getHost(uint64_t requiredServiceBits) const {
- //use default host for non-filter-capable seeds or if we use the default service bits (NODE_NETWORK)
- if (!supportsServiceBitsFiltering || requiredServiceBits == NODE_NETWORK)
- return host;
-
- return strprintf("x%x.%s", requiredServiceBits, host);
-}
-
static CBlock CreateGenesisBlock(const char* pszTimestamp, const CScript& genesisOutputScript, uint32_t nTime, uint32_t nNonce, uint32_t nBits, int32_t nVersion, const CAmount& genesisReward)
{
CMutableTransaction txNew;
diff --git a/src/chainparams.h b/src/chainparams.h
index 7168daaf43..638893e9ad 100644
--- a/src/chainparams.h
+++ b/src/chainparams.h
@@ -13,11 +13,9 @@
#include <vector>
-class CDNSSeedData {
-public:
+struct CDNSSeedData {
std::string name, host;
bool supportsServiceBitsFiltering;
- std::string getHost(uint64_t requiredServiceBits) const;
CDNSSeedData(const std::string &strName, const std::string &strHost, bool supportsServiceBitsFilteringIn = false) : name(strName), host(strHost), supportsServiceBitsFiltering(supportsServiceBitsFilteringIn) {}
};
diff --git a/src/init.cpp b/src/init.cpp
index c2ba9ae44b..b572bfc327 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -479,11 +479,20 @@ std::string HelpMessage(HelpMessageMode mode)
std::string LicenseInfo()
{
+ const std::string URL_SOURCE_CODE = "<https://github.com/bitcoin/bitcoin>";
+ const std::string URL_WEBSITE = "<https://bitcoincore.org>";
// todo: remove urls from translations on next change
return CopyrightHolders(strprintf(_("Copyright (C) %i-%i"), 2009, COPYRIGHT_YEAR) + " ") + "\n" +
"\n" +
- _("This is experimental software.") + "\n" +
+ strprintf(_("Please contribute if you find %s useful. "
+ "Visit %s for further information about the software."),
+ PACKAGE_NAME, URL_WEBSITE) +
+ "\n" +
+ strprintf(_("The source code is available from %s."),
+ URL_SOURCE_CODE) +
"\n" +
+ "\n" +
+ _("This is experimental software.") + "\n" +
_("Distributed under the MIT software license, see the accompanying file COPYING or <http://www.opensource.org/licenses/mit-license.php>.") + "\n" +
"\n" +
_("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.") +
diff --git a/src/main.cpp b/src/main.cpp
index 62012bf567..ae195ecc40 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -7,6 +7,7 @@
#include "addrman.h"
#include "arith_uint256.h"
+#include "blockencodings.h"
#include "chainparams.h"
#include "checkpoints.h"
#include "checkqueue.h"
@@ -88,12 +89,22 @@ CAmount maxTxFee = DEFAULT_TRANSACTION_MAXFEE;
CTxMemPool mempool(::minRelayTxFee);
FeeFilterRounder filterRounder(::minRelayTxFee);
+struct IteratorComparator
+{
+ template<typename I>
+ bool operator()(const I& a, const I& b)
+ {
+ return &(*a) < &(*b);
+ }
+};
+
struct COrphanTx {
CTransaction tx;
NodeId fromPeer;
+ int64_t nTimeExpire;
};
map<uint256, COrphanTx> mapOrphanTransactions GUARDED_BY(cs_main);
-map<uint256, set<uint256> > mapOrphanTransactionsByPrev GUARDED_BY(cs_main);
+map<COutPoint, set<map<uint256, COrphanTx>::iterator, IteratorComparator>> mapOrphanTransactionsByPrev GUARDED_BY(cs_main);
void EraseOrphansFor(NodeId peer) EXCLUSIVE_LOCKS_REQUIRED(cs_main);
/**
@@ -197,11 +208,15 @@ 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.
- bool fValidatedHeaders; //!< Whether this block has validated headers at the time of request.
+ 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;
+ /** Stack of nodes which we have set to announce using compact blocks */
+ list<NodeId> lNodesAnnouncingHeaderAndIDs;
+
/** Number of preferable block download peers. */
int nPreferredDownload = 0;
@@ -274,6 +289,10 @@ struct CNodeState {
bool fPreferredDownload;
//! Whether this peer wants invs or headers (when possible) for block announcements.
bool fPreferHeaders;
+ //! Whether this peer wants invs or cmpctblocks (when possible) for block announcements.
+ bool fPreferHeaderAndIDs;
+ //! Whether this peer will send us cmpctblocks if we request them
+ bool fProvidesHeaderAndIDs;
CNodeState() {
fCurrentlyConnected = false;
@@ -290,6 +309,8 @@ struct CNodeState {
nBlocksInFlightValidHeaders = 0;
fPreferredDownload = false;
fPreferHeaders = false;
+ fPreferHeaderAndIDs = false;
+ fProvidesHeaderAndIDs = false;
}
};
@@ -358,6 +379,7 @@ void FinalizeNode(NodeId nodeid) {
// Requires cs_main.
// 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);
if (itInFlight != mapBlocksInFlight.end()) {
@@ -381,17 +403,26 @@ bool MarkBlockAsReceived(const uint256& hash) {
}
// Requires cs_main.
-void MarkBlockAsInFlight(NodeId nodeid, const uint256& hash, const Consensus::Params& consensusParams, CBlockIndex *pindex = NULL) {
+// 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) {
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);
+ if (itInFlight != mapBlocksInFlight.end() && itInFlight->second.first == nodeid) {
+ *pit = &itInFlight->second.second;
+ return false;
+ }
+
// Make sure it's not listed somewhere already.
MarkBlockAsReceived(hash);
- QueuedBlock newentry = {hash, pindex, pindex != NULL};
- list<QueuedBlock>::iterator it = state->vBlocksInFlight.insert(state->vBlocksInFlight.end(), newentry);
+ 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 += newentry.fValidatedHeaders;
+ state->nBlocksInFlightValidHeaders += it->fValidatedHeaders;
if (state->nBlocksInFlight == 1) {
// We're starting a block download (batch) from this peer.
state->nDownloadingSince = GetTimeMicros();
@@ -399,7 +430,10 @@ void MarkBlockAsInFlight(NodeId nodeid, const uint256& hash, const Consensus::Pa
if (state->nBlocksInFlightValidHeaders == 1 && pindex != NULL) {
nPeersWithValidatedDownloads++;
}
- mapBlocksInFlight[hash] = std::make_pair(nodeid, it);
+ itInFlight = mapBlocksInFlight.insert(std::make_pair(hash, std::make_pair(nodeid, it))).first;
+ if (pit)
+ *pit = &itInFlight->second.second;
+ return true;
}
/** Check whether the last unknown block a peer advertised is not yet known. */
@@ -435,6 +469,28 @@ void UpdateBlockAvailability(NodeId nodeid, const uint256 &hash) {
}
}
+void MaybeSetPeerAsAnnouncingHeaderAndIDs(const CNodeState* nodestate, CNode* pfrom) {
+ if (nodestate->fProvidesHeaderAndIDs) {
+ BOOST_FOREACH(const NodeId nodeid, lNodesAnnouncingHeaderAndIDs)
+ if (nodeid == pfrom->GetId())
+ return;
+ bool fAnnounceUsingCMPCTBLOCK = false;
+ uint64_t nCMPCTBLOCKVersion = 1;
+ if (lNodesAnnouncingHeaderAndIDs.size() >= 3) {
+ // As per BIP152, we only get 3 of our peers to announce
+ // blocks using compact encodings.
+ CNode* pnodeStop = FindNode(lNodesAnnouncingHeaderAndIDs.front());
+ if (pnodeStop) {
+ pnodeStop->PushMessage(NetMsgType::SENDCMPCT, fAnnounceUsingCMPCTBLOCK, nCMPCTBLOCKVersion);
+ lNodesAnnouncingHeaderAndIDs.pop_front();
+ }
+ }
+ fAnnounceUsingCMPCTBLOCK = true;
+ pfrom->PushMessage(NetMsgType::SENDCMPCT, fAnnounceUsingCMPCTBLOCK, nCMPCTBLOCKVersion);
+ lNodesAnnouncingHeaderAndIDs.push_back(pfrom->GetId());
+ }
+}
+
// Requires cs_main
bool CanDirectFetch(const Consensus::Params &consensusParams)
{
@@ -623,40 +679,42 @@ bool AddOrphanTx(const CTransaction& tx, NodeId peer) EXCLUSIVE_LOCKS_REQUIRED(c
// large transaction with a missing parent then we assume
// it will rebroadcast it later, after the parent transaction(s)
// have been mined or received.
- // 10,000 orphans, each of which is at most 5,000 bytes big is
- // at most 500 megabytes of orphans:
+ // 100 orphans, each of which is at most 99,999 bytes big is
+ // at most 10 megabytes of orphans and somewhat more byprev index (in the worst case):
unsigned int sz = tx.GetSerializeSize(SER_NETWORK, CTransaction::CURRENT_VERSION);
- if (sz > 5000)
+ if (sz >= MAX_STANDARD_TX_SIZE)
{
LogPrint("mempool", "ignoring large orphan tx (size: %u, hash: %s)\n", sz, hash.ToString());
return false;
}
- mapOrphanTransactions[hash].tx = tx;
- mapOrphanTransactions[hash].fromPeer = peer;
- BOOST_FOREACH(const CTxIn& txin, tx.vin)
- mapOrphanTransactionsByPrev[txin.prevout.hash].insert(hash);
+ auto ret = mapOrphanTransactions.emplace(hash, COrphanTx{tx, peer, GetTime() + ORPHAN_TX_EXPIRE_TIME});
+ assert(ret.second);
+ BOOST_FOREACH(const CTxIn& txin, tx.vin) {
+ mapOrphanTransactionsByPrev[txin.prevout].insert(ret.first);
+ }
- LogPrint("mempool", "stored orphan tx %s (mapsz %u prevsz %u)\n", hash.ToString(),
+ LogPrint("mempool", "stored orphan tx %s (mapsz %u outsz %u)\n", hash.ToString(),
mapOrphanTransactions.size(), mapOrphanTransactionsByPrev.size());
return true;
}
-void static EraseOrphanTx(uint256 hash) EXCLUSIVE_LOCKS_REQUIRED(cs_main)
+int static EraseOrphanTx(uint256 hash) EXCLUSIVE_LOCKS_REQUIRED(cs_main)
{
map<uint256, COrphanTx>::iterator it = mapOrphanTransactions.find(hash);
if (it == mapOrphanTransactions.end())
- return;
+ return 0;
BOOST_FOREACH(const CTxIn& txin, it->second.tx.vin)
{
- map<uint256, set<uint256> >::iterator itPrev = mapOrphanTransactionsByPrev.find(txin.prevout.hash);
+ auto itPrev = mapOrphanTransactionsByPrev.find(txin.prevout);
if (itPrev == mapOrphanTransactionsByPrev.end())
continue;
- itPrev->second.erase(hash);
+ itPrev->second.erase(it);
if (itPrev->second.empty())
mapOrphanTransactionsByPrev.erase(itPrev);
}
mapOrphanTransactions.erase(it);
+ return 1;
}
void EraseOrphansFor(NodeId peer)
@@ -668,8 +726,7 @@ void EraseOrphansFor(NodeId peer)
map<uint256, COrphanTx>::iterator maybeErase = iter++; // increment to avoid iterator becoming invalid
if (maybeErase->second.fromPeer == peer)
{
- EraseOrphanTx(maybeErase->second.tx.GetHash());
- ++nErased;
+ nErased += EraseOrphanTx(maybeErase->second.tx.GetHash());
}
}
if (nErased > 0) LogPrint("mempool", "Erased %d orphan tx from peer %d\n", nErased, peer);
@@ -679,6 +736,26 @@ void EraseOrphansFor(NodeId peer)
unsigned int LimitOrphanTxSize(unsigned int nMaxOrphans) EXCLUSIVE_LOCKS_REQUIRED(cs_main)
{
unsigned int nEvicted = 0;
+ static int64_t nNextSweep;
+ int64_t nNow = GetTime();
+ if (nNextSweep <= nNow) {
+ // 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();
+ while (iter != mapOrphanTransactions.end())
+ {
+ map<uint256, COrphanTx>::iterator maybeErase = iter++;
+ if (maybeErase->second.nTimeExpire <= nNow) {
+ nErased += EraseOrphanTx(maybeErase->second.tx.GetHash());
+ } else {
+ nMinExpTime = std::min(maybeErase->second.nTimeExpire, nMinExpTime);
+ }
+ }
+ // Sweep again 5 minutes after the next entry that expires in order to batch the linear scan.
+ nNextSweep = nMinExpTime + ORPHAN_TX_EXPIRE_INTERVAL;
+ if (nErased > 0) LogPrint("mempool", "Erased %d orphan tx due to expiration\n", nErased);
+ }
while (mapOrphanTransactions.size() > nMaxOrphans)
{
// Evict a random orphan:
@@ -2241,7 +2318,7 @@ bool ConnectBlock(const CBlock& block, CValidationState& state, CBlockIndex* pin
int64_t nTimeStart = GetTimeMicros();
// Check it again in case a previous version let a bad block in
- if (!CheckBlock(block, state, chainparams.GetConsensus(), GetAdjustedTime(), !fJustCheck, !fJustCheck))
+ if (!CheckBlock(block, state, chainparams.GetConsensus(), !fJustCheck, !fJustCheck))
return error("%s: Consensus::CheckBlock: %s", __func__, FormatStateMessage(state));
// verify that the view's current state corresponds to the previous block
@@ -2335,6 +2412,7 @@ bool ConnectBlock(const CBlock& block, CValidationState& state, CBlockIndex* pin
CCheckQueueControl<CScriptCheck> control(fScriptChecks && nScriptCheckThreads ? &scriptcheckqueue : NULL);
+ std::vector<uint256> vOrphanErase;
std::vector<int> prevheights;
CAmount nFees = 0;
int nInputs = 0;
@@ -2367,6 +2445,17 @@ bool ConnectBlock(const CBlock& block, CValidationState& state, CBlockIndex* pin
prevheights[j] = view.AccessCoins(tx.vin[j].prevout.hash)->nHeight;
}
+ // Which orphan pool entries must we evict?
+ for (size_t j = 0; j < tx.vin.size(); j++) {
+ auto itByPrev = mapOrphanTransactionsByPrev.find(tx.vin[j].prevout);
+ if (itByPrev == mapOrphanTransactionsByPrev.end()) continue;
+ for (auto mi = itByPrev->second.begin(); mi != itByPrev->second.end(); ++mi) {
+ const CTransaction& orphanTx = (*mi)->second.tx;
+ const uint256& orphanHash = orphanTx.GetHash();
+ vOrphanErase.push_back(orphanHash);
+ }
+ }
+
if (!SequenceLocks(tx, nLockTimeFlags, &prevheights, *pindex)) {
return state.DoS(100, error("%s: contains a non-BIP68-final transaction", __func__),
REJECT_INVALID, "bad-txns-nonfinal");
@@ -2454,6 +2543,15 @@ bool ConnectBlock(const CBlock& block, CValidationState& state, CBlockIndex* pin
GetMainSignals().UpdatedTransaction(hashPrevBestCoinBase);
hashPrevBestCoinBase = block.vtx[0].GetHash();
+ // Erase orphan transactions include or precluded by this block
+ if (vOrphanErase.size()) {
+ int nErased = 0;
+ BOOST_FOREACH(uint256 &orphanHash, vOrphanErase) {
+ nErased += EraseOrphanTx(orphanHash);
+ }
+ LogPrint("mempool", "Erased %d orphan tx included or conflicted by block\n", nErased);
+ }
+
int64_t nTime6 = GetTimeMicros(); nTimeCallbacks += nTime6 - nTime5;
LogPrint("bench", " - Callbacks: %.2fms [%.2fs]\n", 0.001 * (nTime6 - nTime5), nTimeCallbacks * 0.000001);
@@ -3258,20 +3356,16 @@ bool FindUndoPos(CValidationState &state, int nFile, CDiskBlockPos &pos, unsigne
return true;
}
-bool CheckBlockHeader(const CBlockHeader& block, CValidationState& state, const Consensus::Params& consensusParams, int64_t nAdjustedTime, bool fCheckPOW)
+bool CheckBlockHeader(const CBlockHeader& block, CValidationState& state, const Consensus::Params& consensusParams, bool fCheckPOW)
{
// Check proof of work matches claimed amount
if (fCheckPOW && !CheckProofOfWork(block.GetHash(), block.nBits, consensusParams))
return state.DoS(50, false, REJECT_INVALID, "high-hash", false, "proof of work failed");
- // Check timestamp
- if (block.GetBlockTime() > nAdjustedTime + 2 * 60 * 60)
- return state.Invalid(false, REJECT_INVALID, "time-too-new", "block timestamp too far in the future");
-
return true;
}
-bool CheckBlock(const CBlock& block, CValidationState& state, const Consensus::Params& consensusParams, int64_t nAdjustedTime, bool fCheckPOW, bool fCheckMerkleRoot)
+bool CheckBlock(const CBlock& block, CValidationState& state, const Consensus::Params& consensusParams, bool fCheckPOW, bool fCheckMerkleRoot)
{
// These are checks that are independent of context.
@@ -3280,7 +3374,7 @@ bool CheckBlock(const CBlock& block, CValidationState& state, const Consensus::P
// Check that the header is valid (particularly PoW). This is mostly
// redundant with the call in AcceptBlockHeader.
- if (!CheckBlockHeader(block, state, consensusParams, nAdjustedTime, fCheckPOW))
+ if (!CheckBlockHeader(block, state, consensusParams, fCheckPOW))
return false;
// Check the merkle root.
@@ -3346,7 +3440,7 @@ static bool CheckIndexAgainstCheckpoint(const CBlockIndex* pindexPrev, CValidati
return true;
}
-bool ContextualCheckBlockHeader(const CBlockHeader& block, CValidationState& state, const Consensus::Params& consensusParams, CBlockIndex * const pindexPrev)
+bool ContextualCheckBlockHeader(const CBlockHeader& block, CValidationState& state, const Consensus::Params& consensusParams, CBlockIndex * const pindexPrev, int64_t nAdjustedTime)
{
// Check proof of work
if (block.nBits != GetNextWorkRequired(pindexPrev, &block, consensusParams))
@@ -3356,6 +3450,10 @@ bool ContextualCheckBlockHeader(const CBlockHeader& block, CValidationState& sta
if (block.GetBlockTime() <= pindexPrev->GetMedianTimePast())
return state.Invalid(false, REJECT_INVALID, "time-too-old", "block's timestamp is too early");
+ // Check timestamp
+ if (block.GetBlockTime() > nAdjustedTime + 2 * 60 * 60)
+ 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:
for (int32_t version = 2; version < 5; ++version) // check for version 2, 3 and 4 upgrades
if (block.nVersion < version && IsSuperMajority(version, pindexPrev, consensusParams.nMajorityRejectBlockOutdated, consensusParams))
@@ -3420,7 +3518,7 @@ static bool AcceptBlockHeader(const CBlockHeader& block, CValidationState& state
return true;
}
- if (!CheckBlockHeader(block, state, chainparams.GetConsensus(), GetAdjustedTime()))
+ if (!CheckBlockHeader(block, state, chainparams.GetConsensus()))
return error("%s: Consensus::CheckBlockHeader: %s, %s", __func__, hash.ToString(), FormatStateMessage(state));
// Get prev block index
@@ -3436,7 +3534,7 @@ static bool AcceptBlockHeader(const CBlockHeader& block, CValidationState& state
if (fCheckpointsEnabled && !CheckIndexAgainstCheckpoint(pindexPrev, state, chainparams, hash))
return error("%s: CheckIndexAgainstCheckpoint(): %s", __func__, state.GetRejectReason().c_str());
- if (!ContextualCheckBlockHeader(block, state, chainparams.GetConsensus(), pindexPrev))
+ if (!ContextualCheckBlockHeader(block, state, chainparams.GetConsensus(), pindexPrev, GetAdjustedTime()))
return error("%s: Consensus::ContextualCheckBlockHeader: %s, %s", __func__, hash.ToString(), FormatStateMessage(state));
}
if (pindex == NULL)
@@ -3449,8 +3547,9 @@ static bool AcceptBlockHeader(const CBlockHeader& block, CValidationState& state
}
/** 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)
+static bool AcceptBlock(const CBlock& block, CValidationState& state, const CChainParams& chainparams, CBlockIndex** ppindex, bool fRequested, const CDiskBlockPos* dbp, bool* fNewBlock)
{
+ if (fNewBlock) *fNewBlock = false;
AssertLockHeld(cs_main);
CBlockIndex *pindexDummy = NULL;
@@ -3479,6 +3578,7 @@ static bool AcceptBlock(const CBlock& block, CValidationState& state, const CCha
if (!fHasMoreWork) return true; // Don't process less-work chains
if (fTooFarAhead) return true; // Block height is too high
}
+ if (fNewBlock) *fNewBlock = true;
if ((!CheckBlock(block, state, chainparams.GetConsensus(), GetAdjustedTime())) || !ContextualCheckBlock(block, state, pindex->pprev)) {
if (state.IsInvalid() && !state.CorruptionPossible()) {
@@ -3526,7 +3626,7 @@ static bool IsSuperMajority(int minVersion, const CBlockIndex* pstart, unsigned
}
-bool ProcessNewBlock(CValidationState& state, const CChainParams& chainparams, const CNode* pfrom, const CBlock* pblock, bool fForceProcessing, const CDiskBlockPos* dbp)
+bool ProcessNewBlock(CValidationState& state, const CChainParams& chainparams, CNode* pfrom, const CBlock* pblock, bool fForceProcessing, const CDiskBlockPos* dbp)
{
{
LOCK(cs_main);
@@ -3535,9 +3635,11 @@ bool ProcessNewBlock(CValidationState& state, const CChainParams& chainparams, c
// Store to disk
CBlockIndex *pindex = NULL;
- bool ret = AcceptBlock(*pblock, state, chainparams, &pindex, fRequested, dbp);
+ bool fNewBlock = false;
+ bool ret = AcceptBlock(*pblock, state, chainparams, &pindex, fRequested, dbp, &fNewBlock);
if (pindex && pfrom) {
mapBlockSource[pindex->GetBlockHash()] = pfrom->GetId();
+ if (fNewBlock) pfrom->nLastBlockTime = GetTime();
}
CheckBlockIndex(chainparams.GetConsensus());
if (!ret)
@@ -3565,9 +3667,9 @@ bool TestBlockValidity(CValidationState& state, const CChainParams& chainparams,
indexDummy.nHeight = pindexPrev->nHeight + 1;
// NOTE: CheckBlockHeader is called by CheckBlock
- if (!ContextualCheckBlockHeader(block, state, chainparams.GetConsensus(), pindexPrev))
+ if (!ContextualCheckBlockHeader(block, state, chainparams.GetConsensus(), pindexPrev, GetAdjustedTime()))
return error("%s: Consensus::ContextualCheckBlockHeader: %s", __func__, FormatStateMessage(state));
- if (!CheckBlock(block, state, chainparams.GetConsensus(), GetAdjustedTime(), fCheckPOW, fCheckMerkleRoot))
+ if (!CheckBlock(block, state, chainparams.GetConsensus(), fCheckPOW, fCheckMerkleRoot))
return error("%s: Consensus::CheckBlock: %s", __func__, FormatStateMessage(state));
if (!ContextualCheckBlock(block, state, pindexPrev))
return error("%s: Consensus::ContextualCheckBlock: %s", __func__, FormatStateMessage(state));
@@ -3912,7 +4014,7 @@ bool CVerifyDB::VerifyDB(const CChainParams& chainparams, CCoinsView *coinsview,
if (!ReadBlockFromDisk(block, pindex, chainparams.GetConsensus()))
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(), GetAdjustedTime()))
+ if (nCheckLevel >= 1 && !CheckBlock(block, state, chainparams.GetConsensus()))
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
@@ -4107,7 +4209,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))
+ if (AcceptBlock(block, state, chainparams, NULL, true, dbp, NULL))
nLoaded++;
if (state.IsError())
break;
@@ -4140,7 +4242,7 @@ bool LoadExternalBlockFile(const CChainParams& chainparams, FILE* fileIn, CDiskB
head.ToString());
LOCK(cs_main);
CValidationState dummy;
- if (AcceptBlock(block, dummy, chainparams, NULL, true, &it->second))
+ if (AcceptBlock(block, dummy, chainparams, NULL, true, &it->second, NULL))
{
nLoaded++;
queue.push_back(block.GetHash());
@@ -4450,7 +4552,7 @@ void static ProcessGetData(CNode* pfrom, const Consensus::Params& consensusParam
boost::this_thread::interruption_point();
it++;
- if (inv.type == MSG_BLOCK || inv.type == MSG_FILTERED_BLOCK)
+ if (inv.type == MSG_BLOCK || inv.type == MSG_FILTERED_BLOCK || inv.type == MSG_CMPCT_BLOCK)
{
bool send = false;
BlockMap::iterator mi = mapBlockIndex.find(inv.hash);
@@ -4492,7 +4594,7 @@ void static ProcessGetData(CNode* pfrom, const Consensus::Params& consensusParam
assert(!"cannot load block from disk");
if (inv.type == MSG_BLOCK)
pfrom->PushMessage(NetMsgType::BLOCK, block);
- else // MSG_FILTERED_BLOCK)
+ else if (inv.type == MSG_FILTERED_BLOCK)
{
LOCK(pfrom->cs_filter);
if (pfrom->pfilter)
@@ -4512,6 +4614,18 @@ void static ProcessGetData(CNode* pfrom, const Consensus::Params& consensusParam
// else
// no response
}
+ else if (inv.type == MSG_CMPCT_BLOCK)
+ {
+ // If a peer is asking for old blocks, we're almost guaranteed
+ // they wont have a useful mempool to match against a compact block,
+ // and we dont feel like constructing the object for them, so
+ // instead we respond with the full, non-compact block.
+ if (mi->second->nHeight >= chainActive.Height() - 10) {
+ CBlockHeaderAndShortTxIDs cmpctblock(block);
+ pfrom->PushMessage(NetMsgType::CMPCTBLOCK, cmpctblock);
+ } else
+ pfrom->PushMessage(NetMsgType::BLOCK, block);
+ }
// Trigger the peer node to send a getblocks request for the next batch of inventory
if (inv.hash == pfrom->hashContinue)
@@ -4551,7 +4665,7 @@ void static ProcessGetData(CNode* pfrom, const Consensus::Params& consensusParam
// Track requests for our stuff.
GetMainSignals().Inventory(inv.hash);
- if (inv.type == MSG_BLOCK || inv.type == MSG_FILTERED_BLOCK)
+ if (inv.type == MSG_BLOCK || inv.type == MSG_FILTERED_BLOCK || inv.type == MSG_CMPCT_BLOCK)
break;
}
}
@@ -4761,6 +4875,16 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
// nodes)
pfrom->PushMessage(NetMsgType::SENDHEADERS);
}
+ if (pfrom->nVersion >= SHORT_IDS_BLOCKS_VERSION) {
+ // Tell our peer we are willing to provide version-1 cmpctblocks
+ // However, we do not request new block announcements using
+ // cmpctblock messages.
+ // We send this to non-NODE NETWORK peers as well, because
+ // they may wish to request compact blocks from us
+ bool fAnnounceUsingCMPCTBLOCK = false;
+ uint64_t nCMPCTBLOCKVersion = 1;
+ pfrom->PushMessage(NetMsgType::SENDCMPCT, fAnnounceUsingCMPCTBLOCK, nCMPCTBLOCKVersion);
+ }
}
@@ -4835,6 +4959,18 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
State(pfrom->GetId())->fPreferHeaders = true;
}
+ else if (strCommand == NetMsgType::SENDCMPCT)
+ {
+ bool fAnnounceUsingCMPCTBLOCK = false;
+ uint64_t nCMPCTBLOCKVersion = 1;
+ vRecv >> fAnnounceUsingCMPCTBLOCK >> nCMPCTBLOCKVersion;
+ if (nCMPCTBLOCKVersion == 1) {
+ LOCK(cs_main);
+ State(pfrom->GetId())->fProvidesHeaderAndIDs = true;
+ State(pfrom->GetId())->fPreferHeaderAndIDs = fAnnounceUsingCMPCTBLOCK;
+ }
+ }
+
else if (strCommand == NetMsgType::INV)
{
@@ -4881,7 +5017,10 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
CNodeState *nodestate = State(pfrom->GetId());
if (CanDirectFetch(chainparams.GetConsensus()) &&
nodestate->nBlocksInFlight < MAX_BLOCKS_IN_TRANSIT_PER_PEER) {
- vToFetch.push_back(inv);
+ if (nodestate->fProvidesHeaderAndIDs)
+ vToFetch.push_back(CInv(MSG_CMPCT_BLOCK, inv.hash));
+ else
+ vToFetch.push_back(inv);
// Mark block as in flight already, even though the actual "getdata" message only goes out
// later (within the same cs_main lock, though).
MarkBlockAsInFlight(pfrom->GetId(), inv.hash, chainparams.GetConsensus());
@@ -4978,6 +5117,39 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
}
+ else if (strCommand == NetMsgType::GETBLOCKTXN)
+ {
+ BlockTransactionsRequest req;
+ vRecv >> req;
+
+ BlockMap::iterator it = mapBlockIndex.find(req.blockhash);
+ if (it == mapBlockIndex.end() || !(it->second->nStatus & BLOCK_HAVE_DATA)) {
+ Misbehaving(pfrom->GetId(), 100);
+ LogPrintf("Peer %d sent us a getblocktxn for a block we don't have", pfrom->id);
+ return true;
+ }
+
+ if (it->second->nHeight < chainActive.Height() - 15) {
+ LogPrint("net", "Peer %d sent us a getblocktxn for a block > 15 deep", pfrom->id);
+ return true;
+ }
+
+ CBlock block;
+ assert(ReadBlockFromDisk(block, it->second, chainparams.GetConsensus()));
+
+ 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]];
+ }
+ pfrom->PushMessage(NetMsgType::BLOCKTXN, resp);
+ }
+
+
else if (strCommand == NetMsgType::GETHEADERS)
{
CBlockLocator locator;
@@ -5037,7 +5209,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
return true;
}
- vector<uint256> vWorkQueue;
+ deque<COutPoint> vWorkQueue;
vector<uint256> vEraseQueue;
CTransaction tx;
vRecv >> tx;
@@ -5056,7 +5228,11 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
if (!AlreadyHave(inv) && AcceptToMemoryPool(mempool, state, tx, true, &fMissingInputs)) {
mempool.check(pcoinsTip);
RelayTransaction(tx);
- vWorkQueue.push_back(inv.hash);
+ for (unsigned int i = 0; i < tx.vout.size(); i++) {
+ vWorkQueue.emplace_back(inv.hash, i);
+ }
+
+ pfrom->nLastTXTime = GetTime();
LogPrint("mempool", "AcceptToMemoryPool: peer=%d: accepted %s (poolsz %u txn, %u kB)\n",
pfrom->id,
@@ -5065,18 +5241,18 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
// Recursively process any orphan transactions that depended on this one
set<NodeId> setMisbehaving;
- for (unsigned int i = 0; i < vWorkQueue.size(); i++)
- {
- map<uint256, set<uint256> >::iterator itByPrev = mapOrphanTransactionsByPrev.find(vWorkQueue[i]);
+ while (!vWorkQueue.empty()) {
+ auto itByPrev = mapOrphanTransactionsByPrev.find(vWorkQueue.front());
+ vWorkQueue.pop_front();
if (itByPrev == mapOrphanTransactionsByPrev.end())
continue;
- for (set<uint256>::iterator mi = itByPrev->second.begin();
+ for (auto mi = itByPrev->second.begin();
mi != itByPrev->second.end();
++mi)
{
- const uint256& orphanHash = *mi;
- const CTransaction& orphanTx = mapOrphanTransactions[orphanHash].tx;
- NodeId fromPeer = mapOrphanTransactions[orphanHash].fromPeer;
+ const CTransaction& orphanTx = (*mi)->second.tx;
+ const uint256& orphanHash = orphanTx.GetHash();
+ NodeId fromPeer = (*mi)->second.fromPeer;
bool fMissingInputs2 = false;
// Use a dummy CValidationState so someone can't setup nodes to counter-DoS based on orphan
// resolution (that is, feeding people an invalid transaction based on LegitTxX in order to get
@@ -5089,7 +5265,9 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
if (AcceptToMemoryPool(mempool, stateDummy, orphanTx, true, &fMissingInputs2)) {
LogPrint("mempool", " accepted orphan tx %s\n", orphanHash.ToString());
RelayTransaction(orphanTx);
- vWorkQueue.push_back(orphanHash);
+ for (unsigned int i = 0; i < orphanTx.vout.size(); i++) {
+ vWorkQueue.emplace_back(orphanHash, i);
+ }
vEraseQueue.push_back(orphanHash);
}
else if (!fMissingInputs2)
@@ -5118,13 +5296,29 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
}
else if (fMissingInputs)
{
- AddOrphanTx(tx, pfrom->GetId());
+ bool fRejectedParents = false; // It may be the case that the orphans parents have all been rejected
+ BOOST_FOREACH(const CTxIn& txin, tx.vin) {
+ if (recentRejects->contains(txin.prevout.hash)) {
+ fRejectedParents = true;
+ break;
+ }
+ }
+ if (!fRejectedParents) {
+ BOOST_FOREACH(const CTxIn& txin, tx.vin) {
+ CInv inv(MSG_TX, txin.prevout.hash);
+ pfrom->AddInventoryKnown(inv);
+ if (!AlreadyHave(inv)) pfrom->AskFor(inv);
+ }
+ AddOrphanTx(tx, pfrom->GetId());
- // DoS prevention: do not allow mapOrphanTransactions to grow unbounded
- unsigned int nMaxOrphanTx = (unsigned int)std::max((int64_t)0, GetArg("-maxorphantx", DEFAULT_MAX_ORPHAN_TRANSACTIONS));
- unsigned int nEvicted = LimitOrphanTxSize(nMaxOrphanTx);
- if (nEvicted > 0)
- LogPrint("mempool", "mapOrphan overflow, removed %u tx\n", nEvicted);
+ // DoS prevention: do not allow mapOrphanTransactions to grow unbounded
+ unsigned int nMaxOrphanTx = (unsigned int)std::max((int64_t)0, GetArg("-maxorphantx", DEFAULT_MAX_ORPHAN_TRANSACTIONS));
+ unsigned int nEvicted = LimitOrphanTxSize(nMaxOrphanTx);
+ if (nEvicted > 0)
+ LogPrint("mempool", "mapOrphan overflow, removed %u tx\n", nEvicted);
+ } else {
+ LogPrint("mempool", "not keeping orphan with rejected parents %s\n",tx.GetHash().ToString());
+ }
} else {
assert(recentRejects);
recentRejects->insert(tx.GetHash());
@@ -5163,6 +5357,174 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
}
+ else if (strCommand == NetMsgType::CMPCTBLOCK && !fImporting && !fReindex) // Ignore blocks received while importing
+ {
+ CBlockHeaderAndShortTxIDs cmpctblock;
+ vRecv >> cmpctblock;
+
+ LOCK(cs_main);
+
+ if (mapBlockIndex.find(cmpctblock.header.hashPrevBlock) == mapBlockIndex.end()) {
+ // Doesn't connect (or is genesis), instead of DoSing in AcceptBlockHeader, request deeper headers
+ if (!IsInitialBlockDownload())
+ pfrom->PushMessage(NetMsgType::GETHEADERS, chainActive.GetLocator(pindexBestHeader), uint256());
+ return true;
+ }
+
+ CBlockIndex *pindex = NULL;
+ CValidationState state;
+ if (!AcceptBlockHeader(cmpctblock.header, state, chainparams, &pindex)) {
+ int nDoS;
+ if (state.IsInvalid(nDoS)) {
+ if (nDoS > 0)
+ Misbehaving(pfrom->GetId(), nDoS);
+ LogPrintf("Peer %d sent us invalid header via cmpctblock\n", pfrom->id);
+ return true;
+ }
+ }
+
+ // If AcceptBlockHeader returned true, it set pindex
+ assert(pindex);
+ UpdateBlockAvailability(pfrom->GetId(), pindex->GetBlockHash());
+
+ std::map<uint256, pair<NodeId, list<QueuedBlock>::iterator> >::iterator blockInFlightIt = mapBlocksInFlight.find(pindex->GetBlockHash());
+ bool fAlreadyInFlight = blockInFlightIt != mapBlocksInFlight.end();
+
+ if (pindex->nStatus & BLOCK_HAVE_DATA) // Nothing to do here
+ return true;
+
+ if (pindex->nChainWork <= chainActive.Tip()->nChainWork || // We know something better
+ pindex->nTx != 0) { // We had this block at some point, but pruned it
+ if (fAlreadyInFlight) {
+ // We requested this block for some reason, but our mempool will probably be useless
+ // so we just grab the block via normal getdata
+ std::vector<CInv> vInv(1);
+ vInv[0] = CInv(MSG_BLOCK, cmpctblock.header.GetHash());
+ pfrom->PushMessage(NetMsgType::GETDATA, vInv);
+ return true;
+ }
+ }
+
+ // If we're not close to tip yet, give up and let parallel block fetch work its magic
+ if (!fAlreadyInFlight && !CanDirectFetch(chainparams.GetConsensus()))
+ return true;
+
+ CNodeState *nodestate = State(pfrom->GetId());
+
+ // We want to be a bit conservative just to be extra careful about DoS
+ // possibilities in compact block processing...
+ 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;
+ if (!MarkBlockAsInFlight(pfrom->GetId(), pindex->GetBlockHash(), chainparams.GetConsensus(), pindex, &queuedBlockIt)) {
+ if (!(*queuedBlockIt)->partialBlock)
+ (*queuedBlockIt)->partialBlock.reset(new PartiallyDownloadedBlock(&mempool));
+ else {
+ // The block was already in flight using compact blocks from the same peer
+ LogPrint("net", "Peer sent us compact block we were already syncing!\n");
+ return true;
+ }
+ }
+
+ PartiallyDownloadedBlock& partialBlock = *(*queuedBlockIt)->partialBlock;
+ ReadStatus status = partialBlock.InitData(cmpctblock);
+ if (status == READ_STATUS_INVALID) {
+ MarkBlockAsReceived(pindex->GetBlockHash()); // Reset in-flight state in case of whitelist
+ Misbehaving(pfrom->GetId(), 100);
+ LogPrintf("Peer %d sent us invalid compact block\n", pfrom->id);
+ return true;
+ } else if (status == READ_STATUS_FAILED) {
+ // Duplicate txindexes, the block is now in-flight, so just request it
+ std::vector<CInv> vInv(1);
+ vInv[0] = CInv(MSG_BLOCK, cmpctblock.header.GetHash());
+ pfrom->PushMessage(NetMsgType::GETDATA, vInv);
+ return true;
+ }
+
+ BlockTransactionsRequest req;
+ for (size_t i = 0; i < cmpctblock.BlockTxCount(); i++) {
+ if (!partialBlock.IsTxAvailable(i))
+ req.indexes.push_back(i);
+ }
+ if (req.indexes.empty()) {
+ // Dirty hack to jump to BLOCKTXN code (TODO: move message handling into their own functions)
+ BlockTransactions txn;
+ txn.blockhash = cmpctblock.header.GetHash();
+ CDataStream blockTxnMsg(SER_NETWORK, PROTOCOL_VERSION);
+ blockTxnMsg << txn;
+ return ProcessMessage(pfrom, NetMsgType::BLOCKTXN, blockTxnMsg, nTimeReceived, chainparams);
+ } else {
+ req.blockhash = pindex->GetBlockHash();
+ pfrom->PushMessage(NetMsgType::GETBLOCKTXN, req);
+ }
+ }
+ } else {
+ if (fAlreadyInFlight) {
+ // We requested this block, but its far into the future, so our
+ // mempool will probably be useless - request the block normally
+ std::vector<CInv> vInv(1);
+ vInv[0] = CInv(MSG_BLOCK, cmpctblock.header.GetHash());
+ pfrom->PushMessage(NetMsgType::GETDATA, vInv);
+ return true;
+ } else {
+ // If this was an announce-cmpctblock, we want the same treatment as a header message
+ // Dirty hack to process as if it were just a headers message (TODO: move message handling into their own functions)
+ std::vector<CBlock> headers;
+ headers.push_back(cmpctblock.header);
+ CDataStream vHeadersMsg(SER_NETWORK, PROTOCOL_VERSION);
+ vHeadersMsg << headers;
+ return ProcessMessage(pfrom, NetMsgType::HEADERS, vHeadersMsg, nTimeReceived, chainparams);
+ }
+ }
+
+ CheckBlockIndex(chainparams.GetConsensus());
+ }
+
+ else if (strCommand == NetMsgType::BLOCKTXN && !fImporting && !fReindex) // Ignore blocks received while importing
+ {
+ BlockTransactions resp;
+ vRecv >> resp;
+
+ LOCK(cs_main);
+
+ map<uint256, pair<NodeId, 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);
+ return true;
+ }
+
+ PartiallyDownloadedBlock& partialBlock = *it->second.second->partialBlock;
+ CBlock block;
+ ReadStatus status = partialBlock.FillBlock(block, resp.txn);
+ if (status == READ_STATUS_INVALID) {
+ MarkBlockAsReceived(resp.blockhash); // Reset in-flight state in case of whitelist
+ Misbehaving(pfrom->GetId(), 100);
+ LogPrintf("Peer %d sent us invalid compact block/non-matching block transactions\n", pfrom->id);
+ return true;
+ } else if (status == READ_STATUS_FAILED) {
+ // Might have collided, fall back to getdata now :(
+ std::vector<CInv> invs;
+ invs.push_back(CInv(MSG_BLOCK, resp.blockhash));
+ pfrom->PushMessage(NetMsgType::GETDATA, invs);
+ } else {
+ CValidationState state;
+ ProcessNewBlock(state, chainparams, pfrom, &block, false, NULL);
+ int nDoS;
+ if (state.IsInvalid(nDoS)) {
+ assert (state.GetRejectCode() < REJECT_INTERNAL); // Blocks are never rejected with internal reject codes
+ pfrom->PushMessage(NetMsgType::REJECT, strCommand, (unsigned char)state.GetRejectCode(),
+ state.GetRejectReason().substr(0, MAX_REJECT_MESSAGE_LENGTH), block.GetHash());
+ if (nDoS > 0) {
+ LOCK(cs_main);
+ Misbehaving(pfrom->GetId(), nDoS);
+ }
+ }
+ }
+ }
+
+
else if (strCommand == NetMsgType::HEADERS && !fImporting && !fReindex) // Ignore headers received while importing
{
std::vector<CBlockHeader> headers;
@@ -5212,10 +5574,10 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
}
}
- if (pindexLast)
- UpdateBlockAvailability(pfrom->GetId(), pindexLast->GetBlockHash());
+ assert(pindexLast);
+ UpdateBlockAvailability(pfrom->GetId(), pindexLast->GetBlockHash());
- if (nCount == MAX_HEADERS_RESULTS && pindexLast && hasNewHeaders) {
+ if (nCount == MAX_HEADERS_RESULTS && hasNewHeaders) {
// Headers message had its maximum size; the peer may have more headers.
// TODO: optimize: if pindexLast is an ancestor of chainActive.Tip or pindexBestHeader, continue
// from there instead.
@@ -5265,6 +5627,13 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
pindexLast->GetBlockHash().ToString(), pindexLast->nHeight);
}
if (vGetData.size() > 0) {
+ if (nodestate->fProvidesHeaderAndIDs && 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);
+ // In any case, we want to download using a compact block, not a regular one
+ vGetData[0] = CInv(MSG_CMPCT_BLOCK, vGetData[0].hash);
+ }
pfrom->PushMessage(NetMsgType::GETDATA, vGetData);
}
}
@@ -5818,7 +6187,9 @@ bool SendMessages(CNode* pto)
// add all to the inv queue.
LOCK(pto->cs_inventory);
vector<CBlock> vHeaders;
- bool fRevertToInv = (!state.fPreferHeaders || pto->vBlockHashesToAnnounce.size() > MAX_BLOCKS_TO_ANNOUNCE);
+ 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
ProcessBlockAvailability(pto->id); // ensure pindexBestKnownBlock is up-to-date
@@ -5870,6 +6241,33 @@ bool SendMessages(CNode* pto)
}
}
}
+ if (!fRevertToInv && !vHeaders.empty()) {
+ 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__,
+ vHeaders.front().GetHash().ToString(), pto->id);
+ //TODO: Shouldn't need to reload block from disk, but requires refactor
+ CBlock block;
+ assert(ReadBlockFromDisk(block, pBestIndex, consensusParams));
+ CBlockHeaderAndShortTxIDs cmpctblock(block);
+ pto->PushMessage(NetMsgType::CMPCTBLOCK, cmpctblock);
+ state.pindexBestHeaderSent = pBestIndex;
+ } else if (state.fPreferHeaders) {
+ if (vHeaders.size() > 1) {
+ LogPrint("net", "%s: %u headers, range (%s, %s), to peer=%d\n", __func__,
+ vHeaders.size(),
+ vHeaders.front().GetHash().ToString(),
+ vHeaders.back().GetHash().ToString(), pto->id);
+ } else {
+ LogPrint("net", "%s: sending header %s to peer=%d\n", __func__,
+ vHeaders.front().GetHash().ToString(), pto->id);
+ }
+ pto->PushMessage(NetMsgType::HEADERS, vHeaders);
+ state.pindexBestHeaderSent = pBestIndex;
+ } else
+ fRevertToInv = true;
+ }
if (fRevertToInv) {
// If falling back to using an inv, just try to inv the tip.
// The last entry in vBlockHashesToAnnounce was our tip at some point
@@ -5895,18 +6293,6 @@ bool SendMessages(CNode* pto)
pto->id, hashToAnnounce.ToString());
}
}
- } else if (!vHeaders.empty()) {
- if (vHeaders.size() > 1) {
- LogPrint("net", "%s: %u headers, range (%s, %s), to peer=%d\n", __func__,
- vHeaders.size(),
- vHeaders.front().GetHash().ToString(),
- vHeaders.back().GetHash().ToString(), pto->id);
- } else {
- LogPrint("net", "%s: sending header %s to peer=%d\n", __func__,
- vHeaders.front().GetHash().ToString(), pto->id);
- }
- pto->PushMessage(NetMsgType::HEADERS, vHeaders);
- state.pindexBestHeaderSent = pBestIndex;
}
pto->vBlockHashesToAnnounce.clear();
}
diff --git a/src/main.h b/src/main.h
index 9b99ae7c87..f004a29bb1 100644
--- a/src/main.h
+++ b/src/main.h
@@ -56,6 +56,10 @@ static const CAmount HIGH_TX_FEE_PER_KB = 0.01 * COIN;
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 */
@@ -215,7 +219,7 @@ void UnregisterNodeSignals(CNodeSignals& nodeSignals);
* @param[out] dbp The already known disk position of pblock, or NULL if not yet stored.
* @return True if state.IsValid()
*/
-bool ProcessNewBlock(CValidationState& state, const CChainParams& chainparams, const CNode* pfrom, const CBlock* pblock, bool fForceProcessing, const CDiskBlockPos* dbp);
+bool ProcessNewBlock(CValidationState& state, const CChainParams& chainparams, CNode* pfrom, const CBlock* pblock, bool fForceProcessing, const CDiskBlockPos* dbp);
/** Check whether enough disk space is available for an incoming block */
bool CheckDiskSpace(uint64_t nAdditionalBytes = 0);
/** Open a block file (blk?????.dat) */
@@ -425,13 +429,13 @@ bool ReadBlockFromDisk(CBlock& block, const CBlockIndex* pindex, const Consensus
/** Functions for validating blocks and updating the block tree */
/** Context-independent validity checks */
-bool CheckBlockHeader(const CBlockHeader& block, CValidationState& state, const Consensus::Params& consensusParams, int64_t nAdjustedTime, bool fCheckPOW = true);
-bool CheckBlock(const CBlock& block, CValidationState& state, const Consensus::Params& consensusParams, int64_t nAdjustedTime, bool fCheckPOW = true, bool fCheckMerkleRoot = true);
+bool CheckBlockHeader(const CBlockHeader& block, CValidationState& state, const Consensus::Params& consensusParams, bool fCheckPOW = true);
+bool CheckBlock(const CBlock& block, CValidationState& state, const Consensus::Params& consensusParams, bool fCheckPOW = true, bool fCheckMerkleRoot = true);
/** Context-dependent validity checks.
* By "context", we mean only the previous block headers, but not the UTXO
* set; UTXO-related validity checks are done in ConnectBlock(). */
-bool ContextualCheckBlockHeader(const CBlockHeader& block, CValidationState& state, const Consensus::Params& consensusParams, CBlockIndex* pindexPrev);
+bool ContextualCheckBlockHeader(const CBlockHeader& block, CValidationState& state, const Consensus::Params& consensusParams, CBlockIndex* pindexPrev, int64_t nAdjustedTime);
bool ContextualCheckBlock(const CBlock& block, CValidationState& state, CBlockIndex *pindexPrev);
/** Apply the effects of this block (with given index) on the UTXO set represented by coins.
diff --git a/src/miner.cpp b/src/miner.cpp
index 99eb0a2ebd..989ad11a26 100644
--- a/src/miner.cpp
+++ b/src/miner.cpp
@@ -25,6 +25,7 @@
#include "utilmoneystr.h"
#include "validationinterface.h"
+#include <algorithm>
#include <boost/thread.hpp>
#include <boost/tuple/tuple.hpp>
#include <queue>
@@ -134,7 +135,7 @@ CBlockTemplate* BlockAssembler::CreateNewBlock(const CScript& scriptPubKeyIn)
: pblock->GetBlockTime();
addPriorityTxs();
- addScoreTxs();
+ addPackageTxs();
nLastBlockTx = nBlockTx;
nLastBlockSize = nBlockSize;
@@ -177,7 +178,38 @@ bool BlockAssembler::isStillDependent(CTxMemPool::txiter iter)
return false;
}
+void BlockAssembler::onlyUnconfirmed(CTxMemPool::setEntries& testSet)
+{
+ for (CTxMemPool::setEntries::iterator iit = testSet.begin(); iit != testSet.end(); ) {
+ // Only test txs not already in the block
+ if (inBlock.count(*iit)) {
+ testSet.erase(iit++);
+ }
+ else {
+ iit++;
+ }
+ }
+}
+
+bool BlockAssembler::TestPackage(uint64_t packageSize, unsigned int packageSigOps)
+{
+ if (nBlockSize + packageSize >= nBlockMaxSize)
+ return false;
+ if (nBlockSigOps + packageSigOps >= MAX_BLOCK_SIGOPS)
+ return false;
+ return true;
+}
+// Block size and sigops have already been tested. Check that all transactions
+// are final.
+bool BlockAssembler::TestPackageFinality(const CTxMemPool::setEntries& package)
+{
+ BOOST_FOREACH (const CTxMemPool::txiter it, package) {
+ if (!IsFinalTx(it->GetTx(), nHeight, nLockTimeCutoff))
+ return false;
+ }
+ return true;
+}
bool BlockAssembler::TestForBlock(CTxMemPool::txiter iter)
{
@@ -297,6 +329,178 @@ void BlockAssembler::addScoreTxs()
}
}
+void BlockAssembler::UpdatePackagesForAdded(const CTxMemPool::setEntries& alreadyAdded,
+ indexed_modified_transaction_set &mapModifiedTx)
+{
+ BOOST_FOREACH(const CTxMemPool::txiter it, alreadyAdded) {
+ CTxMemPool::setEntries descendants;
+ mempool.CalculateDescendants(it, descendants);
+ // Insert all descendants (not yet in block) into the modified set
+ BOOST_FOREACH(CTxMemPool::txiter desc, descendants) {
+ if (alreadyAdded.count(desc))
+ continue;
+ modtxiter mit = mapModifiedTx.find(desc);
+ if (mit == mapModifiedTx.end()) {
+ CTxMemPoolModifiedEntry modEntry(desc);
+ modEntry.nSizeWithAncestors -= it->GetTxSize();
+ modEntry.nModFeesWithAncestors -= it->GetModifiedFee();
+ modEntry.nSigOpCountWithAncestors -= it->GetSigOpCount();
+ mapModifiedTx.insert(modEntry);
+ } else {
+ mapModifiedTx.modify(mit, update_for_parent_inclusion(it));
+ }
+ }
+ }
+}
+
+// Skip entries in mapTx that are already in a block or are present
+// in mapModifiedTx (which implies that the mapTx ancestor state is
+// stale due to ancestor inclusion in the block)
+// Also skip transactions that we've already failed to add. This can happen if
+// we consider a transaction in mapModifiedTx and it fails: we can then
+// potentially consider it again while walking mapTx. It's currently
+// guaranteed to fail again, but as a belt-and-suspenders check we put it in
+// failedTx and avoid re-evaluation, since the re-evaluation would be using
+// cached size/sigops/fee values that are not actually correct.
+bool BlockAssembler::SkipMapTxEntry(CTxMemPool::txiter it, indexed_modified_transaction_set &mapModifiedTx, CTxMemPool::setEntries &failedTx)
+{
+ assert (it != mempool.mapTx.end());
+ if (mapModifiedTx.count(it) || inBlock.count(it) || failedTx.count(it))
+ return true;
+ return false;
+}
+
+void BlockAssembler::SortForBlock(const CTxMemPool::setEntries& package, CTxMemPool::txiter entry, std::vector<CTxMemPool::txiter>& sortedEntries)
+{
+ // Sort package by ancestor count
+ // If a transaction A depends on transaction B, then A's ancestor count
+ // must be greater than B's. So this is sufficient to validly order the
+ // transactions for block inclusion.
+ sortedEntries.clear();
+ sortedEntries.insert(sortedEntries.begin(), package.begin(), package.end());
+ std::sort(sortedEntries.begin(), sortedEntries.end(), CompareTxIterByAncestorCount());
+}
+
+// This transaction selection algorithm orders the mempool based
+// on feerate of a transaction including all unconfirmed ancestors.
+// Since we don't remove transactions from the mempool as we select them
+// for block inclusion, we need an alternate method of updating the feerate
+// of a transaction with its not-yet-selected ancestors as we go.
+// This is accomplished by walking the in-mempool descendants of selected
+// transactions and storing a temporary modified state in mapModifiedTxs.
+// Each time through the loop, we compare the best transaction in
+// mapModifiedTxs with the next transaction in the mempool to decide what
+// transaction package to work on next.
+void BlockAssembler::addPackageTxs()
+{
+ // mapModifiedTx will store sorted packages after they are modified
+ // because some of their txs are already in the block
+ indexed_modified_transaction_set mapModifiedTx;
+ // Keep track of entries that failed inclusion, to avoid duplicate work
+ CTxMemPool::setEntries failedTx;
+
+ // Start by adding all descendants of previously added txs to mapModifiedTx
+ // and modifying them for their already included ancestors
+ UpdatePackagesForAdded(inBlock, mapModifiedTx);
+
+ CTxMemPool::indexed_transaction_set::index<ancestor_score>::type::iterator mi = mempool.mapTx.get<ancestor_score>().begin();
+ CTxMemPool::txiter iter;
+ while (mi != mempool.mapTx.get<ancestor_score>().end() || !mapModifiedTx.empty())
+ {
+ // First try to find a new transaction in mapTx to evaluate.
+ if (mi != mempool.mapTx.get<ancestor_score>().end() &&
+ SkipMapTxEntry(mempool.mapTx.project<0>(mi), mapModifiedTx, failedTx)) {
+ ++mi;
+ continue;
+ }
+
+ // Now that mi is not stale, determine which transaction to evaluate:
+ // the next entry from mapTx, or the best from mapModifiedTx?
+ bool fUsingModified = false;
+
+ modtxscoreiter modit = mapModifiedTx.get<ancestor_score>().begin();
+ if (mi == mempool.mapTx.get<ancestor_score>().end()) {
+ // We're out of entries in mapTx; use the entry from mapModifiedTx
+ iter = modit->iter;
+ fUsingModified = true;
+ } else {
+ // Try to compare the mapTx entry to the mapModifiedTx entry
+ iter = mempool.mapTx.project<0>(mi);
+ if (modit != mapModifiedTx.get<ancestor_score>().end() &&
+ CompareModifiedEntry()(*modit, CTxMemPoolModifiedEntry(iter))) {
+ // The best entry in mapModifiedTx has higher score
+ // than the one from mapTx.
+ // Switch which transaction (package) to consider
+ iter = modit->iter;
+ fUsingModified = true;
+ } else {
+ // Either no entry in mapModifiedTx, or it's worse than mapTx.
+ // Increment mi for the next loop iteration.
+ ++mi;
+ }
+ }
+
+ // We skip mapTx entries that are inBlock, and mapModifiedTx shouldn't
+ // contain anything that is inBlock.
+ assert(!inBlock.count(iter));
+
+ uint64_t packageSize = iter->GetSizeWithAncestors();
+ CAmount packageFees = iter->GetModFeesWithAncestors();
+ unsigned int packageSigOps = iter->GetSigOpCountWithAncestors();
+ if (fUsingModified) {
+ packageSize = modit->nSizeWithAncestors;
+ packageFees = modit->nModFeesWithAncestors;
+ packageSigOps = modit->nSigOpCountWithAncestors;
+ }
+
+ if (packageFees < ::minRelayTxFee.GetFee(packageSize) && nBlockSize >= nBlockMinSize) {
+ // Everything else we might consider has a lower fee rate
+ return;
+ }
+
+ if (!TestPackage(packageSize, packageSigOps)) {
+ if (fUsingModified) {
+ // Since we always look at the best entry in mapModifiedTx,
+ // we must erase failed entries so that we can consider the
+ // next best entry on the next loop iteration
+ mapModifiedTx.get<ancestor_score>().erase(modit);
+ failedTx.insert(iter);
+ }
+ continue;
+ }
+
+ CTxMemPool::setEntries ancestors;
+ uint64_t nNoLimit = std::numeric_limits<uint64_t>::max();
+ std::string dummy;
+ mempool.CalculateMemPoolAncestors(*iter, ancestors, nNoLimit, nNoLimit, nNoLimit, nNoLimit, dummy, false);
+
+ onlyUnconfirmed(ancestors);
+ ancestors.insert(iter);
+
+ // Test if all tx's are Final
+ if (!TestPackageFinality(ancestors)) {
+ if (fUsingModified) {
+ mapModifiedTx.get<ancestor_score>().erase(modit);
+ failedTx.insert(iter);
+ }
+ continue;
+ }
+
+ // Package can be added. Sort the entries in a valid order.
+ vector<CTxMemPool::txiter> sortedEntries;
+ SortForBlock(ancestors, iter, sortedEntries);
+
+ for (size_t i=0; i<sortedEntries.size(); ++i) {
+ AddToBlock(sortedEntries[i]);
+ // Erase from the modified set, if present
+ mapModifiedTx.erase(sortedEntries[i]);
+ }
+
+ // Update transactions that depend on each of these
+ UpdatePackagesForAdded(ancestors, mapModifiedTx);
+ }
+}
+
void BlockAssembler::addPriorityTxs()
{
// How much of the block should be dedicated to high-priority transactions,
diff --git a/src/miner.h b/src/miner.h
index 74f19693c4..a9fea85304 100644
--- a/src/miner.h
+++ b/src/miner.h
@@ -11,6 +11,8 @@
#include <stdint.h>
#include <memory>
+#include "boost/multi_index_container.hpp"
+#include "boost/multi_index/ordered_index.hpp"
class CBlockIndex;
class CChainParams;
@@ -29,6 +31,104 @@ struct CBlockTemplate
std::vector<int64_t> vTxSigOps;
};
+// Container for tracking updates to ancestor feerate as we include (parent)
+// transactions in a block
+struct CTxMemPoolModifiedEntry {
+ CTxMemPoolModifiedEntry(CTxMemPool::txiter entry)
+ {
+ iter = entry;
+ nSizeWithAncestors = entry->GetSizeWithAncestors();
+ nModFeesWithAncestors = entry->GetModFeesWithAncestors();
+ nSigOpCountWithAncestors = entry->GetSigOpCountWithAncestors();
+ }
+
+ CTxMemPool::txiter iter;
+ uint64_t nSizeWithAncestors;
+ CAmount nModFeesWithAncestors;
+ unsigned int nSigOpCountWithAncestors;
+};
+
+/** Comparator for CTxMemPool::txiter objects.
+ * It simply compares the internal memory address of the CTxMemPoolEntry object
+ * pointed to. This means it has no meaning, and is only useful for using them
+ * as key in other indexes.
+ */
+struct CompareCTxMemPoolIter {
+ bool operator()(const CTxMemPool::txiter& a, const CTxMemPool::txiter& b) const
+ {
+ return &(*a) < &(*b);
+ }
+};
+
+struct modifiedentry_iter {
+ typedef CTxMemPool::txiter result_type;
+ result_type operator() (const CTxMemPoolModifiedEntry &entry) const
+ {
+ return entry.iter;
+ }
+};
+
+// This matches the calculation in CompareTxMemPoolEntryByAncestorFee,
+// except operating on CTxMemPoolModifiedEntry.
+// TODO: refactor to avoid duplication of this logic.
+struct CompareModifiedEntry {
+ bool operator()(const CTxMemPoolModifiedEntry &a, const CTxMemPoolModifiedEntry &b)
+ {
+ double f1 = (double)a.nModFeesWithAncestors * b.nSizeWithAncestors;
+ double f2 = (double)b.nModFeesWithAncestors * a.nSizeWithAncestors;
+ if (f1 == f2) {
+ return CTxMemPool::CompareIteratorByHash()(a.iter, b.iter);
+ }
+ return f1 > f2;
+ }
+};
+
+// A comparator that sorts transactions based on number of ancestors.
+// This is sufficient to sort an ancestor package in an order that is valid
+// to appear in a block.
+struct CompareTxIterByAncestorCount {
+ bool operator()(const CTxMemPool::txiter &a, const CTxMemPool::txiter &b)
+ {
+ if (a->GetCountWithAncestors() != b->GetCountWithAncestors())
+ return a->GetCountWithAncestors() < b->GetCountWithAncestors();
+ return CTxMemPool::CompareIteratorByHash()(a, b);
+ }
+};
+
+typedef boost::multi_index_container<
+ CTxMemPoolModifiedEntry,
+ boost::multi_index::indexed_by<
+ boost::multi_index::ordered_unique<
+ modifiedentry_iter,
+ CompareCTxMemPoolIter
+ >,
+ // sorted by modified ancestor fee rate
+ boost::multi_index::ordered_non_unique<
+ // Reuse same tag from CTxMemPool's similar index
+ boost::multi_index::tag<ancestor_score>,
+ boost::multi_index::identity<CTxMemPoolModifiedEntry>,
+ CompareModifiedEntry
+ >
+ >
+> indexed_modified_transaction_set;
+
+typedef indexed_modified_transaction_set::nth_index<0>::type::iterator modtxiter;
+typedef indexed_modified_transaction_set::index<ancestor_score>::type::iterator modtxscoreiter;
+
+struct update_for_parent_inclusion
+{
+ update_for_parent_inclusion(CTxMemPool::txiter it) : iter(it) {}
+
+ void operator() (CTxMemPoolModifiedEntry &e)
+ {
+ e.nModFeesWithAncestors -= iter->GetFee();
+ e.nSizeWithAncestors -= iter->GetTxSize();
+ e.nSigOpCountWithAncestors -= iter->GetSigOpCount();
+ }
+
+ CTxMemPool::txiter iter;
+};
+
/** Generate a new block, without valid proof-of-work */
class BlockAssembler
{
@@ -74,12 +174,30 @@ private:
void addScoreTxs();
/** Add transactions based on tx "priority" */
void addPriorityTxs();
+ /** Add transactions based on feerate including unconfirmed ancestors */
+ void addPackageTxs();
// helper function for addScoreTxs and 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);
+ /** Test if a new package would "fit" in the block */
+ bool TestPackage(uint64_t packageSize, unsigned int packageSigOps);
+ /** Test if a set of transactions are all final */
+ bool TestPackageFinality(const CTxMemPool::setEntries& package);
+ /** Return true if given transaction from mapTx has already been evaluated,
+ * or if the transaction's cached data in mapTx is incorrect. */
+ bool SkipMapTxEntry(CTxMemPool::txiter it, indexed_modified_transaction_set &mapModifiedTx, CTxMemPool::setEntries &failedTx);
+ /** Sort the package in an order that is valid to appear in a block */
+ void SortForBlock(const CTxMemPool::setEntries& package, CTxMemPool::txiter entry, std::vector<CTxMemPool::txiter>& sortedEntries);
+ /** Add descendants of given transactions to mapModifiedTx with ancestor
+ * state updated assuming given transactions are inBlock. */
+ void UpdatePackagesForAdded(const CTxMemPool::setEntries& alreadyAdded, indexed_modified_transaction_set &mapModifiedTx);
};
/** Modify the extranonce in a block */
diff --git a/src/net.cpp b/src/net.cpp
index a390eca776..336163a896 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -368,6 +368,16 @@ CNode* FindNode(const CService& addr)
return NULL;
}
+//TODO: This is used in only one place in main, and should be removed
+CNode* FindNode(const NodeId nodeid)
+{
+ LOCK(cs_vNodes);
+ BOOST_FOREACH(CNode* pnode, vNodes)
+ if (pnode->GetId() == nodeid)
+ return (pnode);
+ return NULL;
+}
+
CNode* ConnectNode(CAddress addrConnect, const char *pszDest, bool fCountFailure)
{
if (pszDest == NULL) {
@@ -400,6 +410,26 @@ CNode* ConnectNode(CAddress addrConnect, const char *pszDest, bool fCountFailure
return NULL;
}
+ if (pszDest && addrConnect.IsValid()) {
+ // It is possible that we already have a connection to the IP/port pszDest resolved to.
+ // 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.
+ CNode* pnode = FindNode((CService)addrConnect);
+ if (pnode)
+ {
+ pnode->AddRef();
+ {
+ LOCK(cs_vNodes);
+ if (pnode->addrName.empty()) {
+ pnode->addrName = std::string(pszDest);
+ }
+ }
+ CloseSocket(hSocket);
+ return pnode;
+ }
+ }
+
addrman.Attempt(addrConnect, fCountFailure);
// Add node
@@ -841,6 +871,11 @@ struct NodeEvictionCandidate
NodeId id;
int64_t nTimeConnected;
int64_t nMinPingUsecTime;
+ int64_t nLastBlockTime;
+ int64_t nLastTXTime;
+ bool fNetworkNode;
+ bool fRelayTxes;
+ bool fBloomFilter;
CAddress addr;
uint64_t nKeyedNetGroup;
};
@@ -857,7 +892,24 @@ static bool ReverseCompareNodeTimeConnected(const NodeEvictionCandidate &a, cons
static bool CompareNetGroupKeyed(const NodeEvictionCandidate &a, const NodeEvictionCandidate &b) {
return a.nKeyedNetGroup < b.nKeyedNetGroup;
-};
+}
+
+static bool CompareNodeBlockTime(const NodeEvictionCandidate &a, const NodeEvictionCandidate &b)
+{
+ // There is a fall-through here because it is common for a node to have many peers which have not yet relayed a block.
+ if (a.nLastBlockTime != b.nLastBlockTime) return a.nLastBlockTime < b.nLastBlockTime;
+ if (a.fNetworkNode != b.fNetworkNode) return b.fNetworkNode;
+ return a.nTimeConnected > b.nTimeConnected;
+}
+
+static bool CompareNodeTXTime(const NodeEvictionCandidate &a, const NodeEvictionCandidate &b)
+{
+ // There is a fall-through here because it is common for a node to have more than a few peers that have not yet relayed txn.
+ if (a.nLastTXTime != b.nLastTXTime) return a.nLastTXTime < b.nLastTXTime;
+ if (a.fRelayTxes != b.fRelayTxes) return b.fRelayTxes;
+ if (a.fBloomFilter != b.fBloomFilter) return a.fBloomFilter;
+ return a.nTimeConnected > b.nTimeConnected;
+}
/** Try to find a connection to evict when the node is full.
* Extreme care must be taken to avoid opening the node to attacker
@@ -867,7 +919,7 @@ static bool CompareNetGroupKeyed(const NodeEvictionCandidate &a, const NodeEvict
* to forge. In order to partition a node the attacker must be
* simultaneously better at all of them than honest peers.
*/
-static bool AttemptToEvictConnection(bool fPreferNewConnection) {
+static bool AttemptToEvictConnection() {
std::vector<NodeEvictionCandidate> vEvictionCandidates;
{
LOCK(cs_vNodes);
@@ -879,7 +931,9 @@ static bool AttemptToEvictConnection(bool fPreferNewConnection) {
continue;
if (node->fDisconnect)
continue;
- NodeEvictionCandidate candidate = {node->id, node->nTimeConnected, node->nMinPingUsecTime, node->addr, node->nKeyedNetGroup};
+ NodeEvictionCandidate candidate = {node->id, node->nTimeConnected, node->nMinPingUsecTime,
+ node->nLastBlockTime, node->nLastTXTime, node->fNetworkNode,
+ node->fRelayTxes, node->pfilter != NULL, node->addr, node->nKeyedNetGroup};
vEvictionCandidates.push_back(candidate);
}
}
@@ -902,6 +956,20 @@ static bool AttemptToEvictConnection(bool fPreferNewConnection) {
if (vEvictionCandidates.empty()) return false;
+ // Protect 4 nodes that most recently sent us transactions.
+ // An attacker cannot manipulate this metric without performing useful work.
+ std::sort(vEvictionCandidates.begin(), vEvictionCandidates.end(), CompareNodeTXTime);
+ vEvictionCandidates.erase(vEvictionCandidates.end() - std::min(4, static_cast<int>(vEvictionCandidates.size())), vEvictionCandidates.end());
+
+ if (vEvictionCandidates.empty()) return false;
+
+ // Protect 4 nodes that most recently sent us blocks.
+ // An attacker cannot manipulate this metric without performing useful work.
+ std::sort(vEvictionCandidates.begin(), vEvictionCandidates.end(), CompareNodeBlockTime);
+ vEvictionCandidates.erase(vEvictionCandidates.end() - std::min(4, static_cast<int>(vEvictionCandidates.size())), vEvictionCandidates.end());
+
+ if (vEvictionCandidates.empty()) return false;
+
// Protect the half of the remaining nodes which have been connected the longest.
// This replicates the non-eviction implicit behavior, and precludes attacks that start later.
std::sort(vEvictionCandidates.begin(), vEvictionCandidates.end(), ReverseCompareNodeTimeConnected);
@@ -930,13 +998,6 @@ static bool AttemptToEvictConnection(bool fPreferNewConnection) {
// Reduce to the network group with the most connections
vEvictionCandidates = std::move(mapAddrCounts[naMostConnections]);
- // Do not disconnect peers if there is only one unprotected connection from their network group.
- // This step excessively favors netgroup diversity, and should be removed once more protective criteria are established.
- if (vEvictionCandidates.size() <= 1)
- // unless we prefer the new connection (for whitelisted peers)
- if (!fPreferNewConnection)
- return false;
-
// Disconnect from the network group with the most connections
NodeId evicted = vEvictionCandidates.front().id;
LOCK(cs_vNodes);
@@ -1002,7 +1063,7 @@ static void AcceptConnection(const ListenSocket& hListenSocket) {
if (nInbound >= nMaxInbound)
{
- if (!AttemptToEvictConnection(whitelisted)) {
+ if (!AttemptToEvictConnection()) {
// No connection to evict, disconnect the new connection
LogPrint("net", "failed to find an eviction candidate - connection dropped (full)\n");
CloseSocket(hSocket);
@@ -1415,6 +1476,18 @@ void MapPort(bool)
+static std::string GetDNSHost(const CDNSSeedData& data, ServiceFlags* requiredServiceBits)
+{
+ //use default host for non-filter-capable seeds or if we use the default service bits (NODE_NETWORK)
+ if (!data.supportsServiceBitsFiltering || *requiredServiceBits == NODE_NETWORK) {
+ *requiredServiceBits = NODE_NETWORK;
+ return data.host;
+ }
+
+ return strprintf("x%x.%s", *requiredServiceBits, data.host);
+}
+
+
void ThreadDNSAddressSeed()
{
// goal: only query DNS seeds if address need is acute
@@ -1441,7 +1514,7 @@ void ThreadDNSAddressSeed()
std::vector<CNetAddr> vIPs;
std::vector<CAddress> vAdd;
ServiceFlags requiredServiceBits = nRelevantServices;
- if (LookupHost(seed.getHost(requiredServiceBits).c_str(), vIPs, 0, true))
+ if (LookupHost(GetDNSHost(seed, &requiredServiceBits).c_str(), vIPs, 0, true))
{
BOOST_FOREACH(const CNetAddr& ip, vIPs)
{
@@ -1616,68 +1689,79 @@ void ThreadOpenConnections()
}
}
-void ThreadOpenAddedConnections()
+std::vector<AddedNodeInfo> GetAddedNodeInfo()
{
+ std::vector<AddedNodeInfo> ret;
+
+ std::list<std::string> lAddresses(0);
{
LOCK(cs_vAddedNodes);
- vAddedNodes = mapMultiArgs["-addnode"];
+ ret.reserve(vAddedNodes.size());
+ BOOST_FOREACH(const std::string& strAddNode, vAddedNodes)
+ lAddresses.push_back(strAddNode);
}
- if (HaveNameProxy()) {
- while(true) {
- std::list<std::string> lAddresses(0);
- {
- LOCK(cs_vAddedNodes);
- BOOST_FOREACH(const std::string& strAddNode, vAddedNodes)
- lAddresses.push_back(strAddNode);
+
+ // Build a map of all already connected addresses (by IP:port and by name) to inbound/outbound and resolved CService
+ std::map<CService, bool> mapConnected;
+ std::map<std::string, std::pair<bool, CService>> mapConnectedByName;
+ {
+ LOCK(cs_vNodes);
+ for (const CNode* pnode : vNodes) {
+ if (pnode->addr.IsValid()) {
+ mapConnected[pnode->addr] = pnode->fInbound;
}
- BOOST_FOREACH(const std::string& strAddNode, lAddresses) {
- CAddress addr;
- CSemaphoreGrant grant(*semOutbound);
- OpenNetworkConnection(addr, false, &grant, strAddNode.c_str());
- MilliSleep(500);
+ if (!pnode->addrName.empty()) {
+ mapConnectedByName[pnode->addrName] = std::make_pair(pnode->fInbound, static_cast<const CService&>(pnode->addr));
}
- MilliSleep(120000); // Retry every 2 minutes
}
}
+ BOOST_FOREACH(const std::string& strAddNode, lAddresses) {
+ CService service(strAddNode, Params().GetDefaultPort());
+ if (service.IsValid()) {
+ // strAddNode is an IP:port
+ auto it = mapConnected.find(service);
+ if (it != mapConnected.end()) {
+ ret.push_back(AddedNodeInfo{strAddNode, service, true, it->second});
+ } else {
+ ret.push_back(AddedNodeInfo{strAddNode, CService(), false, false});
+ }
+ } else {
+ // strAddNode is a name
+ auto it = mapConnectedByName.find(strAddNode);
+ if (it != mapConnectedByName.end()) {
+ ret.push_back(AddedNodeInfo{strAddNode, it->second.second, true, it->second.first});
+ } else {
+ ret.push_back(AddedNodeInfo{strAddNode, CService(), false, false});
+ }
+ }
+ }
+
+ return ret;
+}
+
+void ThreadOpenAddedConnections()
+{
+ {
+ LOCK(cs_vAddedNodes);
+ vAddedNodes = mapMultiArgs["-addnode"];
+ }
+
for (unsigned int i = 0; true; i++)
{
- std::list<std::string> lAddresses(0);
- {
- LOCK(cs_vAddedNodes);
- BOOST_FOREACH(const std::string& strAddNode, vAddedNodes)
- lAddresses.push_back(strAddNode);
+ std::vector<AddedNodeInfo> vInfo = GetAddedNodeInfo();
+ for (const AddedNodeInfo& info : vInfo) {
+ if (!info.fConnected) {
+ CSemaphoreGrant grant(*semOutbound);
+ // If strAddedNode is an IP/port, decode it immediately, so
+ // OpenNetworkConnection can detect existing connections to that IP/port.
+ CService service(info.strAddedNode, Params().GetDefaultPort());
+ OpenNetworkConnection(CAddress(service, NODE_NONE), false, &grant, info.strAddedNode.c_str(), false);
+ MilliSleep(500);
+ }
}
- std::list<std::vector<CService> > lservAddressesToAdd(0);
- BOOST_FOREACH(const std::string& strAddNode, lAddresses) {
- std::vector<CService> vservNode(0);
- if(Lookup(strAddNode.c_str(), vservNode, Params().GetDefaultPort(), fNameLookup, 0))
- lservAddressesToAdd.push_back(vservNode);
- }
- // Attempt to connect to each IP for each addnode entry until at least one is successful per addnode entry
- // (keeping in mind that addnode entries can have many IPs if fNameLookup)
- {
- LOCK(cs_vNodes);
- BOOST_FOREACH(CNode* pnode, vNodes)
- for (std::list<std::vector<CService> >::iterator it = lservAddressesToAdd.begin(); it != lservAddressesToAdd.end(); it++)
- BOOST_FOREACH(const CService& addrNode, *(it))
- if (pnode->addr == addrNode)
- {
- it = lservAddressesToAdd.erase(it);
- it--;
- break;
- }
- }
- BOOST_FOREACH(std::vector<CService>& vserv, lservAddressesToAdd)
- {
- CSemaphoreGrant grant(*semOutbound);
- /* We want -addnode to work even for nodes that don't provide all
- * wanted services, so pass in nServices=NODE_NONE to CAddress. */
- OpenNetworkConnection(CAddress(vserv[i % vserv.size()], NODE_NONE), false, &grant);
- MilliSleep(500);
- }
MilliSleep(120000); // Retry every 2 minutes
}
}
@@ -2368,6 +2452,8 @@ CNode::CNode(SOCKET hSocketIn, const CAddress& addrIn, const std::string& addrNa
fSentAddr = false;
pfilter = new CBloomFilter();
timeLastMempoolReq = 0;
+ nLastBlockTime = 0;
+ nLastTXTime = 0;
nPingNonceSent = 0;
nPingUsecStart = 0;
nPingUsecTime = 0;
diff --git a/src/net.h b/src/net.h
index 2aaca4888f..aa9b2c11a3 100644
--- a/src/net.h
+++ b/src/net.h
@@ -80,12 +80,15 @@ static const unsigned int DEFAULT_MISBEHAVING_BANTIME = 60 * 60 * 24; // Defaul
unsigned int ReceiveFloodSize();
unsigned int SendBufferSize();
+typedef int NodeId;
+
void AddOneShot(const std::string& strDest);
void AddressCurrentlyConnected(const CService& addr);
CNode* FindNode(const CNetAddr& ip);
CNode* FindNode(const CSubNet& subNet);
CNode* FindNode(const std::string& addrName);
CNode* FindNode(const CService& ip);
+CNode* FindNode(const NodeId id); //TODO: Remove this
bool OpenNetworkConnection(const CAddress& addrConnect, bool fCountFailure, CSemaphoreGrant *grantOutbound = NULL, const char *strDest = NULL, bool fOneShot = false);
void MapPort(bool fUseUPnP);
unsigned short GetListenPort();
@@ -94,8 +97,6 @@ void StartNode(boost::thread_group& threadGroup, CScheduler& scheduler);
bool StopNode();
void SocketSendData(CNode *pnode);
-typedef int NodeId;
-
struct CombinerAll
{
typedef bool result_type;
@@ -419,6 +420,11 @@ public:
// Last time a "MEMPOOL" request was serviced.
std::atomic<int64_t> timeLastMempoolReq;
+
+ // Block and TXN accept times
+ std::atomic<int64_t> nLastBlockTime;
+ std::atomic<int64_t> nLastTXTime;
+
// Ping time measurement:
// The pong reply we're expecting, or 0 if no pong expected.
uint64_t nPingNonceSent;
@@ -818,4 +824,14 @@ public:
/** Return a timestamp in the future (in microseconds) for exponentially distributed events. */
int64_t PoissonNextSend(int64_t nNow, int average_interval_seconds);
+struct AddedNodeInfo
+{
+ std::string strAddedNode;
+ CService resolvedAddress;
+ bool fConnected;
+ bool fInbound;
+};
+
+std::vector<AddedNodeInfo> GetAddedNodeInfo();
+
#endif // BITCOIN_NET_H
diff --git a/src/netbase.cpp b/src/netbase.cpp
index 572ae70871..e2a516986c 100644
--- a/src/netbase.cpp
+++ b/src/netbase.cpp
@@ -621,10 +621,10 @@ bool ConnectSocketByName(CService &addr, SOCKET& hSocketRet, const char *pszDest
proxyType nameProxy;
GetNameProxy(nameProxy);
- CService addrResolved;
- if (Lookup(strDest.c_str(), addrResolved, port, fNameLookup && !HaveNameProxy())) {
- if (addrResolved.IsValid()) {
- addr = addrResolved;
+ std::vector<CService> addrResolved;
+ if (Lookup(strDest.c_str(), addrResolved, port, fNameLookup && !HaveNameProxy(), 256)) {
+ if (addrResolved.size() > 0) {
+ addr = addrResolved[GetRand(addrResolved.size())];
return ConnectSocket(addr, hSocketRet, nTimeout);
}
}
diff --git a/src/protocol.cpp b/src/protocol.cpp
index 422ef6f636..2f90fb764c 100644
--- a/src/protocol.cpp
+++ b/src/protocol.cpp
@@ -35,6 +35,10 @@ const char *FILTERCLEAR="filterclear";
const char *REJECT="reject";
const char *SENDHEADERS="sendheaders";
const char *FEEFILTER="feefilter";
+const char *SENDCMPCT="sendcmpct";
+const char *CMPCTBLOCK="cmpctblock";
+const char *GETBLOCKTXN="getblocktxn";
+const char *BLOCKTXN="blocktxn";
};
static const char* ppszTypeName[] =
@@ -42,7 +46,8 @@ static const char* ppszTypeName[] =
"ERROR", // Should never occur
NetMsgType::TX,
NetMsgType::BLOCK,
- "filtered block" // Should never occur
+ "filtered block", // Should never occur
+ "compact block" // Should never occur
};
/** All known message types. Keep this in the same order as the list of
@@ -70,7 +75,11 @@ const static std::string allNetMessageTypes[] = {
NetMsgType::FILTERCLEAR,
NetMsgType::REJECT,
NetMsgType::SENDHEADERS,
- NetMsgType::FEEFILTER
+ NetMsgType::FEEFILTER,
+ NetMsgType::SENDCMPCT,
+ NetMsgType::CMPCTBLOCK,
+ NetMsgType::GETBLOCKTXN,
+ NetMsgType::BLOCKTXN,
};
const static std::vector<std::string> allNetMessageTypesVec(allNetMessageTypes, allNetMessageTypes+ARRAYLEN(allNetMessageTypes));
diff --git a/src/protocol.h b/src/protocol.h
index ab0a581783..a72813e959 100644
--- a/src/protocol.h
+++ b/src/protocol.h
@@ -217,6 +217,32 @@ extern const char *SENDHEADERS;
* @since protocol version 70013 as described by BIP133
*/
extern const char *FEEFILTER;
+/**
+ * Contains a 1-byte bool and 8-byte LE version number.
+ * Indicates that a node is willing to provide blocks via "cmpctblock" messages.
+ * May indicate that a node prefers to receive new block announcements via a
+ * "cmpctblock" message rather than an "inv", depending on message contents.
+ * @since protocol version 70014 as described by BIP 152
+ */
+extern const char *SENDCMPCT;
+/**
+ * Contains a CBlockHeaderAndShortTxIDs object - providing a header and
+ * list of "short txids".
+ * @since protocol version 70014 as described by BIP 152
+ */
+extern const char *CMPCTBLOCK;
+/**
+ * Contains a BlockTransactionsRequest
+ * Peer should respond with "blocktxn" message.
+ * @since protocol version 70014 as described by BIP 152
+ */
+extern const char *GETBLOCKTXN;
+/**
+ * Contains a BlockTransactions.
+ * Sent in response to a "getblocktxn" message.
+ * @since protocol version 70014 as described by BIP 152
+ */
+extern const char *BLOCKTXN;
};
/* Get a vector of all valid message types (see above) */
@@ -315,9 +341,10 @@ public:
enum {
MSG_TX = 1,
MSG_BLOCK,
- // Nodes may always request a MSG_FILTERED_BLOCK in a getdata, however,
- // MSG_FILTERED_BLOCK should not appear in any invs except as a part of getdata.
+ // Nodes may always request a MSG_FILTERED_BLOCK/MSG_CMPCT_BLOCK in a getdata, however,
+ // MSG_FILTERED_BLOCK/MSG_CMPCT_BLOCK should not appear in any invs except as a part of getdata.
MSG_FILTERED_BLOCK,
+ MSG_CMPCT_BLOCK,
};
#endif // BITCOIN_PROTOCOL_H
diff --git a/src/qt/bitcoin.cpp b/src/qt/bitcoin.cpp
index 6218ab6ab0..64b5c83d72 100644
--- a/src/qt/bitcoin.cpp
+++ b/src/qt/bitcoin.cpp
@@ -533,6 +533,9 @@ int main(int argc, char *argv[])
// Generate high-dpi pixmaps
QApplication::setAttribute(Qt::AA_UseHighDpiPixmaps);
#endif
+#if QT_VERSION >= 0x050600
+ QGuiApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
+#endif
#ifdef Q_OS_MAC
QApplication::setAttribute(Qt::AA_DontShowIconsInMenus);
#endif
diff --git a/src/qt/bitcoin_locale.qrc b/src/qt/bitcoin_locale.qrc
index a8a0253b07..1acda7f28c 100644
--- a/src/qt/bitcoin_locale.qrc
+++ b/src/qt/bitcoin_locale.qrc
@@ -1,5 +1,6 @@
<!DOCTYPE RCC><RCC version="1.0">
<qresource prefix="/translations">
+ <file alias="af">locale/bitcoin_af.qm</file>
<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>
@@ -19,7 +20,10 @@
<file alias="en_GB">locale/bitcoin_en_GB.qm</file>
<file alias="en">locale/bitcoin_en.qm</file>
<file alias="eo">locale/bitcoin_eo.qm</file>
+ <file alias="es_419">locale/bitcoin_es_419.qm</file>
+ <file alias="es_AR">locale/bitcoin_es_AR.qm</file>
<file alias="es_CL">locale/bitcoin_es_CL.qm</file>
+ <file alias="es_CO">locale/bitcoin_es_CO.qm</file>
<file alias="es_DO">locale/bitcoin_es_DO.qm</file>
<file alias="es_ES">locale/bitcoin_es_ES.qm</file>
<file alias="es_MX">locale/bitcoin_es_MX.qm</file>
@@ -30,6 +34,7 @@
<file alias="eu_ES">locale/bitcoin_eu_ES.qm</file>
<file alias="fa_IR">locale/bitcoin_fa_IR.qm</file>
<file alias="fa">locale/bitcoin_fa.qm</file>
+ <file alias="fil">locale/bitcoin_fil.qm</file>
<file alias="fi">locale/bitcoin_fi.qm</file>
<file alias="fr_CA">locale/bitcoin_fr_CA.qm</file>
<file alias="fr_FR">locale/bitcoin_fr_FR.qm</file>
@@ -40,6 +45,7 @@
<file alias="hr">locale/bitcoin_hr.qm</file>
<file alias="hu">locale/bitcoin_hu.qm</file>
<file alias="id_ID">locale/bitcoin_id_ID.qm</file>
+ <file alias="it_IT">locale/bitcoin_it_IT.qm</file>
<file alias="it">locale/bitcoin_it.qm</file>
<file alias="ja">locale/bitcoin_ja.qm</file>
<file alias="ka">locale/bitcoin_ka.qm</file>
@@ -59,22 +65,27 @@
<file alias="pt_BR">locale/bitcoin_pt_BR.qm</file>
<file alias="pt_PT">locale/bitcoin_pt_PT.qm</file>
<file alias="ro_RO">locale/bitcoin_ro_RO.qm</file>
+ <file alias="ro">locale/bitcoin_ro.qm</file>
<file alias="ru_RU">locale/bitcoin_ru_RU.qm</file>
<file alias="ru">locale/bitcoin_ru.qm</file>
<file alias="sk">locale/bitcoin_sk.qm</file>
<file alias="sl_SI">locale/bitcoin_sl_SI.qm</file>
<file alias="sq">locale/bitcoin_sq.qm</file>
+ <file alias="sr@latin">locale/bitcoin_sr@latin.qm</file>
<file alias="sr">locale/bitcoin_sr.qm</file>
<file alias="sv">locale/bitcoin_sv.qm</file>
+ <file alias="ta">locale/bitcoin_ta.qm</file>
<file alias="th_TH">locale/bitcoin_th_TH.qm</file>
<file alias="tr_TR">locale/bitcoin_tr_TR.qm</file>
<file alias="tr">locale/bitcoin_tr.qm</file>
<file alias="uk">locale/bitcoin_uk.qm</file>
<file alias="ur_PK">locale/bitcoin_ur_PK.qm</file>
<file alias="uz@Cyrl">locale/bitcoin_uz@Cyrl.qm</file>
+ <file alias="uz@Latn">locale/bitcoin_uz@Latn.qm</file>
<file alias="vi">locale/bitcoin_vi.qm</file>
<file alias="vi_VN">locale/bitcoin_vi_VN.qm</file>
<file alias="zh_CN">locale/bitcoin_zh_CN.qm</file>
+ <file alias="zh_HK">locale/bitcoin_zh_HK.qm</file>
<file alias="zh">locale/bitcoin_zh.qm</file>
<file alias="zh_TW">locale/bitcoin_zh_TW.qm</file>
</qresource>
diff --git a/src/qt/bitcoinstrings.cpp b/src/qt/bitcoinstrings.cpp
index 9e53f19591..83901732ac 100644
--- a/src/qt/bitcoinstrings.cpp
+++ b/src/qt/bitcoinstrings.cpp
@@ -60,6 +60,8 @@ QT_TRANSLATE_NOOP("bitcoin-core", ""
QT_TRANSLATE_NOOP("bitcoin-core", ""
"Do not keep transactions in the mempool longer than <n> hours (default: %u)"),
QT_TRANSLATE_NOOP("bitcoin-core", ""
+"Error loading %s: You can't enable HD on a already existing non-HD wallet"),
+QT_TRANSLATE_NOOP("bitcoin-core", ""
"Error reading %s! All keys read correctly, but transaction data or address "
"book entries might be missing or incorrect."),
QT_TRANSLATE_NOOP("bitcoin-core", ""
@@ -114,6 +116,9 @@ QT_TRANSLATE_NOOP("bitcoin-core", ""
"Please check that your computer's date and time are correct! If your clock "
"is wrong, %s will not work properly."),
QT_TRANSLATE_NOOP("bitcoin-core", ""
+"Please contribute if you find %s useful. Visit %s for further information "
+"about the software."),
+QT_TRANSLATE_NOOP("bitcoin-core", ""
"Prune configured below the minimum of %d MiB. Please use a higher number."),
QT_TRANSLATE_NOOP("bitcoin-core", ""
"Prune: last wallet synchronisation goes beyond pruned data. You need to -"
@@ -168,6 +173,9 @@ QT_TRANSLATE_NOOP("bitcoin-core", ""
QT_TRANSLATE_NOOP("bitcoin-core", ""
"Use UPnP to map the listening port (default: 1 when listening and no -proxy)"),
QT_TRANSLATE_NOOP("bitcoin-core", ""
+"Use hierarchical deterministic key generation (HD) after BIP32. Only has "
+"effect during wallet creation/first start"),
+QT_TRANSLATE_NOOP("bitcoin-core", ""
"Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: "
"%s)"),
QT_TRANSLATE_NOOP("bitcoin-core", ""
@@ -243,6 +251,7 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Error initializing wallet database environmen
QT_TRANSLATE_NOOP("bitcoin-core", "Error loading %s"),
QT_TRANSLATE_NOOP("bitcoin-core", "Error loading %s: Wallet corrupted"),
QT_TRANSLATE_NOOP("bitcoin-core", "Error loading %s: Wallet requires newer version of %s"),
+QT_TRANSLATE_NOOP("bitcoin-core", "Error loading %s: You can't disable HD on a already existing HD wallet"),
QT_TRANSLATE_NOOP("bitcoin-core", "Error loading block database"),
QT_TRANSLATE_NOOP("bitcoin-core", "Error opening block database"),
QT_TRANSLATE_NOOP("bitcoin-core", "Error reading from database, shutting down."),
@@ -317,6 +326,7 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Specify pid file (default: %s)"),
QT_TRANSLATE_NOOP("bitcoin-core", "Specify wallet file (within data directory)"),
QT_TRANSLATE_NOOP("bitcoin-core", "Specify your own public address"),
QT_TRANSLATE_NOOP("bitcoin-core", "Spend unconfirmed change when sending transactions (default: %u)"),
+QT_TRANSLATE_NOOP("bitcoin-core", "The source code is available from %s."),
QT_TRANSLATE_NOOP("bitcoin-core", "The transaction amount is too small to pay the fee"),
QT_TRANSLATE_NOOP("bitcoin-core", "This is experimental software."),
QT_TRANSLATE_NOOP("bitcoin-core", "Threshold for disconnecting misbehaving peers (default: %u)"),
diff --git a/src/qt/locale/bitcoin_af.ts b/src/qt/locale/bitcoin_af.ts
new file mode 100644
index 0000000000..492c7bccd4
--- /dev/null
+++ b/src/qt/locale/bitcoin_af.ts
@@ -0,0 +1,509 @@
+<TS language="af" version="2.1">
+<context>
+ <name>AddressBookPage</name>
+ <message>
+ <source>Right-click to edit address or label</source>
+ <translation>Regs-kliek om die adres of etiket te verander</translation>
+ </message>
+ <message>
+ <source>Create a new address</source>
+ <translation>Skep 'n nuwe adres</translation>
+ </message>
+ <message>
+ <source>&amp;New</source>
+ <translation>&amp;Nuut</translation>
+ </message>
+ <message>
+ <source>Copy the currently selected address to the system clipboard</source>
+ <translation>Dupliseer die geselekteerde adres na die sisteem se geheuebord</translation>
+ </message>
+ <message>
+ <source>&amp;Copy</source>
+ <translation>&amp;Dupliseer</translation>
+ </message>
+ <message>
+ <source>&amp;Copy Address</source>
+ <translation>&amp;Dupliseer Adres</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>
+ <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>
+ <message>
+ <source>&amp;Export</source>
+ <translation>&amp;Voer uit</translation>
+ </message>
+ <message>
+ <source>&amp;Delete</source>
+ <translation>&amp;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>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>&amp;Edit</source>
+ <translation>&amp;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>Address</source>
+ <translation>Adres</translation>
+ </message>
+ <message>
+ <source>(no label)</source>
+ <translation>(geen etiket)</translation>
+ </message>
+</context>
+<context>
+ <name>AskPassphraseDialog</name>
+ <message>
+ <source>Passphrase Dialog</source>
+ <translation>Wagwoord Dialoog</translation>
+ </message>
+ <message>
+ <source>Enter passphrase</source>
+ <translation>Tik u wagwoord in</translation>
+ </message>
+ <message>
+ <source>New passphrase</source>
+ <translation>Nuwe wagwoord</translation>
+ </message>
+ <message>
+ <source>Repeat new passphrase</source>
+ <translation>Herhaal nuwe wagwoord</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>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 &lt;b&gt;LOSE ALL OF YOUR BITCOINS&lt;/b&gt;!</source>
+ <translation>Waarskuwing: Indien u die beursie kodifiseer en u vergeet u wagwoord &lt;b&gt;VERLOOR U AL U BITCOINS&lt;/b&gt;!</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>Bitcoin Core 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>Bitcoin Kern gaan nou toemaak om die kodifikasie af te handel. Onthou dat die kodifikasie van u beursie nie altyd u munte kan beskerm teen diefstal deur kwaadwillige sagteware op u rekenaar nie.</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>Warning: The Caps Lock key is on!</source>
+ <translation>WAARSKUWING: Outomatiese Kapitalisering is aktief op u sleutelbord!</translation>
+ </message>
+ <message>
+ <source>Wallet encrypted</source>
+ <translation>Beursie gekodifiseer</translation>
+ </message>
+ <message>
+ <source>Enter the new passphrase to the wallet.&lt;br/&gt;Please use a passphrase of &lt;b&gt;ten or more random characters&lt;/b&gt;, or &lt;b&gt;eight or more words&lt;/b&gt;.</source>
+ <translation>Tik die nuwe wagwoord vir u beursie.&lt;br/&gt;Gerbuik asseblief 'n wagwoord met &lt;b&gt;tien of meer lukrake karakters&lt;/b&gt;, of &lt;b&gt;agt of meer woorde&lt;/b&gt;.</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>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>
+ </context>
+<context>
+ <name>BanTableModel</name>
+ <message>
+ <source>Banned Until</source>
+ <translation>Verban tot</translation>
+ </message>
+</context>
+<context>
+ <name>BitcoinGUI</name>
+ <message>
+ <source>Synchronizing with network...</source>
+ <translation>Netwerk-sinkronisasie...</translation>
+ </message>
+ <message>
+ <source>&amp;Overview</source>
+ <translation>&amp;Oorsig</translation>
+ </message>
+ <message>
+ <source>Node</source>
+ <translation>Node</translation>
+ </message>
+ <message>
+ <source>Show general overview of wallet</source>
+ <translation>Vertoon 'n algemene oorsig van die beursie</translation>
+ </message>
+ <message>
+ <source>&amp;Transactions</source>
+ <translation>&amp;Transaksies</translation>
+ </message>
+ <message>
+ <source>Quit application</source>
+ <translation>Stop en verlaat die applikasie</translation>
+ </message>
+ <message>
+ <source>&amp;Options...</source>
+ <translation>&amp;Opsies</translation>
+ </message>
+ <message>
+ <source>&amp;Encrypt Wallet...</source>
+ <translation>&amp;Kodifiseer Beursie</translation>
+ </message>
+ <message>
+ <source>&amp;Backup Wallet...</source>
+ <translation>&amp;Rugsteun-kopie van Beursie</translation>
+ </message>
+ <message>
+ <source>&amp;Change Passphrase...</source>
+ <translation>&amp;Verander Wagwoord</translation>
+ </message>
+ <message>
+ <source>&amp;Sending addresses...</source>
+ <translation>&amp;Versending adresse...</translation>
+ </message>
+ <message>
+ <source>&amp;Receiving addresses...</source>
+ <translation>&amp;Ontvanger adresse</translation>
+ </message>
+ <message>
+ <source>Open &amp;URI...</source>
+ <translation>Oop &amp; URI...</translation>
+ </message>
+ <message>
+ <source>Bitcoin Core client</source>
+ <translation>Bitcoin Kern klient</translation>
+ </message>
+ <message>
+ <source>Importing blocks from disk...</source>
+ <translation>Besig om blokke vanaf die hardeskyf in te voer...</translation>
+ </message>
+ <message>
+ <source>Reindexing blocks on disk...</source>
+ <translation>Besig met herindeksering van blokke op hardeskyf...</translation>
+ </message>
+ <message>
+ <source>Send coins to a Bitcoin address</source>
+ <translation>Stuur munte na 'n Bitcoin adres</translation>
+ </message>
+ <message>
+ <source>Backup wallet to another location</source>
+ <translation>Maak 'n rugsteun-kopiรฉ van beursie na 'n ander stoorplek</translation>
+ </message>
+ <message>
+ <source>Change the passphrase used for wallet encryption</source>
+ <translation>Verander die wagwoord wat ek vir kodifikasie van my beursie gebruik</translation>
+ </message>
+ <message>
+ <source>Bitcoin</source>
+ <translation>Bitcoin</translation>
+ </message>
+ <message>
+ <source>Wallet</source>
+ <translation>Beursie</translation>
+ </message>
+ <message>
+ <source>&amp;Send</source>
+ <translation>&amp;Stuur</translation>
+ </message>
+ <message>
+ <source>&amp;Receive</source>
+ <translation>&amp;Ontvang</translation>
+ </message>
+ <message>
+ <source>Show information about Bitcoin Core</source>
+ <translation>Vertoon inligting oor Bitcoin Kern</translation>
+ </message>
+ <message>
+ <source>Show or hide the main Window</source>
+ <translation>Wys of versteek die hoofbladsy</translation>
+ </message>
+ <message>
+ <source>Encrypt the private keys that belong to your wallet</source>
+ <translation>Kodifiseer die private sleutes wat aan jou beursie gekoppel is.</translation>
+ </message>
+ <message>
+ <source>Sign messages with your Bitcoin addresses to prove you own them</source>
+ <translation>Onderteken boodskappe met u Bitcoin adresse om u eienaarskap te bewys</translation>
+ </message>
+ <message>
+ <source>Verify messages to ensure they were signed with specified Bitcoin addresses</source>
+ <translation>Verifieรซr boodskappe om seker te maak dat dit met die gespesifiseerde Bitcoin adresse</translation>
+ </message>
+ <message>
+ <source>&amp;Help</source>
+ <translation>&amp;Help</translation>
+ </message>
+ <message>
+ <source>Bitcoin Core</source>
+ <translation>Bitcoin Kern</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>
+ <message>
+ <source>&amp;About Bitcoin Core</source>
+ <translation>&amp;Omtrent Bitcoin Kern</translation>
+ </message>
+ <message>
+ <source>Modify configuration options for Bitcoin Core</source>
+ <translation>Verander konfigurasie-opsies vir Bitcoin Kern</translation>
+ </message>
+ <message>
+ <source>Show the list of used sending addresses and labels</source>
+ <translation>Vertoon die lys van gebruikte versendingsadresse en etikette</translation>
+ </message>
+ <message>
+ <source>Show the list of used receiving addresses and labels</source>
+ <translation>Vertoon die lys van gebruikte ontvangers-adresse en etikette</translation>
+ </message>
+ <message>
+ <source>Open a bitcoin: URI or payment request</source>
+ <translation>Skep 'n bitcoin: URI of betalingsversoek</translation>
+ </message>
+ </context>
+<context>
+ <name>ClientModel</name>
+ </context>
+<context>
+ <name>CoinControlDialog</name>
+ <message>
+ <source>(no label)</source>
+ <translation>(geen etiket)</translation>
+ </message>
+ </context>
+<context>
+ <name>EditAddressDialog</name>
+ </context>
+<context>
+ <name>FreespaceChecker</name>
+ </context>
+<context>
+ <name>HelpMessageDialog</name>
+ <message>
+ <source>Bitcoin Core</source>
+ <translation>Bitcoin Kern</translation>
+ </message>
+ <message>
+ <source>Reset all settings changes made over the GUI</source>
+ <translation>Herstel al my veranderinge aan die stellings terug na die verstek-opsies</translation>
+ </message>
+</context>
+<context>
+ <name>Intro</name>
+ <message>
+ <source>Bitcoin Core</source>
+ <translation>Bitcoin Kern</translation>
+ </message>
+ </context>
+<context>
+ <name>OpenURIDialog</name>
+ </context>
+<context>
+ <name>OptionsDialog</name>
+ </context>
+<context>
+ <name>OverviewPage</name>
+ </context>
+<context>
+ <name>PaymentServer</name>
+ </context>
+<context>
+ <name>PeerTableModel</name>
+ </context>
+<context>
+ <name>QObject</name>
+ </context>
+<context>
+ <name>QRImageWidget</name>
+ </context>
+<context>
+ <name>RPCConsole</name>
+ </context>
+<context>
+ <name>ReceiveCoinsDialog</name>
+ </context>
+<context>
+ <name>ReceiveRequestDialog</name>
+ <message>
+ <source>Address</source>
+ <translation>Adres</translation>
+ </message>
+ </context>
+<context>
+ <name>RecentRequestsTableModel</name>
+ <message>
+ <source>(no label)</source>
+ <translation>(geen etiket)</translation>
+ </message>
+ </context>
+<context>
+ <name>SendCoinsDialog</name>
+ <message>
+ <source>(no label)</source>
+ <translation>(geen etiket)</translation>
+ </message>
+ </context>
+<context>
+ <name>SendCoinsEntry</name>
+ </context>
+<context>
+ <name>ShutdownWindow</name>
+ </context>
+<context>
+ <name>SignVerifyMessageDialog</name>
+ </context>
+<context>
+ <name>SplashScreen</name>
+ <message>
+ <source>Bitcoin Core</source>
+ <translation>Bitcoin Kern</translation>
+ </message>
+ </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>
+ <message>
+ <source>Exporting Failed</source>
+ <translation>Uitvoer was onsuksesvol</translation>
+ </message>
+ <message>
+ <source>Comma separated file (*.csv)</source>
+ <translation>Comma separated file (*.csv)</translation>
+ </message>
+ <message>
+ <source>Address</source>
+ <translation>Adres</translation>
+ </message>
+ </context>
+<context>
+ <name>UnitDisplayStatusBarControl</name>
+ </context>
+<context>
+ <name>WalletFrame</name>
+ </context>
+<context>
+ <name>WalletModel</name>
+ </context>
+<context>
+ <name>WalletView</name>
+ <message>
+ <source>&amp;Export</source>
+ <translation>&amp;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>WARNING: check your network connection, %d blocks received in the last %d hours (%d expected)</source>
+ <translation>WAARSKUWING: toets die status van u netwerk, %d blokke ontvang in die laaste %d ure (%d verwag)</translation>
+ </message>
+ <message>
+ <source>Do not keep transactions in the mempool longer than &lt;n&gt; hours (default: %u)</source>
+ <translation>Moenie transaksies vir langer as &lt;n&gt; ure in die geheuepoel hou nie (verstek: %u)</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 d77aa77f8e..12ac21eb80 100644
--- a/src/qt/locale/bitcoin_af_ZA.ts
+++ b/src/qt/locale/bitcoin_af_ZA.ts
@@ -32,16 +32,20 @@
<context>
<name>AskPassphraseDialog</name>
<message>
+ <source>Passphrase Dialog</source>
+ <translation>Wagfrase Dialoog</translation>
+ </message>
+ <message>
<source>Enter passphrase</source>
- <translation>Tik Wagwoord in</translation>
+ <translation>Tik wagfrase in</translation>
</message>
<message>
<source>New passphrase</source>
- <translation>Nuwe wagwoord</translation>
+ <translation>Nuwe wagfrase</translation>
</message>
<message>
<source>Repeat new passphrase</source>
- <translation>Herhaal nuwe wagwoord</translation>
+ <translation>Herhaal nuwe wagfrase</translation>
</message>
<message>
<source>Encrypt wallet</source>
@@ -65,7 +69,7 @@
</message>
<message>
<source>Change passphrase</source>
- <translation>Verander wagwoord</translation>
+ <translation>Verander wagfrase</translation>
</message>
<message>
<source>Confirm wallet encryption</source>
@@ -76,6 +80,10 @@
<translation>Die beursie is nou bewaak</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>Wallet encryption failed</source>
<translation>Die beursie kon nie bewaak word nie</translation>
</message>
@@ -85,7 +93,7 @@
</message>
<message>
<source>The supplied passphrases do not match.</source>
- <translation>Die wagwoord stem nie ooreen nie</translation>
+ <translation>Die wagfrase stem nie ooreen nie</translation>
</message>
<message>
<source>Wallet unlock failed</source>
@@ -93,13 +101,17 @@
</message>
<message>
<source>The passphrase entered for the wallet decryption was incorrect.</source>
- <translation>Die wagwoord wat ingetik was om die beursie oop te sluit, was verkeerd.</translation>
+ <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>
- </context>
+ <message>
+ <source>Wallet passphrase was successfully changed.</source>
+ <translation>Die beursie se wagfrase verandering was suksesvol.</translation>
+ </message>
+</context>
<context>
<name>BanTableModel</name>
</context>
diff --git a/src/qt/locale/bitcoin_ar.ts b/src/qt/locale/bitcoin_ar.ts
index 88ce05bbd5..1e74564ed3 100644
--- a/src/qt/locale/bitcoin_ar.ts
+++ b/src/qt/locale/bitcoin_ar.ts
@@ -222,7 +222,15 @@
</context>
<context>
<name>BanTableModel</name>
- </context>
+ <message>
+ <source>IP/Netmask</source>
+ <translation>ุนู†ูˆุงู† ุงู„ุจุฑูˆุชูˆูƒูˆู„/ู‚ู†ุงุน</translation>
+ </message>
+ <message>
+ <source>Banned Until</source>
+ <translation>ู…ุญุธูˆุฑ ุญุชู‰</translation>
+ </message>
+</context>
<context>
<name>BitcoinGUI</name>
<message>
@@ -326,6 +334,10 @@
<translation>&amp;ู†ุงูุฐุฉ ุงู„ู…ุนุงู„ุฌุฉ</translation>
</message>
<message>
+ <source>Open debugging and diagnostic console</source>
+ <translation>ุฅูุชุญ ูˆุญุฏุฉ ุงู„ุชุตุญูŠุญ ูˆ ุงู„ุชุดุฎูŠุต</translation>
+ </message>
+ <message>
<source>&amp;Verify message...</source>
<translation>&amp;ุงู„ุชุญู‚ู‚ ู…ู† ุงู„ุฑุณุงู„ุฉ...</translation>
</message>
@@ -362,6 +374,14 @@
<translation>ุชุดููŠุฑ ุงู„ู…ูุชุงุญ ุงู„ุฎุงุต ุจู…ุญูุธุชูƒ</translation>
</message>
<message>
+ <source>Sign messages with your Bitcoin addresses to prove you own them</source>
+ <translation>ูˆู‚ูŽุน ุงู„ุฑุณุงุฆู„ ุจูˆุงุณุทุฉ ุงู„: Bitcoin ุงู„ุฎุงุต ุจูƒ ู„ุฅุซุจุงุช ุงู…ุชู„ุงูƒูƒ ู„ู‡ู…</translation>
+ </message>
+ <message>
+ <source>Verify messages to ensure they were signed with specified Bitcoin addresses</source>
+ <translation>ุชุญู‚ู‚ ู…ู† ุงู„ุฑุณุงุฆู„ ู„ู„ุชุฃูƒุฏ ู…ู† ุฃู†ูŽู‡ุง ูˆูู‚ุนุช ุจุฑุณุงุฆู„ Bitcoin ู…ุญุฏูŽุฏุฉ</translation>
+ </message>
+ <message>
<source>&amp;File</source>
<translation>&amp;ู…ู„ู</translation>
</message>
@@ -382,14 +402,58 @@
<translation>ุฌูˆู‡ุฑ ุงู„ุจูŠุช ูƒูˆูŠู†</translation>
</message>
<message>
+ <source>Request payments (generates QR codes and bitcoin: URIs)</source>
+ <translation>ุฃุทู„ุจ ุฏูุนุงุช (ูŠูˆู„ุฏ ูƒูˆุฏุงุช ุงู„ุฑู…ุฒ ุงู„ู…ุฑุจุน ูˆุจูŠุช ูƒูˆูŠู†: ุงู„ุนู†ุงูˆูŠู† ุงู„ู…ุนุทุงุฉ)</translation>
+ </message>
+ <message>
<source>&amp;About Bitcoin Core</source>
<translation>ุญูˆู„ bitcoin core</translation>
</message>
<message>
+ <source>Modify configuration options for Bitcoin Core</source>
+ <translation>ุชุบูŠูŠุฑ ุฎูŠุงุฑุงุช ุงู„ุฅุนุฏุงุฏ ู„ุฃุณุงุณ Bitcoin</translation>
+ </message>
+ <message>
+ <source>Show the list of used sending addresses and labels</source>
+ <translation>ุนุฑุถ ู‚ุงุฆู…ุฉ ุนู†ุงูˆูŠู† ุงู„ุฅุฑุณุงู„ ุงู„ู…ุณุชุฎุฏู…ุฉ ูˆุงู„ู…ู„ุตู‚ุงุช</translation>
+ </message>
+ <message>
+ <source>Show the list of used receiving addresses and labels</source>
+ <translation>ุนุฑุถ ู‚ุงุฆู…ุฉ ุนู†ุงูˆูŠู† ุงู„ุฅุณุชู‚ุจุงู„ ุงู„ู…ุณุชุฎุฏู…ุฉ ูˆุงู„ู…ู„ุตู‚ุงุช</translation>
+ </message>
+ <message>
+ <source>Open a bitcoin: URI or payment request</source>
+ <translation>ูุชุญ URI : Bitcoin ุฃูˆ ุทู„ุจ ุฏูุน</translation>
+ </message>
+ <message>
+ <source>&amp;Command-line options</source>
+ <translation>&amp;ุฎูŠุงุฑุงุช ุณุทุฑ ุงู„ุฃูˆุงู…ุฑ</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>
</message>
<message>
+ <source>Last received block was generated %1 ago.</source>
+ <translation>ุชู… ุชูˆู„ูŠุฏ ุงู„ูƒุชู„ุฉ ุงู„ู…ุณุชู‚ุจู„ุฉ ุงู„ุฃุฎูŠุฑุฉ ู…ู†ุฐ %1.</translation>
+ </message>
+ <message>
+ <source>Transactions after this will not yet be visible.</source>
+ <translation>ุงู„ู…ุนุงู…ู„ุงุช ุจุนุฏ ุฐู„ูƒ ู„ู† ุชูƒูˆู† ู…ุฑูŠุฆุฉ ุจุนุฏ.</translation>
+ </message>
+ <message>
<source>Error</source>
<translation>ุฎุทุฃ</translation>
</message>
@@ -464,6 +528,14 @@
<translation>ุงู„ู…ุจู„ุบ</translation>
</message>
<message>
+ <source>Received with label</source>
+ <translation>ู…ุณุชู‚ุจู„ ู…ุน ู…ู„ุตู‚</translation>
+ </message>
+ <message>
+ <source>Received with address</source>
+ <translation>ู…ุณุชู‚ุจู„ ู…ุน ุนู†ูˆุงู†</translation>
+ </message>
+ <message>
<source>Date</source>
<translation>ุงู„ุชุงุฑูŠุฎ</translation>
</message>
@@ -532,6 +604,14 @@
<translation>ู…ุชูˆุณุท-ู…ุฑุชูุน</translation>
</message>
<message>
+ <source>medium</source>
+ <translation>ู…ุชูˆุณุท</translation>
+ </message>
+ <message>
+ <source>low-medium</source>
+ <translation>ู…ุชูˆุณุท-ู…ู†ุฎูุถ</translation>
+ </message>
+ <message>
<source>low</source>
<translation>ู…ู†ุฎูุถ</translation>
</message>
@@ -548,6 +628,10 @@
<translation>ู„ุง ุดูŠุก</translation>
</message>
<message>
+ <source>This label turns red if the transaction size is greater than 1000 bytes.</source>
+ <translation>ู‡ุฐุง ุงู„ู…ู„ุตู‚ ูŠุตุจุญ ุฃุฎู…ุฑุง ุฅุฐุง ูƒุงู† ุญุฌู… ุงู„ู…ุนุงู…ู„ุฉ ุฃูƒุจุฑ ู…ู† 1000 ุจุงูŠุช.</translation>
+ </message>
+ <message>
<source>yes</source>
<translation>ู†ุนู…</translation>
</message>
@@ -556,6 +640,18 @@
<translation>ู„ุง</translation>
</message>
<message>
+ <source>This means a fee of at least %1 per kB is required.</source>
+ <translation>ู‡ุฐุง ูŠุนู†ูŠ ุฃู† ู…ู† ุงู„ู…ุทู„ูˆุจ ุฃู† ูŠูƒูˆู† ุงู„ุฑุณู… ุฃู„ู‰ ุงู„ุฃู‚ู„ %1 ู„ูƒู„ ูƒูŠู„ูˆุจุงูŠุช.</translation>
+ </message>
+ <message>
+ <source>Can vary +/- 1 byte per input.</source>
+ <translation>ูŠู…ูƒู† ุฃู† ูŠุชูุงูˆุช ุจู€ 1 ุจุงูŠุช ู„ูƒู„ ู…ุณุงู‡ู…ุฉ.</translation>
+ </message>
+ <message>
+ <source>Transactions with higher priority are more likely to get included into a block.</source>
+ <translation>ุงู„ู…ุนุงู…ู„ุงุช ุงู„ุชูŠ ู„ุฏูŠู‡ุง ุฃูˆู„ูˆูŠุฉ ุฃุนู„ู‰ ุนู„ู‰ ุงู„ุฃุฑุฌุญ ุณูŠุชู… ุฅู†ุถู…ุงู…ู‡ุง ููŠ ุงู„ูƒุชู„ุฉ.</translation>
+ </message>
+ <message>
<source>(no label)</source>
<translation>(ู„ุง ูˆุตู)</translation>
</message>
@@ -599,6 +695,10 @@
<translation>ู‡ุฏุง ุงู„ุนู†ูˆุงู† "%1" ู…ูˆุฌูˆุฏ ู…ุณุจู‚ุง ููŠ ุฏูุชุฑ ุงู„ุนู†ุงูˆูŠู†</translation>
</message>
<message>
+ <source>The entered address "%1" is not a valid Bitcoin address.</source>
+ <translation>ุงู„ุนู†ูˆุงู† ุงู„ู…ุฏุฎู„ "%1" ู„ูŠุณ ุนู†ูˆุงู† ุจูŠุช ูƒูˆูŠู† ุตุญูŠุญ.</translation>
+ </message>
+ <message>
<source>Could not unlock wallet.</source>
<translation> ูŠู…ูƒู† ูุชุญ ุงู„ู…ุญูุธุฉ.</translation>
</message>
@@ -618,6 +718,14 @@
<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>
+ <message>
<source>Cannot create data directory here.</source>
<translation>ู„ุง ูŠู…ูƒู† ุงู†ุดุงุก ุฏู„ูŠู„ ุจูŠุงู†ุงุช ู‡ู†ุง .</translation>
</message>
@@ -637,10 +745,38 @@
<translation>ุนู† ุฌูˆู‡ุฑ ุงู„ุจูŠุช ูƒูˆูŠู†</translation>
</message>
<message>
+ <source>Command-line options</source>
+ <translation>ุฎูŠุงุฑุงุช ุณุทุฑ ุงู„ุฃูˆุงู…ุฑ</translation>
+ </message>
+ <message>
<source>Usage:</source>
<translation>ุงู„ู…ุณุชุฎุฏู…</translation>
</message>
- </context>
+ <message>
+ <source>command-line options</source>
+ <translation>ุฎูŠุงุฑุงุช ุณุทุฑ ุงู„ุฃูˆุงู…ุฑ</translation>
+ </message>
+ <message>
+ <source>UI Options:</source>
+ <translation>ุฎูŠุงุฑุงุช ูˆุงุฌู‡ุฉ ุงู„ู…ุณุชุฎุฏู…</translation>
+ </message>
+ <message>
+ <source>Choose data directory on startup (default: %u)</source>
+ <translation>ุงุฎุชุฑ ุฏู„ูŠู„ ุงู„ุจูŠุงู†ุงุช ุนู†ุฏ ุจุฏุก ุงู„ุชุดุบูŠุฑ (ุงูุชุฑุงุถูŠ: %u)</translation>
+ </message>
+ <message>
+ <source>Set SSL root certificates for payment request (default: -system-)</source>
+ <translation>ุฃุถุน ุดู‡ุงุฏุฉ ุจุฑูˆุชูˆูƒูˆู„ ุงู„ุดุจู‚ุฉ ุงู„ุฃู…ู†ูŠุฉ ู„ุทู„ุจ ุงู„ู…ุฏููˆุน (ุงูุชุฑุงุถูŠ: -ู†ุธุงู…-)</translation>
+ </message>
+ <message>
+ <source>Show splash screen on startup (default: %u)</source>
+ <translation>ุฃุธู‡ุฑ ุดุงุดุฉ ุงู„ุจุฏุงูŠุฉ ุนู†ุฏ ุจุฏุก ุงู„ุชุดุบูŠู„ (ุงูุชุฑุงุถูŠ: %u)</translation>
+ </message>
+ <message>
+ <source>Reset all settings changes made over the GUI</source>
+ <translation>ุฅุนุงุฏุฉ ุชุนูŠูŠู† ูƒู„ ุงู„ุฅุนุฏุงุฏุงุช ุชู… ุชุบูŠูŠุฑู‡ุง ู…ู† ุฎู„ุงู„ ุงู„ูˆุงุฌู‡ุฉ ุงู„ุฑุณูˆู…ูŠุฉ</translation>
+ </message>
+</context>
<context>
<name>Intro</name>
<message>
@@ -1794,14 +1930,26 @@
<translation>ุนู†ูˆุงู† ุงู„ุจุฑูˆูƒุณูŠ ุบูŠุฑ ุตุญูŠุญ : '%s'</translation>
</message>
<message>
+ <source>Make the wallet broadcast transactions</source>
+ <translation>ุฅู†ุชุงุฌ ู…ุนุงู…ู„ุงุช ุจุซ ุงู„ู…ุญูุธุฉ</translation>
+ </message>
+ <message>
<source>Insufficient funds</source>
<translation>ุงู…ูˆุงู„ ุบูŠุฑ ูƒุงููŠุฉ</translation>
</message>
<message>
+ <source>Loading block index...</source>
+ <translation>ุชุญู…ูŠู„ ู…ุคุดุฑ ุงู„ูƒุชู„ุฉ</translation>
+ </message>
+ <message>
<source>Loading wallet...</source>
<translation>ุชุญู…ูŠู„ ุงู„ู…ุญูุธู‡</translation>
</message>
<message>
+ <source>Cannot downgrade wallet</source>
+ <translation>ู„ุง ูŠู…ูƒู† ุชุฎููŠุถ ู‚ูŠู…ุฉ ุงู„ู…ุญูุธุฉ</translation>
+ </message>
+ <message>
<source>Cannot write default address</source>
<translation>ู„ุงูŠู…ูƒู† ูƒุชุงุจุฉ ุงู„ุนู†ูˆุงู† ุงู„ุงูุชุฑุงุถูŠ</translation>
</message>
diff --git a/src/qt/locale/bitcoin_bg.ts b/src/qt/locale/bitcoin_bg.ts
index ecd10e5461..54bf8136a6 100644
--- a/src/qt/locale/bitcoin_bg.ts
+++ b/src/qt/locale/bitcoin_bg.ts
@@ -214,7 +214,11 @@
</context>
<context>
<name>BanTableModel</name>
- </context>
+ <message>
+ <source>Banned Until</source>
+ <translation>ะกัŠั ะทะฐะฑั€ะฐะฝะตะฝ ะดะพัั‚ัŠะฟ ะดะพ</translation>
+ </message>
+</context>
<context>
<name>BitcoinGUI</name>
<message>
@@ -1230,10 +1234,6 @@
<translation>ะžัะฝะพะฒะฝะธ</translation>
</message>
<message>
- <source>Using OpenSSL version</source>
- <translation>ะ˜ะทะฟะพะปะทะฒะฐะฝะต ะฝะฐ OpenSSL ะฒะตั€ัะธั</translation>
- </message>
- <message>
<source>Using BerkeleyDB version</source>
<translation>ะ˜ะทะฟะพะปะทะฒะฐะฝะต ะฝะฐ ะฑะฐะทะฐ ะดะฐะฝะฝะธ BerkeleyDB </translation>
</message>
diff --git a/src/qt/locale/bitcoin_ca.ts b/src/qt/locale/bitcoin_ca.ts
index 38e770f182..8bc9281f1d 100644
--- a/src/qt/locale/bitcoin_ca.ts
+++ b/src/qt/locale/bitcoin_ca.ts
@@ -1116,6 +1116,22 @@
<translation>Mostra si el proxy SOCKS5 per defecte proporcionat s'utilitza per arribar als iguals mitjanรงant aquest tipus de xarxa.</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 de Bitcoin a travรฉs de un proxy SOCKS5 per als serveis ocults de Tor</translation>
+ </message>
+ <message>
<source>Use separate SOCKS5 proxy to reach peers via Tor hidden services:</source>
<translation>Utilitza un proxy SOCKS4 apart per a arribar als iguals a travรฉs de serveis ocults de Tor:</translation>
</message>
@@ -1458,10 +1474,6 @@
<translation>General</translation>
</message>
<message>
- <source>Using OpenSSL version</source>
- <translation>Utilitzant OpenSSL versiรณ</translation>
- </message>
- <message>
<source>Using BerkeleyDB version</source>
<translation>Utilitzant BerkeleyDB versiรณ</translation>
</message>
@@ -1490,6 +1502,18 @@
<translation>Nombre de blocs actuals</translation>
</message>
<message>
+ <source>Memory Pool</source>
+ <translation>Reserva de memรฒria</translation>
+ </message>
+ <message>
+ <source>Current number of transactions</source>
+ <translation>Nombre actual de transaccions</translation>
+ </message>
+ <message>
+ <source>Memory usage</source>
+ <translation>Us de memoria</translation>
+ </message>
+ <message>
<source>Open the Bitcoin Core debug log file from the current data directory. This can take a few seconds for large log files.</source>
<translation>Obre el fitxer de registre de depuraciรณ del Bitcoin Core del directori de dades actual. Pot portar uns quants segons per a fitxers de registre grans.</translation>
</message>
@@ -2749,6 +2773,10 @@
<translation>Copiar 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>
@@ -2896,22 +2924,62 @@
<translation>Accepta la lรญnia d'ordres i ordres JSON-RPC </translation>
</message>
<message>
+ <source>If &lt;category&gt; is not supplied or if &lt;category&gt; = 1, output all debugging information.</source>
+ <translation>Si no es proporciona &lt;category&gt; o si &lt;category&gt; = 1, treu a la sortida tota la informaciรณ de depuraciรณ.</translation>
+ </message>
+ <message>
<source>Maximum total fees (in %s) to use in a single wallet transaction; setting this too low may abort large transactions (default: %s)</source>
<translation>Comissions totals mร ximes (en %s) per utilitzar en una รบnica transacciรณ de moneder; definir-ne una massa baixa pot interrompre les transaccions mรฉs grans (per defecte: %s)</translation>
</message>
<message>
+ <source>Please check that your computer's date and time are correct! If your clock is wrong Bitcoin Core will not work properly.</source>
+ <translation>Comproveu que la data i hora de l'ordinador sรณn correctes! Si el vostre rellotge no tรฉ l'hora correcta, el Bitcoin Core no funcionarร  adequadament.</translation>
+ </message>
+ <message>
+ <source>Prune configured below the minimum of %d MiB. Please use a higher number.</source>
+ <translation>Poda configurada per sota el mรญnim de %d MiB. Utilitzeu un nombre superior.</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 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, &gt;%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, &gt;%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>
+ <message>
+ <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>Fee (in %s/kB) to add to transactions you send (default: %s)</source>
<translation>Comissiรณ (en %s/kB) per afegir a les transaccions que envieu (per defecte: %s)</translation>
</message>
<message>
+ <source>Pruning blockstore...</source>
+ <translation>S'estร  podant la cadena de blocs...</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 ordres</translation>
</message>
<message>
+ <source>Unable to start HTTP server. See debug log for details.</source>
+ <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>-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>
@@ -3080,10 +3148,6 @@
<translation>Opcions de moneder:</translation>
</message>
<message>
- <source>Warning: This version is obsolete; upgrade required!</source>
- <translation>Avรญs: aquesta versiรณ รฉs obsoleta; cal actualitzar-la!</translation>
- </message>
- <message>
<source>You need to rebuild the database using -reindex to change -txindex</source>
<translation>Cal que reconstruรฏu la base de dades fent servir -reindex per canviar -txindex</translation>
</message>
diff --git a/src/qt/locale/bitcoin_ca@valencia.ts b/src/qt/locale/bitcoin_ca@valencia.ts
index 2c41ec78d4..e5744fcbbf 100644
--- a/src/qt/locale/bitcoin_ca@valencia.ts
+++ b/src/qt/locale/bitcoin_ca@valencia.ts
@@ -1414,10 +1414,6 @@
<translation>General</translation>
</message>
<message>
- <source>Using OpenSSL version</source>
- <translation>Utilitzant OpenSSL versiรณ</translation>
- </message>
- <message>
<source>Using BerkeleyDB version</source>
<translation>Utilitzant BerkeleyDB versiรณ</translation>
</message>
@@ -2960,10 +2956,6 @@
<translation>Opcions de moneder:</translation>
</message>
<message>
- <source>Warning: This version is obsolete; upgrade required!</source>
- <translation>Avรญs: esta versiรณ รฉs obsoleta; cal actualitzar-la!</translation>
- </message>
- <message>
<source>You need to rebuild the database using -reindex to change -txindex</source>
<translation>Cal que reconstruรฏu la base de dades fent servir -reindex per canviar -txindex</translation>
</message>
diff --git a/src/qt/locale/bitcoin_ca_ES.ts b/src/qt/locale/bitcoin_ca_ES.ts
index e6a932ebee..2c238bb44f 100644
--- a/src/qt/locale/bitcoin_ca_ES.ts
+++ b/src/qt/locale/bitcoin_ca_ES.ts
@@ -1116,6 +1116,22 @@
<translation>Mostra si el proxy SOCKS5 per defecte proporcionat s'utilitza per arribar als iguals mitjanรงant aquest tipus de xarxa.</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 de Bitcoin a travรฉs de un proxy SOCKS5 per als serveis ocults de Tor</translation>
+ </message>
+ <message>
<source>Use separate SOCKS5 proxy to reach peers via Tor hidden services:</source>
<translation>Utilitza un proxy SOCKS4 apart per a arribar als iguals a travรฉs de serveis ocults de Tor:</translation>
</message>
@@ -1458,10 +1474,6 @@
<translation>General</translation>
</message>
<message>
- <source>Using OpenSSL version</source>
- <translation>Utilitzant OpenSSL versiรณ</translation>
- </message>
- <message>
<source>Using BerkeleyDB version</source>
<translation>Utilitzant BerkeleyDB versiรณ</translation>
</message>
@@ -1490,6 +1502,18 @@
<translation>Nombre de blocs actuals</translation>
</message>
<message>
+ <source>Memory Pool</source>
+ <translation>Reserva de memรฒria</translation>
+ </message>
+ <message>
+ <source>Current number of transactions</source>
+ <translation>Nombre actual de transaccions</translation>
+ </message>
+ <message>
+ <source>Memory usage</source>
+ <translation>Us de memoria</translation>
+ </message>
+ <message>
<source>Open the Bitcoin Core debug log file from the current data directory. This can take a few seconds for large log files.</source>
<translation>Obre el fitxer de registre de depuraciรณ del Bitcoin Core del directori de dades actual. Pot portar uns quants segons per a fitxers de registre grans.</translation>
</message>
@@ -2749,6 +2773,10 @@
<translation>Copiar 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>
@@ -2896,18 +2924,54 @@
<translation>Accepta la lรญnia d'ordres i ordres JSON-RPC </translation>
</message>
<message>
+ <source>If &lt;category&gt; is not supplied or if &lt;category&gt; = 1, output all debugging information.</source>
+ <translation>Si no es proporciona &lt;category&gt; o si &lt;category&gt; = 1, treu a la sortida tota la informaciรณ de depuraciรณ.</translation>
+ </message>
+ <message>
<source>Maximum total fees (in %s) to use in a single wallet transaction; setting this too low may abort large transactions (default: %s)</source>
<translation>Comissions totals mร ximes (en %s) per utilitzar en una รบnica transacciรณ de moneder; definir-ne una massa baixa pot interrompre les transaccions mรฉs grans (per defecte: %s)</translation>
</message>
<message>
+ <source>Please check that your computer's date and time are correct! If your clock is wrong Bitcoin Core will not work properly.</source>
+ <translation>Comproveu que la data i hora de l'ordinador sรณn correctes! Si el vostre rellotge no tรฉ l'hora correcta, el Bitcoin Core no funcionarร  adequadament.</translation>
+ </message>
+ <message>
+ <source>Prune configured below the minimum of %d MiB. Please use a higher number.</source>
+ <translation>Poda configurada per sota el mรญnim de %d MiB. Utilitzeu un nombre superior.</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 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, &gt;%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, &gt;%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>
+ <message>
+ <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>Fee (in %s/kB) to add to transactions you send (default: %s)</source>
<translation>Comissiรณ (en %s/kB) per afegir a les transaccions que envieu (per defecte: %s)</translation>
</message>
<message>
+ <source>Pruning blockstore...</source>
+ <translation>S'estร  podant la cadena de blocs...</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 ordres</translation>
</message>
<message>
+ <source>Unable to start HTTP server. See debug log for details.</source>
+ <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>
@@ -3080,10 +3144,6 @@
<translation>Opcions de moneder:</translation>
</message>
<message>
- <source>Warning: This version is obsolete; upgrade required!</source>
- <translation>Avรญs: aquesta versiรณ รฉs obsoleta; cal actualitzar-la!</translation>
- </message>
- <message>
<source>You need to rebuild the database using -reindex to change -txindex</source>
<translation>Cal que reconstruรฏu la base de dades fent servir -reindex per canviar -txindex</translation>
</message>
diff --git a/src/qt/locale/bitcoin_cs.ts b/src/qt/locale/bitcoin_cs.ts
index ef1903edd1..d3ff5c1f57 100644
--- a/src/qt/locale/bitcoin_cs.ts
+++ b/src/qt/locale/bitcoin_cs.ts
@@ -3,7 +3,7 @@
<name>AddressBookPage</name>
<message>
<source>Right-click to edit address or label</source>
- <translation>Pravรฝm tlaฤรญtkem myลกi zaฤneลก upravovat oznaฤenรญ adresy</translation>
+ <translation>Pravรฝm tlaฤรญtkem myลกi mลฏลพeลก upravit oznaฤenรญ adresy</translation>
</message>
<message>
<source>Create a new address</source>
@@ -71,7 +71,7 @@
</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. Je doporuฤenรฉ pouลพรญvat pokaลพdรฉ novou adresu pro kaลพdou transakci.</translation>
+ <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 &amp;Label</source>
@@ -83,11 +83,11 @@
</message>
<message>
<source>Export Address List</source>
- <translation>Exportuj seznam adres</translation>
+ <translation>Export seznamu adres</translation>
</message>
<message>
<source>Comma separated file (*.csv)</source>
- <translation>CSV formรกt (*.csv)</translation>
+ <translation>Formรกt CSV (*.csv)</translation>
</message>
<message>
<source>Exporting Failed</source>
@@ -343,7 +343,7 @@
</message>
<message>
<source>&amp;Send</source>
- <translation>&amp;Poลกli</translation>
+ <translation>P&amp;oลกli</translation>
</message>
<message>
<source>&amp;Receive</source>
@@ -383,7 +383,7 @@
</message>
<message>
<source>&amp;Help</source>
- <translation>Nรก&amp;povฤ›da</translation>
+ <translation>Nรกpovฤ›d&amp;a</translation>
</message>
<message>
<source>Tabs toolbar</source>
@@ -419,7 +419,7 @@
</message>
<message>
<source>&amp;Command-line options</source>
- <translation>Ar&amp;gumenty z pล™รญkazovรฉ ล™รกdky</translation>
+ <translation>Ar&amp;gumenty pล™รญkazovรฉ ล™รกdky</translation>
</message>
<message>
<source>Show the Bitcoin Core help message to get a list with possible Bitcoin command-line options</source>
@@ -467,7 +467,7 @@
</message>
<message>
<source>Transactions after this will not yet be visible.</source>
- <translation>Nรกslednรฉ transakce jeลกtฤ› nebudou vidฤ›t.</translation>
+ <translation>Novฤ›jลกรญ transakce zatรญm nejsou vidฤ›t.</translation>
</message>
<message>
<source>Error</source>
@@ -806,11 +806,11 @@
</message>
<message>
<source>The entered address "%1" is already in the address book.</source>
- <translation>Zadanรก adresa "%1" uลพ v adresรกล™i je.</translation>
+ <translation>Zadanรก adresa โ€ž%1โ€œ uลพ v adresรกล™i je.</translation>
</message>
<message>
<source>The entered address "%1" is not a valid Bitcoin address.</source>
- <translation>Zadanรก adresa "%1" nenรญ platnรก Bitcoinovรก adresa.</translation>
+ <translation>Zadanรก adresa โ€ž%1โ€œ nenรญ platnรก Bitcoinovรก adresa.</translation>
</message>
<message>
<source>Could not unlock wallet.</source>
@@ -864,7 +864,7 @@
</message>
<message>
<source>Command-line options</source>
- <translation>Argumenty z pล™รญkazovรฉ ล™รกdky</translation>
+ <translation>Argumenty pล™รญkazovรฉ ล™รกdky</translation>
</message>
<message>
<source>Usage:</source>
@@ -874,7 +874,35 @@
<source>command-line options</source>
<translation>moลพnosti pล™รญkazovรฉ ล™รกdky</translation>
</message>
- </context>
+ <message>
+ <source>UI Options:</source>
+ <translation>Moลพnosti UI:</translation>
+ </message>
+ <message>
+ <source>Choose data directory on startup (default: %u)</source>
+ <translation>Zvolit pล™i startu adresรกล™ pro data (vรฝchozรญ: %u)</translation>
+ </message>
+ <message>
+ <source>Set language, for example "de_DE" (default: system locale)</source>
+ <translation>Nastavit jazyk, napล™รญklad โ€žde_DEโ€œ (vรฝchozรญ: systรฉmovรฉ nastavenรญ)</translation>
+ </message>
+ <message>
+ <source>Start minimized</source>
+ <translation>Nastartovat minimalizovanฤ›</translation>
+ </message>
+ <message>
+ <source>Set SSL root certificates for payment request (default: -system-)</source>
+ <translation>Nastavit koล™enovรฉ SSL certifikรกty pro platebnรญ poลพadavky (vรฝchozรญ: -system-)</translation>
+ </message>
+ <message>
+ <source>Show splash screen on startup (default: %u)</source>
+ <translation>Zobrazit startovacรญ obrazovku (vรฝchozรญ: %u)</translation>
+ </message>
+ <message>
+ <source>Reset all settings changes made over the GUI</source>
+ <translation>Resetovat vลกechna nastavenรญ provedenรฉ v GUI</translation>
+ </message>
+</context>
<context>
<name>Intro</name>
<message>
@@ -989,7 +1017,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 tล™etรญch stran (napล™. block exploreru), kterรฉ se zobrazรญ v kontextovรฉm menu v zรกloลพce Transakce. %s v URL se nahradรญ hashem transakce. Vรญce URL oddฤ›l svislรญtkem |.</translation>
+ <translation>URL tล™etรญch stran (napล™. block exploreru), kterรก se zobrazรญ v kontextovรฉm menu v zรกloลพce Transakce. %s v URL se nahradรญ hashem transakce. Vรญce URL oddฤ›l svislรญtkem |.</translation>
</message>
<message>
<source>Third party transaction URLs</source>
@@ -997,7 +1025,7 @@
</message>
<message>
<source>Active command-line options that override above options:</source>
- <translation>Aktivnรญ argumenty z pล™รญkazovรฉ ล™รกdky, kterรฉ pล™etloukly tato nastavenรญ:</translation>
+ <translation>Aktivnรญ argumenty z pล™รญkazovรฉ ล™รกdky, kterรฉ majรญ pล™ednost pล™ed nastavenรญm vรฝลกe:</translation>
</message>
<message>
<source>Reset all client options to default.</source>
@@ -1029,7 +1057,7 @@
</message>
<message>
<source>Expert</source>
- <translation>Odbornรญk</translation>
+ <translation>Pokroฤilรก nastavenรญ</translation>
</message>
<message>
<source>Enable coin &amp;control features</source>
@@ -1072,6 +1100,30 @@
<translation>Port proxy (napล™. 9050)</translation>
</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>
+ </message>
+ <message>
+ <source>Shows, if the supplied default SOCKS5 proxy is used to reach peers via this network type.</source>
+ <translation>Ukazuje, jestli se zadanรก vรฝchozรญ SOCKS5 proxy pouลพรญvรก k pล™ipojovรกnรญ k peerลฏm v rรกmci tohoto typu sรญtฤ›.</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>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>
<translation>Pouลพรญt samostatnou SOCKS5 proxy ke spojenรญ s protฤ›jลกky pล™es skrytรฉ sluลพby v Toru:</translation>
</message>
@@ -1101,7 +1153,7 @@
</message>
<message>
<source>&amp;Unit to show amounts in:</source>
- <translation>J&amp;ednotka pro ฤรกstky:</translation>
+ <translation>Je&amp;dnotka pro ฤรกstky:</translation>
</message>
<message>
<source>Choose the default subdivision unit to show in the interface and when sending coins.</source>
@@ -1113,7 +1165,7 @@
</message>
<message>
<source>&amp;OK</source>
- <translation>&amp;Budiลพ</translation>
+ <translation>&amp;Pouลพรญt</translation>
</message>
<message>
<source>&amp;Cancel</source>
@@ -1141,7 +1193,7 @@
</message>
<message>
<source>This change would require a client restart.</source>
- <translation>Tahle zmฤ›na bude chtรญt restartovat klienta.</translation>
+ <translation>Tato zmฤ›na vyลพaduje restart aplikace.</translation>
</message>
<message>
<source>The supplied proxy address is invalid.</source>
@@ -1188,7 +1240,7 @@
</message>
<message>
<source>Balances</source>
- <translation>Stavy รบฤtลฏ</translation>
+ <translation>Stav รบฤtลฏ</translation>
</message>
<message>
<source>Total:</source>
@@ -1414,10 +1466,6 @@
<translation>Obecnรฉ</translation>
</message>
<message>
- <source>Using OpenSSL version</source>
- <translation>Pouลพรญvanรก verze OpenSSL</translation>
- </message>
- <message>
<source>Using BerkeleyDB version</source>
<translation>Pouลพรญvanรก verze BerkeleyDB</translation>
</message>
@@ -1446,6 +1494,10 @@
<translation>Aktuรกlnรญ poฤet blokลฏ</translation>
</message>
<message>
+ <source>Memory usage</source>
+ <translation>Vyuลพitรญ pamฤ›ti</translation>
+ </message>
+ <message>
<source>Open the Bitcoin Core 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 Bitcoin Core z aktuรกlnรญho datovรฉho adresรกล™e. U velkรฝch logลฏ to mลฏลพe pรกr vteล™in zabrat.</translation>
</message>
@@ -1550,6 +1602,34 @@
<translation>Vyฤistit konzoli</translation>
</message>
<message>
+ <source>&amp;Disconnect Node</source>
+ <translation>&amp;Odpojit uzel</translation>
+ </message>
+ <message>
+ <source>Ban Node for</source>
+ <translation>Uvalit na uzel klatbu na</translation>
+ </message>
+ <message>
+ <source>1 &amp;hour</source>
+ <translation>1 &amp;hodinu</translation>
+ </message>
+ <message>
+ <source>1 &amp;day</source>
+ <translation>1 &amp;den</translation>
+ </message>
+ <message>
+ <source>1 &amp;week</source>
+ <translation>1 &amp;tรฝden</translation>
+ </message>
+ <message>
+ <source>1 &amp;year</source>
+ <translation>1 &amp;rok</translation>
+ </message>
+ <message>
+ <source>&amp;Unban Node</source>
+ <translation>&amp;Zbavit uzel klatby</translation>
+ </message>
+ <message>
<source>Welcome to the Bitcoin Core RPC console.</source>
<translation>Vรญtej v RPC konzoli Bitcoin Core.</translation>
</message>
@@ -1578,6 +1658,10 @@
<translation>%1 GB</translation>
</message>
<message>
+ <source>(node id: %1)</source>
+ <translation>(id uzlu: %1)</translation>
+ </message>
+ <message>
<source>via %1</source>
<translation>via %1</translation>
</message>
@@ -1630,7 +1714,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>
@@ -1638,7 +1722,7 @@
</message>
<message>
<source>Use this form to request payments. All fields are &lt;b&gt;optional&lt;/b&gt;.</source>
- <translation>Tรญmto formulรกล™ mลฏลพeลก poลพadovat platby. Vลกechna pole jsou &lt;b&gt;volitelnรก&lt;/b&gt;.</translation>
+ <translation>Tรญmto formulรกล™em mลฏลพeลก poลพadovat platby. Vลกechna pole jsou &lt;b&gt;volitelnรก&lt;/b&gt;.</translation>
</message>
<message>
<source>An optional amount to request. Leave this empty or zero to not request a specific amount.</source>
@@ -1931,7 +2015,7 @@
</message>
<message>
<source>S&amp;end</source>
- <translation>P&amp;oลกli</translation>
+ <translation>Poลกl&amp;i</translation>
</message>
<message>
<source>Confirm send coins</source>
@@ -1970,6 +2054,10 @@
<translation>Kopรญruj drobnรฉ</translation>
</message>
<message>
+ <source>Total Amount %1</source>
+ <translation>Celkovรก ฤรกstka %1</translation>
+ </message>
+ <message>
<source>or</source>
<translation>nebo</translation>
</message>
@@ -2001,6 +2089,10 @@
<source>Payment request expired.</source>
<translation>Platebnรญ poลพadavek vyprลกel.</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>
@@ -2090,7 +2182,7 @@
</message>
<message>
<source>S&amp;ubtract fee from amount</source>
- <translation>&amp;Odeฤรญst poplatek od ฤรกstky</translation>
+ <translation>Od&amp;eฤรญst poplatek od ฤรกstky</translation>
</message>
<message>
<source>Message:</source>
@@ -2176,7 +2268,7 @@
</message>
<message>
<source>Copy the current signature to the system clipboard</source>
- <translation>Zkopรญruj aktuรกlnฤ› vybranรฝ podpis do systรฉmovรฉ schrรกnky</translation>
+ <translation>Zkopรญruj tento podpis do schrรกnky</translation>
</message>
<message>
<source>Sign the message to prove you own this Bitcoin address</source>
@@ -2220,7 +2312,7 @@
</message>
<message>
<source>Click "Sign Message" to generate signature</source>
- <translation>Kliknutรญm na "Podepiลก zprรกvu" vygenerujeลก podpis</translation>
+ <translation>Kliknutรญm na โ€žPodepiลก zprรกvuโ€œ vygenerujeลก podpis</translation>
</message>
<message>
<source>The entered address is invalid.</source>
@@ -2248,7 +2340,7 @@
</message>
<message>
<source>Message signed.</source>
- <translation>Zprรกv podepsรกna.</translation>
+ <translation>Zprรกva podepsรกna.</translation>
</message>
<message>
<source>The signature could not be decoded.</source>
@@ -2405,7 +2497,7 @@
</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>
+ <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>
@@ -2467,7 +2559,7 @@
</message>
<message>
<source>Immature (%1 confirmations, will be available after %2)</source>
- <translation>Nedozrรกno (%1 potvrzenรญ, bude k dispozici za %2)</translation>
+ <translation>Nedozrรกno (%1 potvrzenรญ, dozraje pล™i %2 potvrzenรญch)</translation>
</message>
<message numerus="yes">
<source>Open for %n more block(s)</source>
@@ -2637,6 +2729,10 @@
<translation>Kopรญruj ID transakce</translation>
</message>
<message>
+ <source>Copy raw transaction</source>
+ <translation>Kopรญruj surovou transakci</translation>
+ </message>
+ <message>
<source>Edit label</source>
<translation>Uprav oznaฤenรญ</translation>
</message>
@@ -2670,7 +2766,7 @@
</message>
<message>
<source>Comma separated file (*.csv)</source>
- <translation>CSV formรกt (*.csv)</translation>
+ <translation>Formรกt CSV (*.csv)</translation>
</message>
<message>
<source>Confirmed</source>
@@ -2784,14 +2880,66 @@
<translation>Akceptovat pล™รญkazy z pล™รญkazovรฉ ล™รกdky a pล™es JSON-RPC</translation>
</message>
<message>
+ <source>If &lt;category&gt; is not supplied or if &lt;category&gt; = 1, output all debugging information.</source>
+ <translation>Pokud nenรญ &lt;category&gt; zadรกna nebo je &lt;category&gt; = 1, bude tisknout veลกkerรฉ ladicรญ informace.</translation>
+ </message>
+ <message>
+ <source>Please check that your computer's date and time are correct! If your clock is wrong Bitcoin Core will not work properly.</source>
+ <translation>Prosรญm zkontrolujte nastavenรญ ฤasu na svรฉm poฤรญtaฤi. Pokud ฤas a datum nenรญ nastaven sprรกvnฤ›, Bitcoin Core nebude fungovat!</translation>
+ </message>
+ <message>
+ <source>Prune configured below the minimum of %d MiB. Please use a higher number.</source>
+ <translation>Proล™ezรกvรกnรญ je nastaveno pod minimum %d MiB. Pouลพij, prosรญm, nฤ›jakรฉ vyลกลกรญ ฤรญslo.</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>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, &gt;%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, &gt;%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>
+ <message>
+ <source>Error: A fatal internal error occurred, see debug.log for details</source>
+ <translation>Chyba: Pล™ihodila se zรกvaลพnรก vnitล™nรญ chyba, podrobnosti viz v debug.log</translation>
+ </message>
+ <message>
+ <source>Fee (in %s/kB) to add to transactions you send (default: %s)</source>
+ <translation>Poplatek (v %s/kB), kterรฝ se pล™idรก ke kaลพdรฉ odeslanรฉ transakci (vรฝchozรญ: %s)</translation>
+ </message>
+ <message>
+ <source>Pruning blockstore...</source>
+ <translation>Proล™ezรกvรกm รบloลพiลกtฤ› blokลฏ...</translation>
+ </message>
+ <message>
<source>Run in the background as a daemon and accept commands</source>
- <translation>Bฤ›ลพet na pozadรญ jako dรฉmon a akceptovat pล™รญkazy</translation>
+ <translation>Bฤ›ลพet na pozadรญ jako dรฉmon a pล™ijรญmat pล™รญkazy</translation>
+ </message>
+ <message>
+ <source>Unable to start HTTP server. See debug log for details.</source>
+ <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>-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>
+ </message>
+ <message>
+ <source>A fee rate (in %s/kB) that will be used when fee estimation has insufficient data (default: %s)</source>
+ <translation>Sazba poplatku (v %s/kB), kterรก se pouลพije, pokud nebude k dispozici dostatek dat pro automatickรฝ odhad poplatku (vรฝchozรญ: %s)</translation>
+ </message>
+ <message>
+ <source>Accept relayed transactions received from whitelisted peers even when not relaying transactions (default: %d)</source>
+ <translation>Pล™ijรญmat pล™eposรญlanรฉ transakce obdrลพenรฉ od vลพdy vรญtanรฝch protฤ›jลกkลฏ, i kdyลพ transakce nepล™eposรญlรกme (vรฝchozรญ: %d)</translation>
+ </message>
+ <message>
<source>Bind to given address and always listen on it. Use [host]:port notation for IPv6</source>
<translation>Poslouchat na zadanรฉ adrese. Pro zรกpis IPv6 adresy pouลพij notaci [adresa]:port</translation>
</message>
@@ -2808,10 +2956,18 @@
<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>
+ </message>
+ <message>
<source>Set the number of script verification threads (%u to %d, 0 = auto, &lt;0 = leave that many cores free, default: %d)</source>
<translation>Nastavenรญ poฤtu vlรกken pro verifikaci skriptลฏ (%u aลพ %d, 0 = automaticky, &lt;0 = nechat danรฝ poฤet jader volnรฝ, vรฝchozรญ: %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>Databรกze blokลฏ obsahuje blok, kterรฝ vypadรก jako z budoucnosti, coลพ mลฏลพe bรฝt kvลฏli ลกpatnฤ› nastavenรฉmu datu a ฤasu na tvรฉm poฤรญtaฤi. Nech databรกzi blokลฏ pล™estavฤ›t pouze v pล™รญpadฤ›, ลพe si jsi jistรฝ, ลพe mรกลก na poฤรญtaฤi sprรกvnรฝ datum a ฤas</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>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>
@@ -2820,6 +2976,14 @@
<translation>Nedaล™รญ se mi pล™ipojit na %s na tomhle poฤรญtaฤi. Bitcoin Core uลพ pravdฤ›podobnฤ› jednou bฤ›ลพรญ.</translation>
</message>
<message>
+ <source>Unsupported argument -whitelistalwaysrelay ignored, use -whitelistrelay and/or -whitelistforcerelay.</source>
+ <translation>Nepodporovanรฝ argument -whitelistalwaysrelay se ignoruje, pouลพij -whitelistrelay a/nebo -whitelistforcerelay.</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>WARNING: abnormally high number of blocks generated, %d blocks received in the last %d hours (%d expected)</source>
<translation>UPOZORNฤšNร: vygenerovรกno nezvykle mnoho blokลฏ โ€“ pล™ijato %d blokลฏ jen za poslednรญch %d hodin (oฤekรกvรกno %d)</translation>
</message>
@@ -2837,17 +3001,25 @@
</message>
<message>
<source>Warning: wallet.dat corrupt, data salvaged! Original wallet.dat saved as wallet.{timestamp}.bak in %s; if your balance or transactions are incorrect you should restore from a backup.</source>
- <translation>Upozornฤ›nรญ: soubor wallet.dat je poลกkozenรฝ, data jsou vลกak zachrรกnฤ›na! Pลฏvodnรญ soubor wallet.dat je uloลพenรฝ jako wallet.{timestamp}.bak v %s. Pokud je stav tvรฉho รบฤtu nebo transakce nesprรกvnรฉ, zล™ejmฤ› bys mฤ›l obnovit zรกlohu.</translation>
+ <translation>Upozornฤ›nรญ: soubor wallet.dat je poลกkozenรฝ, data jsou vลกak zachrรกnฤ›na! Pลฏvodnรญ soubor wallet.dat je uloลพenรฝ jako wallet.{timestamp}.bak v %s. Pokud jsou stav tvรฉho รบฤtu nebo transakce nesprรกvnรฉ, zล™ejmฤ› bys mฤ›l obnovit zรกlohu.</translation>
</message>
<message>
<source>Whitelist peers connecting from the given netmask or IP address. Can be specified multiple times.</source>
- <translation>Umรญstit na bรญlou listinu protฤ›jลกky pล™ipojujรญcรญ se z danรฉ podsรญtฤ› ฤi IP adresy. Lze zadat i vรญcekrรกt.</translation>
+ <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>
+ </message>
+ <message>
+ <source>-maxmempool must be at least %d MB</source>
+ <translation>-maxmempool musรญ bรฝt alespoลˆ %d MB</translation>
</message>
<message>
<source>&lt;category&gt; can be:</source>
<translation>&lt;category&gt; mลฏลพe bรฝt:</translation>
</message>
<message>
+ <source>Append comment to the user agent string</source>
+ <translation>Pล™ipojit komentรกล™ k typu klienta</translation>
+ </message>
+ <message>
<source>Block creation options:</source>
<translation>Moลพnosti vytvรกล™enรญ bloku:</translation>
</message>
@@ -2912,6 +3084,22 @@
<translation>Neplatnรก -onion adresa: '%s'</translation>
</message>
<message>
+ <source>Invalid amount for -fallbackfee=&lt;amount&gt;: '%s'</source>
+ <translation>Neplatnรก ฤรกstka pro -fallbackfee=&lt;ฤรกstka&gt;: '%s'</translation>
+ </message>
+ <message>
+ <source>Keep the transaction memory pool below &lt;n&gt; megabytes (default: %u)</source>
+ <translation>Udrลพovat zasobnรญk transakcรญ menลกรญ neลพ &lt;n&gt; 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>
+ </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>
+ </message>
+ <message>
<source>Not enough file descriptors available.</source>
<translation>Je nedostatek deskriptorลฏ souborลฏ.</translation>
</message>
@@ -2920,6 +3108,10 @@
<translation>Pล™ipojovat se pouze k uzlลฏm v &lt;net&gt; sรญti (ipv4, ipv6 nebo onion)</translation>
</message>
<message>
+ <source>Print version and exit</source>
+ <translation>Vypsat verzi a skonฤit</translation>
+ </message>
+ <message>
<source>Prune cannot be configured with a negative value.</source>
<translation>Proล™ezรกvรกnรญ nemลฏลพe bรฝt zkonfigurovรกno s negativnรญ hodnotou.</translation>
</message>
@@ -2940,10 +3132,26 @@
<translation>Udej nรกzev souboru s penฤ›ลพenkou (v rรกmci datovรฉho adresรกล™e)</translation>
</message>
<message>
+ <source>Unsupported argument -benchmark ignored, use -debug=bench.</source>
+ <translation>Nepodporovanรฝ argument -benchmark se ignoruje, pouลพij -debug=bench.</translation>
+ </message>
+ <message>
+ <source>Unsupported argument -debugnet ignored, use -debug=net.</source>
+ <translation>Nepodporovanรฝ argument -debugnet se ignoruje, pouลพij -debug=net.</translation>
+ </message>
+ <message>
+ <source>Unsupported argument -tor found, use -onion.</source>
+ <translation>Argument -tor jiลพ nenรญ podporovanรฝ, pouลพij -onion.</translation>
+ </message>
+ <message>
<source>Use UPnP to map the listening port (default: %u)</source>
<translation>Pouลพรญt UPnP k namapovรกnรญ naslouchacรญho portu (vรฝchozรญ: %u)</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>
</message>
@@ -2960,10 +3168,6 @@
<translation>Moลพnosti penฤ›ลพenky:</translation>
</message>
<message>
- <source>Warning: This version is obsolete; upgrade required!</source>
- <translation>Upozornฤ›nรญ: tahle verze je zastaralรก, mฤ›l bys ji aktualizovat!</translation>
- </message>
- <message>
<source>You need to rebuild the database using -reindex to change -txindex</source>
<translation>Je tล™eba pล™estavฤ›t databรกzi pouลพitรญm -reindex, aby bylo moลพnรฉ zmฤ›nit -txindex</translation>
</message>
@@ -2973,7 +3177,7 @@
</message>
<message>
<source>Bind to given address and whitelist peers connecting to it. Use [host]:port notation for IPv6</source>
- <translation>Obsadit zadanou adresu a protฤ›jลกky, kterรฉ se na nรญ pล™ipojรญ, umรญstit na bรญlou listinu. Pro zรกpis IPv6 adresy pouลพij notaci [adresa]:port</translation>
+ <translation>Obsadit zadanou adresu a vลพdy vรญtat protฤ›jลกky, kterรฉ se na ni pล™ipojรญ. Pro zรกpis IPv6 adresy pouลพij notaci [adresa]:port</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>
@@ -3000,6 +3204,10 @@
<translation>Spustit pล™รญkaz, kdyลพ pล™ijde relevantnรญ upozornฤ›nรญ nebo kdyลพ dojde k opravdu dlouhรฉmu rozลกtฤ›penรญ ล™etezce blokลฏ (%s se v pล™รญkazu nahradรญ zprรกvou)</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>Poplatky (v %s/kB) menลกรญ neลพ tato hodnota jsou povaลพovรกny za nulovรฉ pro รบฤely pล™eposรญlรกnรญ, tฤ›ลพenรญ a vytvรกล™enรญ transakcรญ (vรฝchozรญ: %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>Pokud paytxfee nenรญ nastaveno, platit dostateฤnรฝ poplatek na to, aby zaฤaly bรฝt transakce potvrzovรกny v prลฏmฤ›ru bฤ›hem n blokลฏ (vรฝchozรญ: %u)</translation>
</message>
@@ -3037,7 +3245,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>Na protฤ›jลกky na bรญlรฉ listinฤ› se nevztahuje DoS klatba a jejich transakce jsou vลพdy pล™eposรญlรกny, i kdyลพ uลพ tล™eba jsou v mempoolu, coลพ je uลพiteฤnรฉ napล™. pro brรกnu</translation>
+ <translation>Na vลพdy vรญtanรฉ protฤ›jลกky se nevztahuje DoS klatba a jejich transakce jsou vลพdy pล™eposรญlรกny, i kdyลพ uลพ tล™eba jsou v transakฤnรญm zรกsobnรญku, coลพ je uลพiteฤnรฉ napล™. pro brรกnu</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>
@@ -3056,6 +3264,14 @@
<translation>Aktivuji nejlepลกรญ ล™etฤ›zec...</translation>
</message>
<message>
+ <source>Attempt to recover private keys from a corrupt wallet.dat on startup</source>
+ <translation>Pokusit se pล™i startu zachrรกnit soukromรฉ klรญฤe z poลกkozenรฉho souboru wallet.dat</translation>
+ </message>
+ <message>
+ <source>Automatically create Tor hidden service (default: %d)</source>
+ <translation>Automaticky v Toru vytvรกล™et skrytรฉ sluลพby (vรฝchozรญ: %d)</translation>
+ </message>
+ <message>
<source>Cannot resolve -whitebind address: '%s'</source>
<translation>Nemohu pล™eloลพit -whitebind adresu: '%s'</translation>
</message>
@@ -3076,6 +3292,10 @@
<translation>Chyba pล™i ฤtenรญ z databรกze, ukonฤuji se.</translation>
</message>
<message>
+ <source>Imports blocks from external blk000??.dat file on startup</source>
+ <translation>Importovat pล™i startu bloky z externรญho souboru blk000??.dat</translation>
+ </message>
+ <message>
<source>Information</source>
<translation>Informace</translation>
</message>
@@ -3128,6 +3348,14 @@
<translation>Pล™ijรญmat a zobrazovat poplachy z P2P sรญtฤ› (vรฝchozรญ: %u)</translation>
</message>
<message>
+ <source>Reducing -maxconnections from %d to %d, because of system limitations.</source>
+ <translation>Omezuji -maxconnections z %d na %d kvลฏli systรฉmovรฝm omezenรญm.</translation>
+ </message>
+ <message>
+ <source>Rescan the block chain for missing wallet transactions on startup</source>
+ <translation>Pล™eskenovat pล™i startu ล™etฤ›zec blokลฏ na chybฤ›jรญcรญ transakce tvรฉ pฤ›nฤ›ลพenky</translation>
+ </message>
+ <message>
<source>Send trace/debug info to console instead of debug.log file</source>
<translation>Posรญlat stopovacรญ/ladicรญ informace do konzole mรญsto do souboru debug.log</translation>
</message>
@@ -3156,6 +3384,14 @@
<translation>Tohle je experimentรกlnรญ program.</translation>
</message>
<message>
+ <source>Tor control port password (default: empty)</source>
+ <translation>Heslo ovlรกdacรญho portu Toru (vรฝchozรญ: prรกzdnรฉ)</translation>
+ </message>
+ <message>
+ <source>Tor control port to use if onion listening enabled (default: %s)</source>
+ <translation>Ovlรกdacรญ port Toru, je-li zapnutรฉ onion naslouchรกnรญ (vรฝchozรญ: %s)</translation>
+ </message>
+ <message>
<source>Transaction amount too small</source>
<translation>ฤŒรกstka v transakci je pล™รญliลก malรก</translation>
</message>
@@ -3176,6 +3412,10 @@
<translation>Nedaล™รญ se mi pล™ipojit na %s na tomhle poฤรญtaฤi (operace bind vrรกtila chybu %s)</translation>
</message>
<message>
+ <source>Upgrade wallet to latest format on startup</source>
+ <translation>Pล™evรฉst pล™i startu penฤ›ลพenku na nejnovฤ›jลกรญ formรกt</translation>
+ </message>
+ <message>
<source>Username for JSON-RPC connections</source>
<translation>Uลพivatelskรฉ jmรฉno pro JSON-RPC spojenรญ</translation>
</message>
@@ -3188,10 +3428,18 @@
<translation>Upozornฤ›nรญ</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>
+ <message>
<source>Zapping all transactions from wallet...</source>
<translation>Vymazat vลกechny transakce z penฤ›ลพenky...</translation>
</message>
<message>
+ <source>ZeroMQ notification options:</source>
+ <translation>Moลพnosti ZeroMQ oznรกmenรญ:</translation>
+ </message>
+ <message>
<source>wallet.dat corrupt, salvage failed</source>
<translation>Soubor wallet.dat je poลกkozen, jeho zรกchrana se nezdaล™ila</translation>
</message>
@@ -3224,6 +3472,26 @@
<translation>(1 = uklรกdat transakฤnรญ metadata, napล™. majitele รบฤtu a informace o platebnรญm poลพadavku, 2 = mazat transakฤnรญ metadata)</translation>
</message>
<message>
+ <source>-maxtxfee is set very high! Fees this large could be paid on a single transaction.</source>
+ <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 &lt;n&gt; hours (default: %u)</source>
+ <translation>Nedrลพet transakce v zรกsobnรญku dรฉle neลพ &lt;n&gt; hodin (vรฝchozรญ: %u)</translation>
+ </message>
+ <message>
+ <source>Error reading wallet.dat! All keys read correctly, but transaction data or address book entries might be missing or incorrect.</source>
+ <translation>Nastala chyba pล™i ฤtenรญ souboru wallet.dat! 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>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>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>
@@ -3240,10 +3508,30 @@
<translation>Tisknout ladicรญ informace (vรฝchozรญ: %u, zadรกnรญ &lt;category&gt; je volitelnรฉ)</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>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>
+ <message>
+ <source>Tries to keep outbound traffic under the given target (in MiB per 24h), 0 = no limit (default: %d)</source>
+ <translation>Pokusit se udrลพet odchozรญ provoz pod stanovenou hodnotou (v MiB za 24 hodin), 0 = bez omezenรญ (vรฝchozรญ: %d)</translation>
+ </message>
+ <message>
+ <source>Unsupported argument -socks found. Setting SOCKS version isn't possible anymore, only SOCKS5 proxies are supported.</source>
+ <translation>Byl pouลพit nepodporovanรฝ argument -socks. Nastavenรญ verze SOCKS uลพ nenรญ moลพnรฉ, podporovรกny jsou pouze SOCKS5 proxy.</translation>
+ </message>
+ <message>
<source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: %s)</source>
<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 &lt;userpw&gt; comes in the format: &lt;USERNAME&gt;:&lt;SALT&gt;$&lt;HASH&gt;. 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 &lt;userpw&gt; mรก formรกt: &lt;UลฝIVATELSKร‰_JMร‰NO&gt;:&lt;SลฎL&gt;$&lt;HAล &gt;. Pomocnรฝ pythonnรญ skript je pล™iloลพen v share/rpcuser. Tuto volbu lze pouลพรญt i vรญcekrรกt</translation>
+ </message>
+ <message>
<source>(default: %s)</source>
<translation>(vรฝchozรญ: %s)</translation>
</message>
@@ -3328,10 +3616,6 @@
<translation>Zadej ฤasovรฝ limit spojenรญ v milivteล™inรกch (minimum: 1, vรฝchozรญ: %d)</translation>
</message>
<message>
- <source>Specify pid file (default: %s)</source>
- <translation>PID soubor (vรฝchozรญ: %s)</translation>
- </message>
- <message>
<source>Spend unconfirmed change when sending transactions (default: %u)</source>
<translation>Utrรกcet i jeลกtฤ› nepotvrzenรฉ drobnรฉ pล™i posรญlรกnรญ transakcรญ (vรฝchozรญ: %u)</translation>
</message>
diff --git a/src/qt/locale/bitcoin_cs_CZ.ts b/src/qt/locale/bitcoin_cs_CZ.ts
index cc0c791154..34d7b4b4a1 100644
--- a/src/qt/locale/bitcoin_cs_CZ.ts
+++ b/src/qt/locale/bitcoin_cs_CZ.ts
@@ -2,6 +2,10 @@
<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>
@@ -10,6 +14,18 @@
<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>&amp;Export</source>
+ <translation>&amp;Exportovat</translation>
+ </message>
+ <message>
<source>&amp;Delete</source>
<translation>&amp;Odstranit</translation>
</message>
@@ -622,6 +638,14 @@
</context>
<context>
<name>WalletView</name>
+ <message>
+ <source>&amp;Export</source>
+ <translation>&amp;Exportovat</translation>
+ </message>
+ <message>
+ <source>Export the data in the current tab to a file</source>
+ <translation>Exportovat aktuรกlnรญ pohled do souboru</translation>
+ </message>
</context>
<context>
<name>bitcoin-core</name>
diff --git a/src/qt/locale/bitcoin_da.ts b/src/qt/locale/bitcoin_da.ts
index aa2724a1e8..7d11825a61 100644
--- a/src/qt/locale/bitcoin_da.ts
+++ b/src/qt/locale/bitcoin_da.ts
@@ -1017,7 +1017,7 @@
</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>Minimรฉr i stedet for at lukke applikationen, nรฅr vinduet lukkes. Nรฅr denne indstilling er slรฅet til, vil applikationen fรธrst blive lukket, nรฅr Afslut vรฆlges i menuen.</translation>
+ <translation>Minimรฉr i stedet for at lukke applikationen, nรฅr vinduet lukkes. Nรฅr denne indstilling er aktiveret, vil applikationen fรธrst blive lukket, nรฅr Afslut vรฆlges i menuen.</translation>
</message>
<message>
<source>The user interface language can be set here. This setting will take effect after restarting Bitcoin Core.</source>
@@ -1069,7 +1069,7 @@
</message>
<message>
<source>Enable coin &amp;control features</source>
- <translation>Slรฅ egenskaber for &amp;coin-styring til</translation>
+ <translation>Aktivรฉr egenskaber for &amp;coin-styring</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>
@@ -1474,10 +1474,6 @@
<translation>Generelt</translation>
</message>
<message>
- <source>Using OpenSSL version</source>
- <translation>Anvender OpenSSL-version</translation>
- </message>
- <message>
<source>Using BerkeleyDB version</source>
<translation>Bruger BerkeleyDB version</translation>
</message>
@@ -2980,6 +2976,18 @@
<translation>Acceptรฉr forbindelser udefra (standard: 1 hvis hverken -proxy eller -connect)</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>
+ <message>
+ <source>Accept relayed transactions received from whitelisted peers even when not relaying transactions (default: %d)</source>
+ <translation>Acceptรฉr videresendte transaktioner, der modtages fra hvidlistede knuder, selv nรฅr transaktioner ikke videresendes (standard: %d)</translation>
+ </message>
+ <message>
<source>Bind to given address and always listen on it. Use [host]:port notation for IPv6</source>
<translation>Tildel til den givne adresse og lyt altid pรฅ den. Brug [vรฆrt]:port-notation for IPv6</translation>
</message>
@@ -2996,6 +3004,10 @@
<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>
+ </message>
+ <message>
<source>Set the number of script verification threads (%u to %d, 0 = auto, &lt;0 = leave that many cores free, default: %d)</source>
<translation>Sรฆt antallet af scriptverificeringstrรฅde (%u til %d, 0 = auto, &lt;0 = efterlad det antal kernet fri, standard: %d)</translation>
</message>
@@ -3012,6 +3024,10 @@
<translation>Ikke i stand til at tildele til %s pรฅ denne computer. Bitcoin Core kรธrer sansynligvis allerede.</translation>
</message>
<message>
+ <source>Unsupported argument -whitelistalwaysrelay ignored, use -whitelistrelay and/or -whitelistforcerelay.</source>
+ <translation>Argument -whitelistalwaysrelay understรธttes ikke og ignoreres; brug -whitelistrelay og/eller -whitelistforcerelay.</translation>
+ </message>
+ <message>
<source>Use UPnP to map the listening port (default: 1 when listening and no -proxy)</source>
<translation>Brug UPnP for at konfigurere den lyttende port (standard: 1 under lytning og ingen -proxy)</translation>
</message>
@@ -3028,6 +3044,10 @@
<translation>Advarsel: Netvรฆrket ser ikke ud til at vรฆre fuldt ud enige! Enkelte minere ser ud til at opleve problemer.</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>
+ <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 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>
@@ -3048,6 +3068,10 @@
<translation>&lt;kategori&gt; kan vรฆre:</translation>
</message>
<message>
+ <source>Append comment to the user agent string</source>
+ <translation>Fรธj kommentar til brugeragentstrengen</translation>
+ </message>
+ <message>
<source>Block creation options:</source>
<translation>Blokoprettelsestilvalg:</translation>
</message>
@@ -3092,6 +3116,10 @@
<translation>Aktivรฉr offentliggรธrelse af rรฅ transaktion i &lt;address&gt;</translation>
</message>
<message>
+ <source>Enable transaction replacement in the memory pool (default: %u)</source>
+ <translation>Aktivรฉr transaktionserstatning i hukommelsespuljen (standard: %u)</translation>
+ </message>
+ <message>
<source>Error initializing block database</source>
<translation>Klargรธring af blokdatabase mislykkedes</translation>
</message>
@@ -3128,10 +3156,22 @@
<translation>Ugyldig -onion adresse: "%s"</translation>
</message>
<message>
+ <source>Invalid amount for -fallbackfee=&lt;amount&gt;: '%s'</source>
+ <translation>Ugyldigt belรธb for -fallbackfee=&lt;belรธb&gt;: "%s"</translation>
+ </message>
+ <message>
<source>Keep the transaction memory pool below &lt;n&gt; megabytes (default: %u)</source>
<translation>Hold hukommelsespuljen med transaktioner under &lt;n&gt; megabyte (standard: %u)</translation>
</message>
<message>
+ <source>Location of the auth cookie (default: data dir)</source>
+ <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>
@@ -3140,6 +3180,10 @@
<translation>Tilslut kun til knuder i netvรฆrk &lt;net&gt; (IPv4, IPv6 eller Onion)</translation>
</message>
<message>
+ <source>Print version and exit</source>
+ <translation>Udskriv version og afslut</translation>
+ </message>
+ <message>
<source>Prune cannot be configured with a negative value.</source>
<translation>Beskรฆring kan ikke opsรฆttes med en negativ vรฆrdi.</translation>
</message>
@@ -3196,10 +3240,6 @@
<translation>Tilvalg for tegnebog:</translation>
</message>
<message>
- <source>Warning: This version is obsolete; upgrade required!</source>
- <translation>Advarsel: Denne version er forรฆldet; opgradering pรฅkrรฆvet!</translation>
- </message>
- <message>
<source>You need to rebuild the database using -reindex to change -txindex</source>
<translation>Du er nรธdt til at genopbygge databasen ved hjรฆlp af -reindex for at รฆndre -txindex</translation>
</message>
@@ -3257,7 +3297,7 @@
</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 tillader strรธmisolation med Tor (standard: %u)</translation>
+ <translation>Brug tilfรฆldige akkreditiver for hver proxy-forbindelse. Dette aktiverer strรธmisolation med Tor (standard: %u)</translation>
</message>
<message>
<source>Set maximum size of high-priority/low-fee transactions in bytes (default: %d)</source>
@@ -3277,7 +3317,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>Andre knuder pรฅ hvidliste kan ikke DoS-bandlyses, og deres transaktioner videresendes altid, selv hvis de allerede er i mempool'en. Brugbart til fx et adgangspunkt</translation>
+ <translation>Andre knuder pรฅ hvidliste kan ikke DoS-bandlyses, og deres transaktioner videresendes altid, selv hvis de allerede er i hukommelsespuljen. Brugbart til fx et adgangspunkt</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>
@@ -3296,10 +3336,6 @@
<translation>Aktiverer bedste kรฆdeโ€ฆ</translation>
</message>
<message>
- <source>Always relay transactions received from whitelisted peers (default: %d)</source>
- <translation>Videresend altid transaktioner, der modtages fra hvidlistede knuder (standard: %d)</translation>
- </message>
- <message>
<source>Attempt to recover private keys from a corrupt wallet.dat on startup</source>
<translation>Forsรธg at genskabe private nรธgler fra en รธdelagt wallet.dat under opstart</translation>
</message>
@@ -3425,7 +3461,7 @@
</message>
<message>
<source>Tor control port to use if onion listening enabled (default: %s)</source>
- <translation>Tor kontrolport, der skal bruges, hvis onion-lytning er slรฅet til (standard: %s)</translation>
+ <translation>Tor kontrolport, der skal bruges, hvis onion-lytning er aktiveret (standard: %s)</translation>
</message>
<message>
<source>Transaction amount too small</source>
@@ -3464,6 +3500,10 @@
<translation>Advarsel</translation>
</message>
<message>
+ <source>Warning: unknown new rules activated (versionbit %i)</source>
+ <translation>Advarsel: Ukendte nye regler aktiveret (versionsbit %i)</translation>
+ </message>
+ <message>
<source>Whether to operate in a blocks only mode (default: %u)</source>
<translation>Hvorvidt der skal arbejdes i kun-blokke-tilstand (standard: %u)</translation>
</message>
diff --git a/src/qt/locale/bitcoin_de.ts b/src/qt/locale/bitcoin_de.ts
index 84de80aff5..947a471acd 100644
--- a/src/qt/locale/bitcoin_de.ts
+++ b/src/qt/locale/bitcoin_de.ts
@@ -892,7 +892,7 @@
</message>
<message>
<source>Set language, for example "de_DE" (default: system locale)</source>
- <translation>Sprache einstellen, zum Beispiel "de_DE" (default: system locale)</translation>
+ <translation>Sprache einstellen, zum Beispiel "de_DE" (Standard: Systemgebietsschema)</translation>
</message>
<message>
<source>Start minimized</source>
@@ -1474,10 +1474,6 @@
<translation>Allgemein</translation>
</message>
<message>
- <source>Using OpenSSL version</source>
- <translation>Verwendete OpenSSL-Version</translation>
- </message>
- <message>
<source>Using BerkeleyDB version</source>
<translation>Verwendete BerkeleyDB-Version</translation>
</message>
@@ -2928,6 +2924,10 @@
<translation>Kommandozeilen- und JSON-RPC-Befehle annehmen</translation>
</message>
<message>
+ <source>If &lt;category&gt; is not supplied or if &lt;category&gt; = 1, output all debugging information.</source>
+ <translation>Wenn &lt;category&gt; nicht angegeben wird oder &lt;category&gt;=1, jegliche Debugginginformationen ausgeben.</translation>
+ </message>
+ <message>
<source>Maximum total fees (in %s) to use in a single wallet 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>
@@ -2936,10 +2936,22 @@
<translation>Bitte korrigieren Sie die Datums- und Uhrzeiteinstellungen Ihres Computers, da Bitcoin Core ansonsten nicht ordnungsgemรครŸ funktionieren wird.</translation>
</message>
<message>
+ <source>Prune configured below the minimum of %d MiB. Please use a higher number.</source>
+ <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, &gt;%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, &gt;%u = ZielgrรถรŸe in MiB, die fรผr Blockdateien verwendet werden darf)</translation>
+ </message>
+ <message>
<source>Error: A fatal internal error occurred, see debug.log for details</source>
<translation>Fehler: Ein schwerer interner Fehler ist aufgetreten, siehe debug.log fรผr Details.</translation>
</message>
<message>
+ <source>Fee (in %s/kB) to add to transactions you send (default: %s)</source>
+ <translation>Gebรผhr (in %s/kB), die von Ihnen gesendeten Transaktionen hinzugefรผgt wird (Standard: %s)</translation>
+ </message>
+ <message>
<source>Pruning blockstore...</source>
<translation>Kรผrze Blockspeicher...</translation>
</message>
@@ -2956,6 +2968,14 @@
<translation>Eingehende Verbindungen annehmen (Standard: 1, wenn nicht -proxy oder -connect)</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>
+ </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>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>
@@ -2972,10 +2992,18 @@
<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>
+ </message>
+ <message>
<source>Set the number of script verification threads (%u to %d, 0 = auto, &lt;0 = leave that many cores free, default: %d)</source>
<translation>Maximale Anzahl an Skript-Verifizierungs-Threads festlegen (%u bis %d, 0 = automatisch, &lt;0 = so viele Kerne frei lassen, Standard: %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>Die Block-Datenbank enthรคlt einen Block, der in der Zukunft auftaucht. Dies kann daran liegen, dass die Systemzeit Ihres Computers falsch eingestellt ist. Stellen Sie die Block-Datenbank nur wieder her, wenn Sie sich sicher sind, dass Ihre Systemzeit korrekt eingestellt ist.</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>Dies ist eine Vorab-Testversion - Verwendung auf eigene Gefahr - nicht fรผr Mining- oder Handelsanwendungen nutzen!</translation>
</message>
@@ -2984,6 +3012,14 @@
<translation>Kann auf diesem Computer nicht an %s binden, da Bitcoin Core wahrscheinlich bereits gestartet wurde.</translation>
</message>
<message>
+ <source>Unsupported argument -whitelistalwaysrelay ignored, use -whitelistrelay and/or -whitelistforcerelay.</source>
+ <translation>Das Argument -whitelistalwaysrelay wird nicht unterstรผtzt und deswegen ignoriert. Benutze -whitelistrelay und/oder -whitelistforcerelay.</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>WARNING: abnormally high number of blocks generated, %d blocks received in the last %d hours (%d expected)</source>
<translation>Warnung: Es wurde eine ungewรถhnlich hohe Anzahl Blรถcke erzeugt, %d Blรถcke wurden in den letzten %d Stunden empfangen (%d wurden erwartet).</translation>
</message>
@@ -2996,6 +3032,10 @@
<translation>Warnung: Das Netzwerk scheint nicht vollstรคndig รผbereinzustimmen! Einige Miner scheinen Probleme zu haben.</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>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>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>
@@ -3016,6 +3056,10 @@
<translation>&lt;category&gt; kann sein:</translation>
</message>
<message>
+ <source>Append comment to the user agent string</source>
+ <translation>Hรคnge ein Kommentar zur User Agent-Zeichenkette an</translation>
+ </message>
+ <message>
<source>Block creation options:</source>
<translation>Blockerzeugungsoptionen:</translation>
</message>
@@ -3056,6 +3100,10 @@
<translation>Aktiviere das Verรถffentlichen des Raw-Blocks in &lt;address&gt;</translation>
</message>
<message>
+ <source>Enable publish raw transaction in &lt;address&gt;</source>
+ <translation>Aktiviere das Verรถffentlichen der Roh-Transaktion in &lt;address&gt;</translation>
+ </message>
+ <message>
<source>Error initializing block database</source>
<translation>Fehler beim Initialisieren der Blockdatenbank</translation>
</message>
@@ -3092,6 +3140,18 @@
<translation>Ungรผltige "-onion"-Adresse: '%s'</translation>
</message>
<message>
+ <source>Invalid amount for -fallbackfee=&lt;amount&gt;: '%s'</source>
+ <translation>Ungรผltiger Betrag fรผr -fallbackfee=&lt;amount&gt;: '%s'</translation>
+ </message>
+ <message>
+ <source>Keep the transaction memory pool below &lt;n&gt; megabytes (default: %u)</source>
+ <translation>Halten Sie den Transaktionsspeicherpool unter &lt;n&gt; Megabytes (Voreinstellung: %u)</translation>
+ </message>
+ <message>
+ <source>Location of the auth cookie (default: data dir)</source>
+ <translation>Dateiort fรผr das Auth-Cookie (Standard: Datenverzeichnis)</translation>
+ </message>
+ <message>
<source>Not enough file descriptors available.</source>
<translation>Nicht genรผgend Datei-Deskriptoren verfรผgbar.</translation>
</message>
@@ -3100,6 +3160,10 @@
<translation>Nur zu Knoten des Netzwerktyps &lt;net&gt; verbinden (ipv4, ipv6 oder onion)</translation>
</message>
<message>
+ <source>Print version and exit</source>
+ <translation>Gibt die Versionsnummer aus und beendet das Programm</translation>
+ </message>
+ <message>
<source>Prune cannot be configured with a negative value.</source>
<translation>Kรผrzungsmodus kann nicht mit einem negativen Wert konfiguriert werden.</translation>
</message>
@@ -3136,6 +3200,10 @@
<translation>UPnP verwenden, um eine Portweiterleitung einzurichten (Standard: %u)</translation>
</message>
<message>
+ <source>User Agent comment (%s) contains unsafe characters.</source>
+ <translation>Der User Agent Kommentar (%s) enthรคlt unsichere Zeichen.</translation>
+ </message>
+ <message>
<source>Verifying blocks...</source>
<translation>Verifiziere Blรถcke...</translation>
</message>
@@ -3152,10 +3220,6 @@
<translation>Wallet-Optionen:</translation>
</message>
<message>
- <source>Warning: This version is obsolete; upgrade required!</source>
- <translation>Warnung: Diese Version is veraltet, Aktualisierung erforderlich!</translation>
- </message>
- <message>
<source>You need to rebuild the database using -reindex to change -txindex</source>
<translation>Sie mรผssen die Datenbank mit Hilfe von -reindex neu aufbauen, um -txindex zu verรคndern</translation>
</message>
@@ -3192,6 +3256,10 @@
<translation>Befehl ausfรผhren wenn ein relevanter Alarm empfangen wird oder wir einen wirklich langen Fork entdecken (%s im Befehl wird durch die Nachricht ersetzt)</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>Niedrigere Gebรผhren (in %s/Kb) als diese werden bei der Transaktionserstellung als gebรผhrenfrei angesehen (Standard: %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>Wenn -paytxfee nicht festgelegt wurde Gebรผhren einschlieรŸen, so dass mit der Bestรคtigung von Transaktionen im Schnitt innerhalb von n Blรถcken begonnen wird (Standard: %u)</translation>
</message>
@@ -3332,6 +3400,10 @@
<translation>P2P-Netzwerk-Alarme empfangen und anzeigen (Standard: %u)</translation>
</message>
<message>
+ <source>Reducing -maxconnections from %d to %d, because of system limitations.</source>
+ <translation>Reduziere -maxconnections von %d zu %d, aufgrund von Systemlimitierungen.</translation>
+ </message>
+ <message>
<source>Rescan the block chain for missing wallet transactions on startup</source>
<translation>Blockkette beim Starten erneut nach fehlenden Wallet-Transaktionen durchsuchen</translation>
</message>
@@ -3408,6 +3480,10 @@
<translation>Warnung</translation>
</message>
<message>
+ <source>Warning: unknown new rules activated (versionbit %i)</source>
+ <translation>Warnung: Unbekannte neue Regeln aktiviert (Versionsbit %i)</translation>
+ </message>
+ <message>
<source>Whether to operate in a blocks only mode (default: %u)</source>
<translation>Legt fest ob nur Blรถcke Modus aktiv sein soll (Standard: %u)</translation>
</message>
@@ -3468,6 +3544,10 @@
<translation>Lesen von wallet.dat fehlgeschlagen! Alle Schlรผssel wurden korrekt gelesen, Transaktionsdaten bzw. Adressbucheintrรคge fehlen aber mรถglicherweise oder sind inkorrekt.</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>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>
@@ -3484,6 +3564,10 @@
<translation>Debugginginformationen ausgeben (Standard: %u, &lt;category&gt; anzugeben ist optional)</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>
+ <message>
<source>Tries to keep outbound traffic under the given target (in MiB per 24h), 0 = no limit (default: %d)</source>
<translation>Versucht ausgehenden Datenverkehr unter dem gegebenen Wert zu halten (in MiB pro 24h), 0 = kein Limit (default: %d)</translation>
</message>
@@ -3496,6 +3580,10 @@
<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 &lt;userpw&gt; comes in the format: &lt;USERNAME&gt;:&lt;SALT&gt;$&lt;HASH&gt;. 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 &lt;userpw&gt; kommt im Format: &lt;USERNAME&gt;:&lt;SALT&gt;$&lt;HASH&gt;. Ein kanonisches Pythonskript ist in share/rpcuser inbegriffen. Diese Option kann mehrere Male spezifiziert werden</translation>
+ </message>
+ <message>
<source>(default: %s)</source>
<translation>(Standard: %s)</translation>
</message>
diff --git a/src/qt/locale/bitcoin_el_GR.ts b/src/qt/locale/bitcoin_el_GR.ts
index 90c27c4394..b5fb22f973 100644
--- a/src/qt/locale/bitcoin_el_GR.ts
+++ b/src/qt/locale/bitcoin_el_GR.ts
@@ -169,6 +169,11 @@
<translation>ฮ•ฮฏฯƒฯ„ฮต ฯƒฮฏฮณฮฟฯ…ฯฮฟฮน ฯŒฯ„ฮน ฮธฮญฮปฮตฯ„ฮต ฮฝฮฑ ฮบฯฯ…ฯ€ฯ„ฮฟฮณฯฮฑฯ†ฮฎฯƒฮตฯ„ฮต ฯ„ฮฟ ฯ€ฮฟฯฯ„ฮฟฯ†ฯŒฮปฮน ฯƒฮฑฯ‚;</translation>
</message>
<message>
+ <source>Bitcoin Core 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>ฮคฮฟ Bitcoin Core ฮธฮฑ ฮบฮปฮตฮนฯƒฮตฮน ฯ„ฯŽฯฮฑ ฮณฮนฮฑ ฮฝฮฑ ฯ„ฮตฮปฮตฮนฯŽฯƒฮตฮน ฯ„ฮทฮฝ ฮดฮนฮฑฮดฮนฮบฮฑฯƒฮฏฮฑ ฮบฯฯ…ฯ€ฯ„ฮฟฮณฯฮฌฯ†ฮทฯƒฮทฯ‚. ฮ˜ฯ…ฮผฮฎฯƒฮฟฯ… ฯŒฯ„ฮน ฮบฯฯ…ฯ€ฯ„ฮฟฮณฯฮฑฯ†ฯŽฮฝฯ„ฮฑฯ‚ ฯ„ฮฟ ฯ€ฮฟฯฯ„ฮฟฯ†ฯŒฮปฮน ฯƒฮฟฯ… ฮดฮตฮฝ ฮผฯ€ฮฟฯฮตฮฏฯ‚ ฮฝฮฑ ฯ€ฯฮฟฯƒฯ„ฮฑฯ„ฮญฯˆฮตฮนฯ‚ ฯ€ฮปฮฎฯฯ‰ฯ‚ ฯ„ฮฑ bitcoins ฯƒฮฟฯ… ฮฑฯ€ฯŒ ฮบฮปฮฟฯ€ฮฎ ฯƒฯ„ฮทฮฝ ฯ€ฮตฯฮฏฯ€ฯ„ฯ‰ฯƒฮท ฯ€ฮฟฯ… ฮผฮฟฮปฯ…ฮฝฮธฮตฮฏ ฮฟ ฯ…ฯ€ฮฟฮปฮฟฮณฮนฯƒฯ„ฮฎฯ‚ ฯƒฮฟฯ… ฮผฮต ฮบฮฑฮบฯŒฮฒฮฟฯ…ฮปฮฟ ฮปฮฟฮณฮนฯƒฮผฮนฮบฯŒ.
+</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>
@@ -185,6 +190,10 @@
<translation>ฮ•ฮนฯƒฮฌฮณฮตฯ„ฮต ฯ„ฮฟฮฝ ฮฝฮญฮฟ ฮบฯ‰ฮดฮนฮบฯŒ ฯ€ฯฯŒฯƒฮฒฮฑฯƒฮทฯ‚ ฯƒฯ„ฮฟฮฝ ฯ€ฮฟฯฯ„ฮฟฯ†ฯŒฮปฮน &lt;br/&gt; ฮ ฮฑฯฮฑฮบฮฑฮปฯŽ ฯ‡ฯฮทฯƒฮนฮผฮฟฯ€ฮฟฮนฮตฮฏฯƒฯ„ฮต ฮญฮฝฮฑ ฮบฯ‰ฮดฮนฮบฯŒ ฮผฮต &lt;b&gt; 10 ฮฎ ฯ€ฮตฯฮนฯƒฯƒฯŒฯ„ฮตฯฮฟฯ…ฯ‚ ฯ„ฯ…ฯ‡ฮฑฮฏฮฟฯ…ฯ‚ ฯ‡ฮฑฯฮฑฮบฯ„ฮฎฯฮตฯ‚&lt;/b&gt; ฮฎ &lt;b&gt; ฮฟฯ‡ฯ„ฯŽ ฮฎ ฯ€ฮฑฯฮฑฯ€ฮฌฮฝฯ‰ ฮปฮญฮพฮตฮนฯ‚&lt;/b&gt;.</translation>
</message>
<message>
+ <source>Enter the old passphrase and new passphrase to the wallet.</source>
+ <translation>ฮ ฮปฮทฮบฯ„ฯฮฟฮปฯŒฮณฮทฯƒฮต ฯ„ฮฟฮฝ ฯ€ฮฑฮปฮนฯŒ ฮบฮฑฮน ฯ„ฮฟฮฝ ฮฝฮญฮฟ ฮบฯ‰ฮดฮนฮบฯŒ ฯƒฯ„ฮฟ ฯ€ฮฟฯฯ„ฮฟฯ†ฮฟฮปฮน.</translation>
+ </message>
+ <message>
<source>Wallet encryption failed</source>
<translation>ฮ— ฮบฯฯ…ฯ€ฯ„ฮฟฮณฯฮฑฯ†ฮทฯƒฮท ฯ„ฮฟฯ… ฯ€ฮฟฯฯ„ฮฟฯ†ฮฟฮปฮนฮฟฯ ฮฑฯ€ฮญฯ„ฯ…ฯ‡ฮต</translation>
</message>
@@ -1325,10 +1334,6 @@
<translation>ฮ“ฮตฮฝฮนฮบฮฌ</translation>
</message>
<message>
- <source>Using OpenSSL version</source>
- <translation>ฮงฯฮทฯƒฮนฮผฮฟฯ€ฮฟฮนฮทฯƒฮท ฯ„ฮทฯ‚ OpenSSL ฮตฮบฮดฮฟฯƒฮทฯ‚</translation>
- </message>
- <message>
<source>Using BerkeleyDB version</source>
<translation>ฮงฯฮฎฯƒฮท BerkeleyDB ฮญฮบฮดฮฟฯƒฮทฯ‚</translation>
</message>
diff --git a/src/qt/locale/bitcoin_en.ts b/src/qt/locale/bitcoin_en.ts
index b90221f2c2..4e4c9f45e6 100644
--- a/src/qt/locale/bitcoin_en.ts
+++ b/src/qt/locale/bitcoin_en.ts
@@ -34,12 +34,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../addressbookpage.cpp" line="+80"/>
- <source>&amp;Copy Address</source>
- <translation>&amp;Copy Address</translation>
- </message>
- <message>
- <location filename="../forms/addressbookpage.ui" line="-53"/>
+ <location line="-53"/>
<source>Delete the currently selected address from the list</source>
<translation>Delete the currently selected address from the list</translation>
</message>
@@ -58,89 +53,6 @@
<source>&amp;Delete</source>
<translation>&amp;Delete</translation>
</message>
- <message>
- <location filename="../addressbookpage.cpp" line="-30"/>
- <source>Choose the address to send coins to</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Choose the address to receive coins with</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+5"/>
- <source>C&amp;hoose</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+6"/>
- <source>Sending addresses</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Receiving addresses</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+7"/>
- <source>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source>
- <translation>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</translation>
- </message>
- <message>
- <location line="+4"/>
- <source>These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+7"/>
- <source>Copy &amp;Label</source>
- <translation>Copy &amp;Label</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>&amp;Edit</source>
- <translation>&amp;Edit</translation>
- </message>
- <message>
- <location line="+193"/>
- <source>Export Address List</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Comma separated file (*.csv)</source>
- <translation>Comma separated file (*.csv)</translation>
- </message>
- <message>
- <location line="+13"/>
- <source>Exporting Failed</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>There was an error trying to save the address list to %1. Please try again.</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
-<context>
- <name>AddressTableModel</name>
- <message>
- <location filename="../addresstablemodel.cpp" line="+170"/>
- <source>Label</source>
- <translation>Label</translation>
- </message>
- <message>
- <location line="+0"/>
- <source>Address</source>
- <translation>Address</translation>
- </message>
- <message>
- <location line="+36"/>
- <source>(no label)</source>
- <translation>(no label)</translation>
- </message>
</context>
<context>
<name>AskPassphraseDialog</name>
@@ -164,124 +76,6 @@
<source>Repeat new passphrase</source>
<translation>Repeat new passphrase</translation>
</message>
- <message>
- <location filename="../askpassphrasedialog.cpp" line="+49"/>
- <source>Encrypt wallet</source>
- <translation>Encrypt wallet</translation>
- </message>
- <message>
- <location line="+3"/>
- <source>This operation needs your wallet passphrase to unlock the wallet.</source>
- <translation>This operation needs your wallet passphrase to unlock the wallet.</translation>
- </message>
- <message>
- <location line="+5"/>
- <source>Unlock wallet</source>
- <translation>Unlock wallet</translation>
- </message>
- <message>
- <location line="+3"/>
- <source>This operation needs your wallet passphrase to decrypt the wallet.</source>
- <translation>This operation needs your wallet passphrase to decrypt the wallet.</translation>
- </message>
- <message>
- <location line="+5"/>
- <source>Decrypt wallet</source>
- <translation>Decrypt wallet</translation>
- </message>
- <message>
- <location line="+3"/>
- <source>Change passphrase</source>
- <translation>Change passphrase</translation>
- </message>
- <message>
- <location line="+45"/>
- <source>Confirm wallet encryption</source>
- <translation>Confirm wallet encryption</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Warning: If you encrypt your wallet and lose your passphrase, you will &lt;b&gt;LOSE ALL OF YOUR BITCOINS&lt;/b&gt;!</source>
- <translation>Warning: If you encrypt your wallet and lose your passphrase, you will &lt;b&gt;LOSE ALL OF YOUR BITCOINS&lt;/b&gt;!</translation>
- </message>
- <message>
- <location line="+0"/>
- <source>Are you sure you wish to encrypt your wallet?</source>
- <translation>Are you sure you wish to encrypt your wallet?</translation>
- </message>
- <message>
- <location line="+15"/>
- <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: 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.</translation>
- </message>
- <message>
- <location line="+100"/>
- <location line="+24"/>
- <source>Warning: The Caps Lock key is on!</source>
- <translation>Warning: The Caps Lock key is on!</translation>
- </message>
- <message>
- <location line="-130"/>
- <location line="+58"/>
- <source>Wallet encrypted</source>
- <translation>Wallet encrypted</translation>
- </message>
- <message>
- <location line="-135"/>
- <source>Enter the new passphrase to the wallet.&lt;br/&gt;Please use a passphrase of &lt;b&gt;ten or more random characters&lt;/b&gt;, or &lt;b&gt;eight or more words&lt;/b&gt;.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+23"/>
- <source>Enter the old passphrase and new passphrase to the wallet.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+56"/>
- <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 type="unfinished"></translation>
- </message>
- <message>
- <location line="+13"/>
- <location line="+7"/>
- <location line="+42"/>
- <location line="+6"/>
- <source>Wallet encryption failed</source>
- <translation>Wallet encryption failed</translation>
- </message>
- <message>
- <location line="-54"/>
- <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source>
- <translation>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</translation>
- </message>
- <message>
- <location line="+7"/>
- <location line="+48"/>
- <source>The supplied passphrases do not match.</source>
- <translation>The supplied passphrases do not match.</translation>
- </message>
- <message>
- <location line="-37"/>
- <source>Wallet unlock failed</source>
- <translation>Wallet unlock failed</translation>
- </message>
- <message>
- <location line="+1"/>
- <location line="+11"/>
- <location line="+19"/>
- <source>The passphrase entered for the wallet decryption was incorrect.</source>
- <translation>The passphrase entered for the wallet decryption was incorrect.</translation>
- </message>
- <message>
- <location line="-20"/>
- <source>Wallet decryption failed</source>
- <translation>Wallet decryption failed</translation>
- </message>
- <message>
- <location line="+14"/>
- <source>Wallet passphrase was successfully changed.</source>
- <translation>Wallet passphrase was successfully changed.</translation>
- </message>
</context>
<context>
<name>BanTableModel</name>
@@ -795,189 +589,6 @@
<source>Priority</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../coincontroldialog.cpp" line="+47"/>
- <source>Copy address</source>
- <translation type="unfinished">Copy address</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Copy label</source>
- <translation type="unfinished">Copy label</translation>
- </message>
- <message>
- <location line="+1"/>
- <location line="+26"/>
- <source>Copy amount</source>
- <translation type="unfinished">Copy amount</translation>
- </message>
- <message>
- <location line="-25"/>
- <source>Copy transaction ID</source>
- <translation type="unfinished">Copy transaction ID</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Lock unspent</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Unlock unspent</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+22"/>
- <source>Copy quantity</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+2"/>
- <source>Copy fee</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Copy after fee</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Copy bytes</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Copy priority</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Copy dust</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Copy change</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+349"/>
- <source>highest</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>higher</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>high</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>medium-high</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>medium</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>low-medium</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>low</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>lower</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>lowest</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+10"/>
- <source>(%1 locked)</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+28"/>
- <source>none</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+161"/>
- <source>This label turns red if the transaction size is greater than 1000 bytes.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+5"/>
- <source>This label turns red if the priority is smaller than &quot;medium&quot;.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+12"/>
- <source>Can vary +/- %1 satoshi(s) per input.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="-33"/>
- <source>yes</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+0"/>
- <source>no</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+17"/>
- <location line="+5"/>
- <source>This means a fee of at least %1 per kB is required.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="-4"/>
- <source>Can vary +/- 1 byte per input.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+2"/>
- <source>Transactions with higher priority are more likely to get included into a block.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+4"/>
- <source>This label turns red if any recipient receives an amount smaller than the current dust threshold.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+55"/>
- <location line="+60"/>
- <source>(no label)</source>
- <translation type="unfinished">(no label)</translation>
- </message>
- <message>
- <location line="-7"/>
- <source>change from %1 (%2)</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>(change)</source>
- <translation type="unfinished"></translation>
- </message>
</context>
<context>
<name>EditAddressDialog</name>
@@ -1006,46 +617,6 @@
<source>&amp;Address</source>
<translation>&amp;Address</translation>
</message>
- <message>
- <location filename="../editaddressdialog.cpp" line="+28"/>
- <source>New receiving address</source>
- <translation>New receiving address</translation>
- </message>
- <message>
- <location line="+4"/>
- <source>New sending address</source>
- <translation>New sending address</translation>
- </message>
- <message>
- <location line="+3"/>
- <source>Edit receiving address</source>
- <translation>Edit receiving address</translation>
- </message>
- <message>
- <location line="+4"/>
- <source>Edit sending address</source>
- <translation>Edit sending address</translation>
- </message>
- <message>
- <location line="+76"/>
- <source>The entered address &quot;%1&quot; is already in the address book.</source>
- <translation>The entered address &quot;%1&quot; is already in the address book.</translation>
- </message>
- <message>
- <location line="-5"/>
- <source>The entered address &quot;%1&quot; is not a valid Bitcoin address.</source>
- <translation>The entered address &quot;%1&quot; is not a valid Bitcoin address.</translation>
- </message>
- <message>
- <location line="+10"/>
- <source>Could not unlock wallet.</source>
- <translation>Could not unlock wallet.</translation>
- </message>
- <message>
- <location line="+5"/>
- <source>New key generation failed.</source>
- <translation>New key generation failed.</translation>
- </message>
</context>
<context>
<name>FreespaceChecker</name>
@@ -1225,11 +796,6 @@
<source>Select payment request file</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../openuridialog.cpp" line="+47"/>
- <source>Select payment request file to open</source>
- <translation type="unfinished"></translation>
- </message>
</context>
<context>
<name>OptionsDialog</name>
@@ -1627,132 +1193,6 @@
</message>
</context>
<context>
- <name>PaymentServer</name>
- <message>
- <location filename="../paymentserver.cpp" line="+432"/>
- <location line="+14"/>
- <location line="+7"/>
- <source>URI handling</source>
- <translation type="unfinished">URI handling</translation>
- </message>
- <message>
- <location line="-7"/>
- <source>Invalid payment address %1</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+83"/>
- <location line="+9"/>
- <location line="+31"/>
- <location line="+10"/>
- <location line="+17"/>
- <location line="+88"/>
- <source>Payment request rejected</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="-155"/>
- <source>Payment request network doesn&apos;t match client network.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+15"/>
- <source>Payment request is not initialized.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+42"/>
- <source>Requested payment amount of %1 is too small (considered dust).</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="-258"/>
- <location line="+216"/>
- <location line="+42"/>
- <location line="+113"/>
- <location line="+14"/>
- <location line="+18"/>
- <source>Payment request error</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="-402"/>
- <source>Cannot start bitcoin: click-to-pay handler</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+104"/>
- <source>Payment request fetch URL is invalid: %1</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+21"/>
- <source>URI cannot be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+13"/>
- <source>Payment request file handling</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Payment request file cannot be read! This can be caused by an invalid payment request file.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+70"/>
- <source>Payment request expired.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+32"/>
- <source>Unverified payment requests to custom payment scripts are unsupported.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+9"/>
- <location line="+17"/>
- <source>Invalid payment request.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+45"/>
- <source>Refund from %1</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+44"/>
- <source>Payment request %1 is too large (%2 bytes, allowed %3 bytes).</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+9"/>
- <source>Error communicating with %1: %2</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+20"/>
- <source>Payment request cannot be parsed!</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+13"/>
- <source>Bad response from server %1</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+33"/>
- <source>Payment acknowledged</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="-11"/>
- <source>Network request error</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
-<context>
<name>PeerTableModel</name>
<message>
<location filename="../peertablemodel.cpp" line="+117"/>
@@ -1820,29 +1260,6 @@
</message>
</context>
<context>
- <name>QRImageWidget</name>
- <message>
- <location filename="../receiverequestdialog.cpp" line="+36"/>
- <source>&amp;Save Image...</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+3"/>
- <source>&amp;Copy Image</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+32"/>
- <source>Save QR Code</source>
- <translation type="unfinished">Save QR Code</translation>
- </message>
- <message>
- <location line="+0"/>
- <source>PNG Image (*.png)</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
-<context>
<name>RPCConsole</name>
<message>
<location filename="../forms/debugwindow.ui" line="+46"/>
@@ -2338,21 +1755,6 @@
<source>Remove</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../receivecoinsdialog.cpp" line="+46"/>
- <source>Copy label</source>
- <translation type="unfinished">Copy label</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Copy message</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Copy amount</source>
- <translation type="unfinished">Copy amount</translation>
- </message>
</context>
<context>
<name>ReceiveRequestDialog</name>
@@ -2376,95 +1778,11 @@
<source>&amp;Save Image...</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../receiverequestdialog.cpp" line="+65"/>
- <source>Request payment to %1</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+6"/>
- <source>Payment information</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>URI</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+2"/>
- <source>Address</source>
- <translation type="unfinished">Address</translation>
- </message>
- <message>
- <location line="+2"/>
- <source>Amount</source>
- <translation type="unfinished">Amount</translation>
- </message>
- <message>
- <location line="+2"/>
- <source>Label</source>
- <translation type="unfinished">Label</translation>
- </message>
- <message>
- <location line="+2"/>
- <source>Message</source>
- <translation type="unfinished">Message</translation>
- </message>
- <message>
- <location line="+10"/>
- <source>Resulting URI too long, try to reduce the text for label / message.</source>
- <translation type="unfinished">Resulting URI too long, try to reduce the text for label / message.</translation>
- </message>
- <message>
- <location line="+5"/>
- <source>Error encoding URI into QR Code.</source>
- <translation type="unfinished">Error encoding URI into QR Code.</translation>
- </message>
-</context>
-<context>
- <name>RecentRequestsTableModel</name>
- <message>
- <location filename="../recentrequeststablemodel.cpp" line="+29"/>
- <source>Date</source>
- <translation type="unfinished">Date</translation>
- </message>
- <message>
- <location line="+0"/>
- <source>Label</source>
- <translation type="unfinished">Label</translation>
- </message>
- <message>
- <location line="+0"/>
- <source>Message</source>
- <translation type="unfinished">Message</translation>
- </message>
- <message>
- <location line="+57"/>
- <source>(no amount requested)</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+42"/>
- <source>Requested</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="-59"/>
- <source>(no label)</source>
- <translation type="unfinished">(no label)</translation>
- </message>
- <message>
- <location line="+9"/>
- <source>(no message)</source>
- <translation type="unfinished"></translation>
- </message>
</context>
<context>
<name>SendCoinsDialog</name>
<message>
<location filename="../forms/sendcoinsdialog.ui" line="+14"/>
- <location filename="../sendcoinsdialog.cpp" line="+543"/>
<source>Send Coins</source>
<translation>Send Coins</translation>
</message>
@@ -2650,152 +1968,6 @@
<source>S&amp;end</source>
<translation>S&amp;end</translation>
</message>
- <message>
- <location filename="../sendcoinsdialog.cpp" line="-226"/>
- <source>Confirm send coins</source>
- <translation>Confirm send coins</translation>
- </message>
- <message>
- <location line="-49"/>
- <location line="+5"/>
- <location line="+5"/>
- <location line="+4"/>
- <source>%1 to %2</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="-215"/>
- <source>Copy quantity</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Copy amount</source>
- <translation type="unfinished">Copy amount</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Copy fee</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Copy after fee</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Copy bytes</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Copy priority</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+2"/>
- <source>Copy change</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+238"/>
- <source>Total Amount %1</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+3"/>
- <source>or</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+196"/>
- <source>The amount to pay must be larger than 0.</source>
- <translation>The amount to pay must be larger than 0.</translation>
- </message>
- <message>
- <location line="+3"/>
- <source>The amount exceeds your balance.</source>
- <translation>The amount exceeds your balance.</translation>
- </message>
- <message>
- <location line="+3"/>
- <source>The total exceeds your balance when the %1 transaction fee is included.</source>
- <translation>The total exceeds your balance when the %1 transaction fee is included.</translation>
- </message>
- <message>
- <location line="+6"/>
- <source>Transaction creation failed!</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+4"/>
- <source>The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+4"/>
- <source>A fee higher than %1 is considered an absurdly high fee.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+3"/>
- <source>Payment request expired.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+89"/>
- <source>Pay only the required fee of %1</source>
- <translation type="unfinished"></translation>
- </message>
- <message numerus="yes">
- <location line="+25"/>
- <source>Estimated to begin confirmation within %n block(s).</source>
- <translation type="unfinished">
- <numerusform>Estimated to begin confirmation within %n block.</numerusform>
- <numerusform>Estimated to begin confirmation within %n blocks.</numerusform>
- </translation>
- </message>
- <message>
- <location line="-140"/>
- <source>The recipient address is not valid. Please recheck.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+12"/>
- <source>Duplicate address found: addresses should only be used once each.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+234"/>
- <source>Warning: Invalid Bitcoin address</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+19"/>
- <source>(no label)</source>
- <translation type="unfinished">(no label)</translation>
- </message>
- <message>
- <location line="-11"/>
- <source>Warning: Unknown change address</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="-689"/>
- <source>Copy dust</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+215"/>
- <source>Are you sure you want to send?</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+9"/>
- <source>added as transaction fee</source>
- <translation type="unfinished"></translation>
- </message>
</context>
<context>
<name>SendCoinsEntry</name>
@@ -2812,12 +1984,7 @@
<translation>Pay &amp;To:</translation>
</message>
<message>
- <location filename="../sendcoinsentry.cpp" line="+37"/>
- <source>Enter a label for this address to add it to your address book</source>
- <translation>Enter a label for this address to add it to your address book</translation>
- </message>
- <message>
- <location filename="../forms/sendcoinsentry.ui" line="+93"/>
+ <location line="+93"/>
<source>&amp;Label:</source>
<translation>&amp;Label:</translation>
</message>
@@ -2907,15 +2074,6 @@
</message>
</context>
<context>
- <name>SendConfirmationDialog</name>
- <message>
- <location filename="../sendcoinsdialog.cpp" line="+571"/>
- <location line="+5"/>
- <source>Yes</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
-<context>
<name>ShutdownWindow</name>
<message>
<location filename="../utilitydialog.cpp" line="+78"/>
@@ -3038,77 +2196,6 @@
<source>Reset all verify message fields</source>
<translation>Reset all verify message fields</translation>
</message>
- <message>
- <location filename="../signverifymessagedialog.cpp" line="+41"/>
- <source>Click &quot;Sign Message&quot; to generate signature</source>
- <translation>Click &quot;Sign Message&quot; to generate signature</translation>
- </message>
- <message>
- <location line="+83"/>
- <location line="+80"/>
- <source>The entered address is invalid.</source>
- <translation>The entered address is invalid.</translation>
- </message>
- <message>
- <location line="-80"/>
- <location line="+8"/>
- <location line="+72"/>
- <location line="+8"/>
- <source>Please check the address and try again.</source>
- <translation>Please check the address and try again.</translation>
- </message>
- <message>
- <location line="-80"/>
- <location line="+80"/>
- <source>The entered address does not refer to a key.</source>
- <translation>The entered address does not refer to a key.</translation>
- </message>
- <message>
- <location line="-72"/>
- <source>Wallet unlock was cancelled.</source>
- <translation>Wallet unlock was cancelled.</translation>
- </message>
- <message>
- <location line="+8"/>
- <source>Private key for the entered address is not available.</source>
- <translation>Private key for the entered address is not available.</translation>
- </message>
- <message>
- <location line="+12"/>
- <source>Message signing failed.</source>
- <translation>Message signing failed.</translation>
- </message>
- <message>
- <location line="+5"/>
- <source>Message signed.</source>
- <translation>Message signed.</translation>
- </message>
- <message>
- <location line="+58"/>
- <source>The signature could not be decoded.</source>
- <translation>The signature could not be decoded.</translation>
- </message>
- <message>
- <location line="+0"/>
- <location line="+13"/>
- <source>Please check the signature and try again.</source>
- <translation>Please check the signature and try again.</translation>
- </message>
- <message>
- <location line="+0"/>
- <source>The signature did not match the message digest.</source>
- <translation>The signature did not match the message digest.</translation>
- </message>
- <message>
- <location line="+7"/>
- <source>Message verification failed.</source>
- <translation>Message verification failed.</translation>
- </message>
- <message>
- <location line="+5"/>
- <source>Message verified.</source>
- <translation>Message verified.</translation>
- </message>
</context>
<context>
<name>SplashScreen</name>
@@ -3127,593 +2214,12 @@
</message>
</context>
<context>
- <name>TransactionDesc</name>
- <message>
- <location filename="../transactiondesc.cpp" line="+32"/>
- <source>Open until %1</source>
- <translation>Open until %1</translation>
- </message>
- <message>
- <location line="+8"/>
- <source>%1/offline</source>
- <translation>%1/offline</translation>
- </message>
- <message>
- <location line="+2"/>
- <source>0/unconfirmed, %1</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+0"/>
- <source>in memory pool</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+0"/>
- <source>not in memory pool</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+0"/>
- <source>abandoned</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+2"/>
- <source>%1/unconfirmed</source>
- <translation>%1/unconfirmed</translation>
- </message>
- <message>
- <location line="+2"/>
- <source>%1 confirmations</source>
- <translation>%1 confirmations</translation>
- </message>
- <message>
- <location line="+17"/>
- <source>Status</source>
- <translation>Status</translation>
- </message>
- <message numerus="yes">
- <location line="+7"/>
- <source>, broadcast through %n node(s)</source>
- <translation>
- <numerusform>, broadcast through %n node</numerusform>
- <numerusform>, broadcast through %n nodes</numerusform>
- </translation>
- </message>
- <message>
- <location line="+4"/>
- <source>Date</source>
- <translation>Date</translation>
- </message>
- <message>
- <location line="+7"/>
- <source>Source</source>
- <translation>Source</translation>
- </message>
- <message>
- <location line="+0"/>
- <source>Generated</source>
- <translation>Generated</translation>
- </message>
- <message>
- <location line="+5"/>
- <location line="+13"/>
- <location line="+72"/>
- <source>From</source>
- <translation>From</translation>
- </message>
- <message>
- <location line="-71"/>
- <location line="+20"/>
- <location line="+69"/>
- <source>To</source>
- <translation>To</translation>
- </message>
- <message>
- <location line="-87"/>
- <source>own address</source>
- <translation>own address</translation>
- </message>
- <message>
- <location line="+0"/>
- <location line="+69"/>
- <source>watch-only</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="-67"/>
- <source>label</source>
- <translation>label</translation>
- </message>
- <message>
- <location line="+34"/>
- <location line="+12"/>
- <location line="+53"/>
- <location line="+26"/>
- <location line="+54"/>
- <source>Credit</source>
- <translation>Credit</translation>
- </message>
- <message numerus="yes">
- <location line="-143"/>
- <source>matures in %n more block(s)</source>
- <translation>
- <numerusform>matures in %n more block</numerusform>
- <numerusform>matures in %n more blocks</numerusform>
- </translation>
- </message>
- <message>
- <location line="+2"/>
- <source>not accepted</source>
- <translation>not accepted</translation>
- </message>
- <message>
- <location line="+59"/>
- <location line="+25"/>
- <location line="+54"/>
- <source>Debit</source>
- <translation>Debit</translation>
- </message>
- <message>
- <location line="-69"/>
- <source>Total debit</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Total credit</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+5"/>
- <source>Transaction fee</source>
- <translation>Transaction fee</translation>
- </message>
- <message>
- <location line="+16"/>
- <source>Net amount</source>
- <translation>Net amount</translation>
- </message>
- <message>
- <location line="+6"/>
- <location line="+10"/>
- <source>Message</source>
- <translation>Message</translation>
- </message>
- <message>
- <location line="-8"/>
- <source>Comment</source>
- <translation>Comment</translation>
- </message>
- <message>
- <location line="+2"/>
- <source>Transaction ID</source>
- <translation>Transaction ID</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Output index</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+18"/>
- <source>Merchant</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+7"/>
- <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 &quot;not accepted&quot; and it won&apos;t be spendable. This may occasionally happen if another node generates a block within a few seconds of yours.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+8"/>
- <source>Debug information</source>
- <translation>Debug information</translation>
- </message>
- <message>
- <location line="+8"/>
- <source>Transaction</source>
- <translation>Transaction</translation>
- </message>
- <message>
- <location line="+3"/>
- <source>Inputs</source>
- <translation>Inputs</translation>
- </message>
- <message>
- <location line="+21"/>
- <source>Amount</source>
- <translation>Amount</translation>
- </message>
- <message>
- <location line="+1"/>
- <location line="+1"/>
- <source>true</source>
- <translation>true</translation>
- </message>
- <message>
- <location line="-1"/>
- <location line="+1"/>
- <source>false</source>
- <translation>false</translation>
- </message>
- <message>
- <location line="-243"/>
- <source>, has not been successfully broadcast yet</source>
- <translation>, has not been successfully broadcast yet</translation>
- </message>
- <message numerus="yes">
- <location line="-38"/>
- <source>Open for %n more block(s)</source>
- <translation>
- <numerusform>Open for %n more block</numerusform>
- <numerusform>Open for %n more blocks</numerusform>
- </translation>
- </message>
- <message>
- <location line="+8"/>
- <source>conflicted with a transaction with %1 confirmations</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+61"/>
- <source>unknown</source>
- <translation>unknown</translation>
- </message>
-</context>
-<context>
<name>TransactionDescDialog</name>
<message>
<location filename="../forms/transactiondescdialog.ui" line="+20"/>
<source>This pane shows a detailed description of the transaction</source>
<translation>This pane shows a detailed description of the transaction</translation>
</message>
- <message>
- <location filename="../transactiondescdialog.cpp" line="+17"/>
- <source>Details for %1</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
-<context>
- <name>TransactionTableModel</name>
- <message>
- <location filename="../transactiontablemodel.cpp" line="+246"/>
- <source>Date</source>
- <translation>Date</translation>
- </message>
- <message>
- <location line="+0"/>
- <source>Type</source>
- <translation>Type</translation>
- </message>
- <message>
- <location line="+82"/>
- <source>Immature (%1 confirmations, will be available after %2)</source>
- <translation type="unfinished"></translation>
- </message>
- <message numerus="yes">
- <location line="-24"/>
- <source>Open for %n more block(s)</source>
- <translation>
- <numerusform>Open for %n more block</numerusform>
- <numerusform>Open for %n more blocks</numerusform>
- </translation>
- </message>
- <message>
- <location line="+3"/>
- <source>Open until %1</source>
- <translation>Open until %1</translation>
- </message>
- <message>
- <location line="+15"/>
- <source>Confirmed (%1 confirmations)</source>
- <translation>Confirmed (%1 confirmations)</translation>
- </message>
- <message>
- <location line="+9"/>
- <source>This block was not received by any other nodes and will probably not be accepted!</source>
- <translation>This block was not received by any other nodes and will probably not be accepted!</translation>
- </message>
- <message>
- <location line="+3"/>
- <source>Generated but not accepted</source>
- <translation>Generated but not accepted</translation>
- </message>
- <message>
- <location line="-24"/>
- <source>Offline</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="-64"/>
- <source>Label</source>
- <translation type="unfinished">Label</translation>
- </message>
- <message>
- <location line="+67"/>
- <source>Unconfirmed</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+3"/>
- <source>Abandoned</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+3"/>
- <source>Confirming (%1 of %2 recommended confirmations)</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+6"/>
- <source>Conflicted</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+48"/>
- <source>Received with</source>
- <translation>Received with</translation>
- </message>
- <message>
- <location line="+2"/>
- <source>Received from</source>
- <translation>Received from</translation>
- </message>
- <message>
- <location line="+3"/>
- <source>Sent to</source>
- <translation>Sent to</translation>
- </message>
- <message>
- <location line="+2"/>
- <source>Payment to yourself</source>
- <translation>Payment to yourself</translation>
- </message>
- <message>
- <location line="+2"/>
- <source>Mined</source>
- <translation>Mined</translation>
- </message>
- <message>
- <location line="+28"/>
- <source>watch-only</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+15"/>
- <source>(n/a)</source>
- <translation>(n/a)</translation>
- </message>
- <message>
- <location line="+213"/>
- <source>(no label)</source>
- <translation type="unfinished">(no label)</translation>
- </message>
- <message>
- <location line="+39"/>
- <source>Transaction status. Hover over this field to show number of confirmations.</source>
- <translation>Transaction status. Hover over this field to show number of confirmations.</translation>
- </message>
- <message>
- <location line="+2"/>
- <source>Date and time that the transaction was received.</source>
- <translation>Date and time that the transaction was received.</translation>
- </message>
- <message>
- <location line="+2"/>
- <source>Type of transaction.</source>
- <translation>Type of transaction.</translation>
- </message>
- <message>
- <location line="+2"/>
- <source>Whether or not a watch-only address is involved in this transaction.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+2"/>
- <source>User-defined intent/purpose of the transaction.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+2"/>
- <source>Amount removed from or added to balance.</source>
- <translation>Amount removed from or added to balance.</translation>
- </message>
-</context>
-<context>
- <name>TransactionView</name>
- <message>
- <location filename="../transactionview.cpp" line="+69"/>
- <location line="+16"/>
- <source>All</source>
- <translation>All</translation>
- </message>
- <message>
- <location line="-15"/>
- <source>Today</source>
- <translation>Today</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>This week</source>
- <translation>This week</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>This month</source>
- <translation>This month</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Last month</source>
- <translation>Last month</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>This year</source>
- <translation>This year</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Range...</source>
- <translation>Range...</translation>
- </message>
- <message>
- <location line="+11"/>
- <source>Received with</source>
- <translation>Received with</translation>
- </message>
- <message>
- <location line="+2"/>
- <source>Sent to</source>
- <translation>Sent to</translation>
- </message>
- <message>
- <location line="+2"/>
- <source>To yourself</source>
- <translation>To yourself</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Mined</source>
- <translation>Mined</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Other</source>
- <translation>Other</translation>
- </message>
- <message>
- <location line="+6"/>
- <source>Enter address or label to search</source>
- <translation>Enter address or label to search</translation>
- </message>
- <message>
- <location line="+6"/>
- <source>Min amount</source>
- <translation>Min amount</translation>
- </message>
- <message>
- <location line="+36"/>
- <source>Abandon transaction</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Copy address</source>
- <translation>Copy address</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Copy label</source>
- <translation>Copy label</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Copy amount</source>
- <translation>Copy amount</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Copy transaction ID</source>
- <translation>Copy transaction ID</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Copy raw transaction</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Copy full transaction details</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Edit label</source>
- <translation>Edit label</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Show transaction details</source>
- <translation>Show transaction details</translation>
- </message>
- <message>
- <location line="+186"/>
- <source>Export Transaction History</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+12"/>
- <source>Watch-only</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+9"/>
- <source>Exporting Failed</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+0"/>
- <source>There was an error trying to save the transaction history to %1.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+4"/>
- <source>Exporting Successful</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+0"/>
- <source>The transaction history was successfully saved to %1.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="-24"/>
- <source>Comma separated file (*.csv)</source>
- <translation>Comma separated file (*.csv)</translation>
- </message>
- <message>
- <location line="+9"/>
- <source>Confirmed</source>
- <translation>Confirmed</translation>
- </message>
- <message>
- <location line="+3"/>
- <source>Date</source>
- <translation>Date</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Type</source>
- <translation>Type</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Label</source>
- <translation>Label</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Address</source>
- <translation>Address</translation>
- </message>
- <message>
- <location line="+2"/>
- <source>ID</source>
- <translation>ID</translation>
- </message>
- <message>
- <location line="+152"/>
- <source>Range:</source>
- <translation>Range:</translation>
- </message>
- <message>
- <location line="+8"/>
- <source>to</source>
- <translation>to</translation>
- </message>
</context>
<context>
<name>UnitDisplayStatusBarControl</name>
@@ -3724,68 +2230,9 @@
</message>
</context>
<context>
- <name>WalletFrame</name>
- <message>
- <location filename="../walletframe.cpp" line="+27"/>
- <source>No wallet has been loaded.</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
-<context>
- <name>WalletModel</name>
- <message>
- <location filename="../walletmodel.cpp" line="+288"/>
- <source>Send Coins</source>
- <translation>Send Coins</translation>
- </message>
-</context>
-<context>
- <name>WalletView</name>
- <message>
- <location filename="../walletview.cpp" line="+46"/>
- <source>&amp;Export</source>
- <translation>&amp;Export</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Export the data in the current tab to a file</source>
- <translation>Export the data in the current tab to a file</translation>
- </message>
- <message>
- <location line="+194"/>
- <source>Backup Wallet</source>
- <translation>Backup Wallet</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Wallet Data (*.dat)</source>
- <translation>Wallet Data (*.dat)</translation>
- </message>
- <message>
- <location line="+6"/>
- <source>Backup Failed</source>
- <translation>Backup Failed</translation>
- </message>
- <message>
- <location line="+0"/>
- <source>There was an error trying to save the wallet data to %1.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+4"/>
- <source>The wallet data was successfully saved to %1.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+0"/>
- <source>Backup Successful</source>
- <translation>Backup Successful</translation>
- </message>
-</context>
-<context>
<name>bitcoin-core</name>
<message>
- <location filename="../bitcoinstrings.cpp" line="+286"/>
+ <location filename="../bitcoinstrings.cpp" line="+295"/>
<source>Options:</source>
<translation>Options:</translation>
</message>
@@ -3795,27 +2242,27 @@
<translation>Specify data directory</translation>
</message>
<message>
- <location line="-87"/>
+ <location line="-88"/>
<source>Connect to a node to retrieve peer addresses, and disconnect</source>
<translation>Connect to a node to retrieve peer addresses, and disconnect</translation>
</message>
<message>
- <location line="+90"/>
+ <location line="+91"/>
<source>Specify your own public address</source>
<translation>Specify your own public address</translation>
</message>
<message>
- <location line="-106"/>
+ <location line="-107"/>
<source>Accept command line and JSON-RPC commands</source>
<translation>Accept command line and JSON-RPC commands</translation>
</message>
<message>
- <location line="-125"/>
+ <location line="-131"/>
<source>If &lt;category&gt; is not supplied or if &lt;category&gt; = 1, output all debugging information.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+29"/>
+ <location line="+32"/>
<source>Prune configured below the minimum of %d MiB. Please use a higher number.</source>
<translation type="unfinished"></translation>
</message>
@@ -3835,7 +2282,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+118"/>
+ <location line="+122"/>
<source>Error: A fatal internal error occurred, see debug.log for details</source>
<translation type="unfinished"></translation>
</message>
@@ -3855,17 +2302,17 @@
<translation>Run in the background as a daemon and accept commands</translation>
</message>
<message>
- <location line="+29"/>
+ <location line="+30"/>
<source>Unable to start HTTP server. See debug log for details.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-118"/>
+ <location line="-120"/>
<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>
- <location line="-201"/>
+ <location line="-209"/>
<source>Bitcoin Core</source>
<translation type="unfinished">Bitcoin Core</translation>
</message>
@@ -3911,6 +2358,11 @@
</message>
<message>
<location line="+5"/>
+ <source>Error loading %s: You can&apos;t enable HD on a already existing non-HD wallet</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+2"/>
<source>Error reading %s! All keys read correctly, but transaction data or address book entries might be missing or incorrect.</source>
<translation type="unfinished"></translation>
</message>
@@ -3940,6 +2392,11 @@
<translation type="unfinished"></translation>
</message>
<message>
+ <location line="+3"/>
+ <source>Please contribute if you find %s useful. Visit %s for further information about the software.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<location line="+24"/>
<source>Set the number of script verification threads (%u to %d, 0 = auto, &lt;0 = leave that many cores free, default: %d)</source>
<translation type="unfinished"></translation>
@@ -3960,7 +2417,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+9"/>
+ <location line="+12"/>
<source>WARNING: abnormally high number of blocks generated, %d blocks received in the last %d hours (%d expected)</source>
<translation type="unfinished"></translation>
</message>
@@ -4116,6 +2573,11 @@
</message>
<message>
<location line="+1"/>
+ <source>Error loading %s: You can&apos;t disable HD on a already existing HD wallet</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Error loading block database</source>
<translation>Error loading block database</translation>
</message>
@@ -4240,7 +2702,12 @@
<translation>Specify wallet file (within data directory)</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="+3"/>
+ <source>The source code is available from %s.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+11"/>
<source>Unable to bind to %s on this computer. %s is probably already running.</source>
<translation type="unfinished"></translation>
</message>
@@ -4300,7 +2767,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-313"/>
+ <location line="-323"/>
<source>Allow JSON-RPC connections from specified source. Valid for &lt;ip&gt; 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>
@@ -4325,7 +2792,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+11"/>
+ <location line="+13"/>
<source>Error: Listening for incoming connections failed (listen returned error %s)</source>
<translation type="unfinished"></translation>
</message>
@@ -4355,7 +2822,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+18"/>
+ <location line="+21"/>
<source>Query for peer addresses via DNS lookup, if low on addresses (default: 1 unless -connect)</source>
<translation type="unfinished"></translation>
</message>
@@ -4380,7 +2847,12 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+47"/>
+ <location line="+18"/>
+ <source>Use hierarchical deterministic key generation (HD) after BIP32. Only has effect during wallet creation/first start</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+32"/>
<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>
@@ -4410,7 +2882,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+21"/>
+ <location line="+22"/>
<source>Error reading from database, shutting down.</source>
<translation type="unfinished"></translation>
</message>
@@ -4490,7 +2962,7 @@
<translation>Signing transaction failed</translation>
</message>
<message>
- <location line="+8"/>
+ <location line="+9"/>
<source>The transaction amount is too small to pay the fee</source>
<translation type="unfinished"></translation>
</message>
@@ -4570,27 +3042,27 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-63"/>
+ <location line="-64"/>
<source>Password for JSON-RPC connections</source>
<translation>Password for JSON-RPC connections</translation>
</message>
<message>
- <location line="-214"/>
+ <location line="-221"/>
<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="+143"/>
+ <location line="+149"/>
<source>Allow DNS lookups for -addnode, -seednode and -connect</source>
<translation>Allow DNS lookups for -addnode, -seednode and -connect</translation>
</message>
<message>
- <location line="+56"/>
+ <location line="+57"/>
<source>Loading addresses...</source>
<translation>Loading addresses...</translation>
</message>
<message>
- <location line="-258"/>
+ <location line="-267"/>
<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>
@@ -4610,7 +3082,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+19"/>
+ <location line="+21"/>
<source>Fees (in %s/kB) smaller than this are considered zero fee for transaction creation (default: %s)</source>
<translation type="unfinished"></translation>
</message>
@@ -4635,7 +3107,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+29"/>
+ <location line="+32"/>
<source>Support filtering of blocks and transaction with bloom filters (default: %u)</source>
<translation type="unfinished"></translation>
</message>
@@ -4660,7 +3132,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+5"/>
+ <location line="+8"/>
<source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: %s)</source>
<translation type="unfinished"></translation>
</message>
@@ -4690,7 +3162,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+37"/>
+ <location line="+38"/>
<source>How many blocks to check at startup (default: %u, 0 = all)</source>
<translation type="unfinished"></translation>
</message>
@@ -4785,7 +3257,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+3"/>
+ <location line="+4"/>
<source>Threshold for disconnecting misbehaving peers (default: %u)</source>
<translation type="unfinished"></translation>
</message>
@@ -4795,7 +3267,7 @@
<translation>Unknown network specified in -onlynet: &apos;%s&apos;</translation>
</message>
<message>
- <location line="-71"/>
+ <location line="-72"/>
<source>Insufficient funds</source>
<translation>Insufficient funds</translation>
</message>
@@ -4805,17 +3277,17 @@
<translation>Loading block index...</translation>
</message>
<message>
- <location line="-59"/>
+ <location line="-60"/>
<source>Add a node to connect to and attempt to keep the connection open</source>
<translation>Add a node to connect to and attempt to keep the connection open</translation>
</message>
<message>
- <location line="+60"/>
+ <location line="+61"/>
<source>Loading wallet...</source>
<translation>Loading wallet...</translation>
</message>
<message>
- <location line="-53"/>
+ <location line="-54"/>
<source>Cannot downgrade wallet</source>
<translation>Cannot downgrade wallet</translation>
</message>
@@ -4825,17 +3297,17 @@
<translation>Cannot write default address</translation>
</message>
<message>
- <location line="+77"/>
+ <location line="+78"/>
<source>Rescanning...</source>
<translation>Rescanning...</translation>
</message>
<message>
- <location line="-66"/>
+ <location line="-67"/>
<source>Done loading</source>
<translation>Done loading</translation>
</message>
<message>
- <location line="+14"/>
+ <location line="+15"/>
<source>Error</source>
<translation>Error</translation>
</message>
diff --git a/src/qt/locale/bitcoin_en_GB.ts b/src/qt/locale/bitcoin_en_GB.ts
index bf912d295e..b9c0c82814 100644
--- a/src/qt/locale/bitcoin_en_GB.ts
+++ b/src/qt/locale/bitcoin_en_GB.ts
@@ -908,7 +908,7 @@
</message>
<message>
<source>Reset all settings changes made over the GUI</source>
- <translation>Reset all settings changes made over the GUI</translation>
+ <translation>Reset all setting changes made via the GUI</translation>
</message>
</context>
<context>
@@ -1474,10 +1474,6 @@
<translation>General</translation>
</message>
<message>
- <source>Using OpenSSL version</source>
- <translation>Using OpenSSL version</translation>
- </message>
- <message>
<source>Using BerkeleyDB version</source>
<translation>Using BerkeleyDB version</translation>
</message>
@@ -2980,6 +2976,18 @@
<translation>Accept connections from outside (default: 1 if no -proxy or -connect)</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>
+ <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>
<translation>Bind to given address and always listen on it. Use [host]:port notation for IPv6</translation>
</message>
@@ -2996,6 +3004,10 @@
<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>Set the number of script verification threads (%u to %d, 0 = auto, &lt;0 = leave that many cores free, default: %d)</source>
<translation>Set the number of script verification threads (%u to %d, 0 = auto, &lt;0 = leave that many cores free, default: %d)</translation>
</message>
@@ -3012,6 +3024,10 @@
<translation>Unable to bind to %s on this computer. Bitcoin Core is probably already running.</translation>
</message>
<message>
+ <source>Unsupported argument -whitelistalwaysrelay ignored, use -whitelistrelay and/or -whitelistforcerelay.</source>
+ <translation>Unsupported argument -whitelistalwaysrelay ignored, use -whitelistrelay and/or -whitelistforcerelay.</translation>
+ </message>
+ <message>
<source>Use UPnP to map the listening port (default: 1 when listening and no -proxy)</source>
<translation>Use UPnP to map the listening port (default: 1 when listening and no -proxy)</translation>
</message>
@@ -3028,6 +3044,10 @@
<translation>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</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>
+ <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>
@@ -3048,6 +3068,10 @@
<translation>&lt;category&gt; can be:</translation>
</message>
<message>
+ <source>Append comment to the user agent string</source>
+ <translation>Append comment to the user agent string</translation>
+ </message>
+ <message>
<source>Block creation options:</source>
<translation>Block creation options:</translation>
</message>
@@ -3092,6 +3116,10 @@
<translation>Enable publish raw transaction in &lt;address&gt;</translation>
</message>
<message>
+ <source>Enable transaction replacement in the memory pool (default: %u)</source>
+ <translation>Enable transaction replacement in the memory pool (default: %u)</translation>
+ </message>
+ <message>
<source>Error initializing block database</source>
<translation>Error initialising block database</translation>
</message>
@@ -3128,10 +3156,22 @@
<translation>Invalid -onion address: '%s'</translation>
</message>
<message>
+ <source>Invalid amount for -fallbackfee=&lt;amount&gt;: '%s'</source>
+ <translation>Invalid amount for -fallbackfee=&lt;amount&gt;: '%s'</translation>
+ </message>
+ <message>
<source>Keep the transaction memory pool below &lt;n&gt; megabytes (default: %u)</source>
<translation>Keep the transaction memory pool below &lt;n&gt; megabytes (default: %u)</translation>
</message>
<message>
+ <source>Location of the auth cookie (default: data dir)</source>
+ <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>
@@ -3140,6 +3180,10 @@
<translation>Only connect to nodes in network &lt;net&gt; (ipv4, ipv6 or onion)</translation>
</message>
<message>
+ <source>Print version and exit</source>
+ <translation>Print version and exit</translation>
+ </message>
+ <message>
<source>Prune cannot be configured with a negative value.</source>
<translation>Prune cannot be configured with a negative value.</translation>
</message>
@@ -3196,10 +3240,6 @@
<translation>Wallet options:</translation>
</message>
<message>
- <source>Warning: This version is obsolete; upgrade required!</source>
- <translation>Warning: This version is obsolete; upgrade required!</translation>
- </message>
- <message>
<source>You need to rebuild the database using -reindex to change -txindex</source>
<translation>You need to rebuild the database using -reindex to change -txindex</translation>
</message>
@@ -3296,10 +3336,6 @@
<translation>Activating best chain...</translation>
</message>
<message>
- <source>Always relay transactions received from whitelisted peers (default: %d)</source>
- <translation>Always relay transactions received from whitelisted peers (default: %d)</translation>
- </message>
- <message>
<source>Attempt to recover private keys from a corrupt wallet.dat on startup</source>
<translation>Attempt to recover private keys from a corrupt wallet.dat on startup</translation>
</message>
@@ -3464,6 +3500,10 @@
<translation>Warning</translation>
</message>
<message>
+ <source>Warning: unknown new rules activated (versionbit %i)</source>
+ <translation>Warning: unknown new rules activated (versionbit %i)</translation>
+ </message>
+ <message>
<source>Whether to operate in a blocks only mode (default: %u)</source>
<translation>Whether to operate in a blocks only mode (default: %u)</translation>
</message>
diff --git a/src/qt/locale/bitcoin_eo.ts b/src/qt/locale/bitcoin_eo.ts
index ab8dd65f81..2095db34bf 100644
--- a/src/qt/locale/bitcoin_eo.ts
+++ b/src/qt/locale/bitcoin_eo.ts
@@ -180,6 +180,10 @@
<translation>La monujo estas ฤ‰ifrita</translation>
</message>
<message>
+ <source>Enter the old passphrase and new passphrase to the wallet.</source>
+ <translation>Tajpu la malnovan pasvorton kaj la novan pasvorton por la monujo.</translation>
+ </message>
+ <message>
<source>Wallet encryption failed</source>
<translation>Cฬ‚ifrado de la monujo fiaskis</translation>
</message>
@@ -410,6 +414,10 @@
<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>
@@ -482,6 +490,12 @@
</translation>
</message>
<message>
+ <source>Address: %1
+</source>
+ <translation>Adreso: %1
+</translation>
+ </message>
+ <message>
<source>Sent transaction</source>
<translation>Sendita transakcio</translation>
</message>
@@ -812,6 +826,10 @@
<source>command-line options</source>
<translation>komandliniaj agordajฬ‚oj</translation>
</message>
+ <message>
+ <source>UI Options:</source>
+ <translation>Uzantinterfaco ebloj:</translation>
+ </message>
</context>
<context>
<name>Intro</name>
@@ -847,6 +865,10 @@
<source>Error</source>
<translation>Eraro</translation>
</message>
+ <message numerus="yes">
+ <source>%n GB of free space available</source>
+ <translation><numerusform>%n gigabajto de libera loko disponeble</numerusform><numerusform>%n gigabajtoj de libera loko disponebla.</numerusform></translation>
+ </message>
</context>
<context>
<name>OpenURIDialog</name>
@@ -1098,6 +1120,10 @@
</context>
<context>
<name>PeerTableModel</name>
+ <message>
+ <source>User Agent</source>
+ <translation>Uzanto Agento</translation>
+ </message>
</context>
<context>
<name>QObject</name>
@@ -1168,10 +1194,6 @@
<translation>ฤœenerala</translation>
</message>
<message>
- <source>Using OpenSSL version</source>
- <translation>uzas OpenSSL-version</translation>
- </message>
- <message>
<source>Startup time</source>
<translation>Horo de lancฬ‚o</translation>
</message>
@@ -1204,10 +1226,22 @@
<translation>Sendita</translation>
</message>
<message>
+ <source>&amp;Peers</source>
+ <translation>&amp;Samuloj</translation>
+ </message>
+ <message>
+ <source>Banned peers</source>
+ <translation>Malpermesita samuloj.</translation>
+ </message>
+ <message>
<source>Version</source>
<translation>Versio</translation>
</message>
<message>
+ <source>User Agent</source>
+ <translation>Uzanto Agento</translation>
+ </message>
+ <message>
<source>Services</source>
<translation>Servoj</translation>
</message>
diff --git a/src/qt/locale/bitcoin_es.ts b/src/qt/locale/bitcoin_es.ts
index 936074210a..5322634c5d 100644
--- a/src/qt/locale/bitcoin_es.ts
+++ b/src/qt/locale/bitcoin_es.ts
@@ -883,6 +883,10 @@
<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>
@@ -898,7 +902,11 @@
<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>
- </context>
+ <message>
+ <source>Reset all settings changes made over the GUI</source>
+ <translation>Resetear los cambios de configuracion hechos por el GUI</translation>
+ </message>
+</context>
<context>
<name>Intro</name>
<message>
@@ -1096,6 +1104,14 @@
<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>
@@ -1108,6 +1124,10 @@
<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>
@@ -1450,10 +1470,6 @@
<translation>General</translation>
</message>
<message>
- <source>Using OpenSSL version</source>
- <translation>Utilizando la versiรณn de OpenSSL</translation>
- </message>
- <message>
<source>Using BerkeleyDB version</source>
<translation>Utilizando la versiรณn de BerkeleyDB</translation>
</message>
@@ -1482,6 +1498,18 @@
<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>Open the Bitcoin Core debug log file from the current data directory. This can take a few seconds for large log files.</source>
<translation>Abre el archivo de registro de depuraciรณn de Bitcoin desde el directorio de datos actual. Esto puede tardar unos segundos para ficheros de registro de gran tamaรฑo.</translation>
</message>
@@ -1506,6 +1534,10 @@
<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>
@@ -1554,6 +1586,14 @@
<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>
@@ -1606,6 +1646,10 @@
<translation>Nodo &amp;Desconectado</translation>
</message>
<message>
+ <source>Ban Node for</source>
+ <translation>Prohibir Nodo para</translation>
+ </message>
+ <message>
<source>1 &amp;hour</source>
<translation>1 &amp;hora</translation>
</message>
@@ -1622,6 +1666,10 @@
<translation>1 &amp;aรฑo</translation>
</message>
<message>
+ <source>&amp;Unban Node</source>
+ <translation>&amp;Desbanear Nodo</translation>
+ </message>
+ <message>
<source>Welcome to the Bitcoin Core RPC console.</source>
<translation>Bienvenido a la consola RPC de Bitcoin Core.</translation>
</message>
@@ -2721,6 +2769,10 @@
<translation>Copiar identificador de transacciรณn</translation>
</message>
<message>
+ <source>Copy raw transaction</source>
+ <translation>Copiar traducciรณn en crudo</translation>
+ </message>
+ <message>
<source>Edit label</source>
<translation>Editar etiqueta</translation>
</message>
@@ -2870,6 +2922,34 @@
</translation>
</message>
<message>
+ <source>If &lt;category&gt; is not supplied or if &lt;category&gt; = 1, output all debugging information.</source>
+ <translation>Si &lt;category&gt; no es proporcionado o si &lt;category&gt; =1, muestra toda la informaciรณn de depuraciรณn.</translation>
+ </message>
+ <message>
+ <source>Maximum total fees (in %s) to use in a single wallet 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 Bitcoin Core will not work properly.</source>
+ <translation>Por favor, mira si la fecha y la hora en tu computador son correctas! Si tu hara es errรณnea Bitcoin Core no funcionarรก correctamente.</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>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, &gt;%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, &gt;%u = objetivo de tamaรฑo en MiB para usar para los archivos de bloques)</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>
@@ -2895,6 +2975,18 @@
<translation>Aceptar conexiones desde el exterior (predeterminado: 1 si no -proxy o -connect)</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>
+ </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>
@@ -2911,10 +3003,18 @@
<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>Set the number of script verification threads (%u to %d, 0 = auto, &lt;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, &lt;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>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>
@@ -2923,6 +3023,14 @@
<translation>No se ha podido acceder a %s en esta mรกquina. Probablemente ya se estรก ejecutando Bitcoin Core.</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 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>WARNING: abnormally high number of blocks generated, %d blocks received in the last %d hours (%d expected)</source>
<translation>ADVERTENCIA: anormalmente alto nรบmero de bloques generado, %d bloques recibidos en las รบltimas horas %d (%d espera)</translation>
</message>
@@ -2935,6 +3043,10 @@
<translation>Atenciรณn: ยกParece que la red no estรก totalmente de acuerdo! Algunos mineros estรกn presentando inconvenientes.</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: 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>
@@ -2955,6 +3067,10 @@
<translation>&lt;category&gt; 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>Block creation options:</source>
<translation>Opciones de creaciรณn de bloques:</translation>
</message>
@@ -2983,6 +3099,26 @@
<translation>ยฟQuieres reconstruir la base de datos de bloques ahora?</translation>
</message>
<message>
+ <source>Enable publish hash block in &lt;address&gt;</source>
+ <translation>Activar publicar bloque .hash en &lt;.Address&gt;</translation>
+ </message>
+ <message>
+ <source>Enable publish hash transaction in &lt;address&gt;</source>
+ <translation>Activar publicar transacciรณn .hash en &lt;.Address&gt;</translation>
+ </message>
+ <message>
+ <source>Enable publish raw block in &lt;address&gt;</source>
+ <translation>Habilita la publicacion de bloques en bruto en &lt;direccion&gt;</translation>
+ </message>
+ <message>
+ <source>Enable publish raw transaction in &lt;address&gt;</source>
+ <translation>Habilitar publicar transacciรณn en rama en &lt;direcciรณn&gt;</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>
@@ -3019,6 +3155,22 @@
<translation>Direcciรณn -onion invรกlida: '%s'</translation>
</message>
<message>
+ <source>Invalid amount for -fallbackfee=&lt;amount&gt;: '%s'</source>
+ <translation>Cantidad invรกlida para -fallbackfee=&lt;amount&gt;: '%s'</translation>
+ </message>
+ <message>
+ <source>Keep the transaction memory pool below &lt;n&gt; megabytes (default: %u)</source>
+ <translation>Mantener la memoria de transacciones por debajo de &lt;n&gt; megabytes (predeterminado: %u)</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>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>
@@ -3027,6 +3179,10 @@
<translation>Sรณlo conectar a nodos en redes &lt;net&gt; (ipv4, ipv6 o onion)</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>
@@ -3047,10 +3203,26 @@
<translation>Especificar archivo de monedero (dentro del directorio de datos)</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>
@@ -3067,10 +3239,6 @@
<translation>Opciones de monedero:</translation>
</message>
<message>
- <source>Warning: This version is obsolete; upgrade required!</source>
- <translation>Peligro: Esta versiรณn es obsoleta; actualizaciรณn requerida!</translation>
- </message>
- <message>
<source>You need to rebuild the database using -reindex to change -txindex</source>
<translation>Usted necesita reconstruir la base de datos utilizando -reindex para cambiar -txindex</translation>
</message>
@@ -3107,6 +3275,10 @@
<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>
@@ -3247,6 +3419,10 @@
<translation>Recibir y mostrar alertas de red P2P (default: %u)</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>
@@ -3279,6 +3455,14 @@
<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>
@@ -3316,10 +3500,22 @@
<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>wallet.dat corrupt, salvage failed</source>
<translation>wallet.dat corrupto. Ha fallado la recuperaciรณn.</translation>
</message>
@@ -3354,6 +3550,26 @@
<translation>(1 = keep tx meta data e.g. account owner and payment request information, 2 = drop 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 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>
+ </message>
+ <message>
+ <source>Do not keep transactions in the mempool longer than &lt;n&gt; hours (default: %u)</source>
+ <translation>No mantener transacciones en la memoria mas de &lt;n&gt; horas (predeterminado: %u)</translation>
+ </message>
+ <message>
+ <source>Error reading wallet.dat! All keys read correctly, but transaction data or address book entries might be missing or incorrect.</source>
+ <translation>Error al leer wallet.dat! Todas las llaves se leyeron correctamente, pero los datos de transacciones o la libreta de direcciones pueden faltar o ser incorrectos.</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>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>
@@ -3370,10 +3586,18 @@
<translation>Mostrar depuraciรณn (por defecto: %u, proporcionar &lt;category&gt; es opcional)</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>
+ </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>Username and hashed password for JSON-RPC connections. The field &lt;userpw&gt; comes in the format: &lt;USERNAME&gt;:&lt;SALT&gt;$&lt;HASH&gt;. 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 &lt;userpw&gt; tiene el formato: &lt;USERNAME&gt;:&lt;SALT&gt;$&lt;HASH&gt;. Se incluye un script python convencional en share/rpcuser. Esta opciรณn puede ser especificada multiples veces</translation>
+ </message>
+ <message>
<source>(default: %s)</source>
<translation>(predeterminado: %s)</translation>
</message>
diff --git a/src/qt/locale/bitcoin_es_419.ts b/src/qt/locale/bitcoin_es_419.ts
new file mode 100644
index 0000000000..b76915662c
--- /dev/null
+++ b/src/qt/locale/bitcoin_es_419.ts
@@ -0,0 +1,173 @@
+<TS language="es_419" version="2.1">
+<context>
+ <name>AddressBookPage</name>
+ <message>
+ <source>Right-click to edit address or label</source>
+ <translation>Haga clic para editar la direcciรณn o etiqueta</translation>
+ </message>
+ <message>
+ <source>Create a new address</source>
+ <translation>Crear una nueva direcciรณn</translation>
+ </message>
+ <message>
+ <source>&amp;New</source>
+ <translation>&amp;New</translation>
+ </message>
+ <message>
+ <source>Copy the currently selected address to the system clipboard</source>
+ <translation>Copia la direcciรณn seleccionada al portapapeles del sistema</translation>
+ </message>
+ <message>
+ <source>Choose the address to send coins to</source>
+ <translation>Seleccione la Direccion a la que enviara dinero</translation>
+ </message>
+ <message>
+ <source>Choose the address to receive coins with</source>
+ <translation>Seleccione la direccion de la que recibira dinero</translation>
+ </message>
+ <message>
+ <source>Export Address List</source>
+ <translation>Exportar Lista de Direcciones</translation>
+ </message>
+ </context>
+<context>
+ <name>AddressTableModel</name>
+ <message>
+ <source>Address</source>
+ <translation>Direccion</translation>
+ </message>
+ </context>
+<context>
+ <name>AskPassphraseDialog</name>
+ <message>
+ <source>Decrypt wallet</source>
+ <translation>Desencriptar Monedero</translation>
+ </message>
+ <message>
+ <source>Confirm wallet encryption</source>
+ <translation>Confirmar Encriptacion de Monedero</translation>
+ </message>
+ <message>
+ <source>Warning: The Caps Lock key is on!</source>
+ <translation>Advertencia: La Tecla Caps Lock esta habilitada!</translation>
+ </message>
+ <message>
+ <source>Wallet encrypted</source>
+ <translation>Monedero ha sido encriptado</translation>
+ </message>
+ <message>
+ <source>Wallet encryption failed</source>
+ <translation>La encriptacion del monedero ha fallado</translation>
+ </message>
+ </context>
+<context>
+ <name>BanTableModel</name>
+ </context>
+<context>
+ <name>BitcoinGUI</name>
+ </context>
+<context>
+ <name>ClientModel</name>
+ </context>
+<context>
+ <name>CoinControlDialog</name>
+ </context>
+<context>
+ <name>EditAddressDialog</name>
+ </context>
+<context>
+ <name>FreespaceChecker</name>
+ </context>
+<context>
+ <name>HelpMessageDialog</name>
+ </context>
+<context>
+ <name>Intro</name>
+ </context>
+<context>
+ <name>OpenURIDialog</name>
+ </context>
+<context>
+ <name>OptionsDialog</name>
+ </context>
+<context>
+ <name>OverviewPage</name>
+ </context>
+<context>
+ <name>PaymentServer</name>
+ </context>
+<context>
+ <name>PeerTableModel</name>
+ </context>
+<context>
+ <name>QObject</name>
+ </context>
+<context>
+ <name>QRImageWidget</name>
+ </context>
+<context>
+ <name>RPCConsole</name>
+ </context>
+<context>
+ <name>ReceiveCoinsDialog</name>
+ </context>
+<context>
+ <name>ReceiveRequestDialog</name>
+ <message>
+ <source>Address</source>
+ <translation>Direccion</translation>
+ </message>
+ </context>
+<context>
+ <name>RecentRequestsTableModel</name>
+ </context>
+<context>
+ <name>SendCoinsDialog</name>
+ </context>
+<context>
+ <name>SendCoinsEntry</name>
+ </context>
+<context>
+ <name>ShutdownWindow</name>
+ </context>
+<context>
+ <name>SignVerifyMessageDialog</name>
+ </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>
+ <message>
+ <source>Address</source>
+ <translation>Direccion</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>
+ </context>
+</TS> \ No newline at end of file
diff --git a/src/qt/locale/bitcoin_es_AR.ts b/src/qt/locale/bitcoin_es_AR.ts
new file mode 100644
index 0000000000..fb9ac895be
--- /dev/null
+++ b/src/qt/locale/bitcoin_es_AR.ts
@@ -0,0 +1,373 @@
+<TS language="es_AR" version="2.1">
+<context>
+ <name>AddressBookPage</name>
+ <message>
+ <source>Right-click to edit address or label</source>
+ <translation>Hacรฉ click para editar la direcciรณn o etiqueta</translation>
+ </message>
+ <message>
+ <source>Create a new address</source>
+ <translation>Crear una nueva direcciรณn</translation>
+ </message>
+ <message>
+ <source>&amp;New</source>
+ <translation>&amp;Nuevo</translation>
+ </message>
+ <message>
+ <source>Copy the currently selected address to the system clipboard</source>
+ <translation>Copiรก la direcciรณn que seleccionaste al portapapeles</translation>
+ </message>
+ <message>
+ <source>&amp;Copy</source>
+ <translation>&amp;Copiar</translation>
+ </message>
+ <message>
+ <source>C&amp;lose</source>
+ <translation>C&amp;lose</translation>
+ </message>
+ <message>
+ <source>&amp;Copy Address</source>
+ <translation>&amp;Copiar Direcciรณn</translation>
+ </message>
+ <message>
+ <source>Delete the currently selected address from the list</source>
+ <translation>Borrar de la lista la direcciรณn seleccionada</translation>
+ </message>
+ <message>
+ <source>Export the data in the current tab to a file</source>
+ <translation>Exportar los datos de la pestaรฑa actual a un archivo</translation>
+ </message>
+ <message>
+ <source>&amp;Export</source>
+ <translation>&amp;Exportar</translation>
+ </message>
+ <message>
+ <source>&amp;Delete</source>
+ <translation>&amp;Borrar</translation>
+ </message>
+ <message>
+ <source>Choose the address to send coins to</source>
+ <translation>Elegir la direcciรณn a donde enviar las monedas (coins)</translation>
+ </message>
+ <message>
+ <source>Choose the address to receive coins with</source>
+ <translation>Elegรญ la direcciรณn donde recibir las monedas</translation>
+ </message>
+ <message>
+ <source>C&amp;hoose</source>
+ <translation>E&amp;legir</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 tus direcciones Bitcoin para enviar pagos. Siempre chequeรก el monto y la direcciรณn de recepciรณn antes de mandar 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 tus direcciones para recibir pagos. Te recomendamos que uses una direcciรณn de recibir para cada transacciรณn.</translation>
+ </message>
+ <message>
+ <source>Copy &amp;Label</source>
+ <translation>Copiar &amp;Etiqueta</translation>
+ </message>
+ <message>
+ <source>&amp;Edit</source>
+ <translation>&amp;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 por 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>Hubo un error al tratar de guardar la lista de direcciones a %1. Por favor tratรก 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>Diรกlogo de Frase de Contraseรฑa</translation>
+ </message>
+ <message>
+ <source>Enter passphrase</source>
+ <translation>Ingresar la Frase de Contraseรฑa</translation>
+ </message>
+ <message>
+ <source>New passphrase</source>
+ <translation>Nueva Frase de Contraseรฑa</translation>
+ </message>
+ <message>
+ <source>Repeat new passphrase</source>
+ <translation>Repetรญ la nueva Frase de Contraseรฑa</translation>
+ </message>
+ <message>
+ <source>Encrypt wallet</source>
+ <translation>Encriptar la billetera</translation>
+ </message>
+ <message>
+ <source>This operation needs your wallet passphrase to unlock the wallet.</source>
+ <translation>Esta operaciรณn necesita tu frase de contraseรฑa para desbloquear tu billetera.</translation>
+ </message>
+ <message>
+ <source>Unlock wallet</source>
+ <translation>Desbloquear la billetera</translation>
+ </message>
+ <message>
+ <source>This operation needs your wallet passphrase to decrypt the wallet.</source>
+ <translation>Esta operaciรณn necesita tu Frase de Contraseรฑa de billetera para desencriptar la billetera.</translation>
+ </message>
+ <message>
+ <source>Decrypt wallet</source>
+ <translation>Desencriptar la billetera</translation>
+ </message>
+ <message>
+ <source>Change passphrase</source>
+ <translation>Cambiar la Frase de Contraseรฑa</translation>
+ </message>
+ <message>
+ <source>Confirm wallet encryption</source>
+ <translation>Confirmรก la encriptaciรณn de la billetera</translation>
+ </message>
+ <message>
+ <source>Warning: If you encrypt your wallet and lose your passphrase, you will &lt;b&gt;LOSE ALL OF YOUR BITCOINS&lt;/b&gt;!</source>
+ <translation>Atenciรณn: Si encriptรกs tu billetera y perdรฉs tu frase de contraseรฑa, vas a &lt;b&gt;PERDER TODOS TUS BITCOINS&lt;/b&gt;!</translation>
+ </message>
+ <message>
+ <source>Are you sure you wish to encrypt your wallet?</source>
+ <translation>ยฟEstรกs seguro que querรฉs encriptar tu billetera?</translation>
+ </message>
+ <message>
+ <source>Bitcoin Core 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>Bitcoin Core ahora se va a cerrar para terminar el proceso de encriptaciรณn. Acordate que encriptar tu billetera no te protege completamente de que algรบn malware que pueda infectar tu computadora te robe tus bitcoins.</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: Todos los backups que hayas hecho de tu billetera tendrรญan que ser reemplazados por el archivo encriptado de billetera que generaste. Por razones de seguridad, los backups anteriores del archivo de billetera no encriptado se inutilizan en el momento en que empezรกs a usar la nueva billetera encriptada</translation>
+ </message>
+ <message>
+ <source>Warning: The Caps Lock key is on!</source>
+ <translation>Atenciรณn: Tenรฉs puestas las mayรบsculas!</translation>
+ </message>
+ <message>
+ <source>Wallet encrypted</source>
+ <translation>Billetera encriptada</translation>
+ </message>
+ <message>
+ <source>Enter the new passphrase to the wallet.&lt;br/&gt;Please use a passphrase of &lt;b&gt;ten or more random characters&lt;/b&gt;, or &lt;b&gt;eight or more words&lt;/b&gt;.</source>
+ <translation>Ingresรก una nueva frase de contraseรฑa para la billetera.&lt;br/&gt;Por favor, fijate de usar una frase de contraseรฑa de &lt;b&gt;diez o mรกs caracteres aleatorios&lt;/b&gt;, o de &lt;b&gt;ocho o mรกs palabras&lt;/b&gt;.</translation>
+ </message>
+ <message>
+ <source>Enter the old passphrase and new passphrase to the wallet.</source>
+ <translation>Ingresรก la frase de contraseรฑa vieja y la nueva para la billetera.</translation>
+ </message>
+ <message>
+ <source>Wallet encryption failed</source>
+ <translation>Fallรณ la encriptaciรณn de la billetera</translation>
+ </message>
+ <message>
+ <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source>
+ <translation>Fallรณ la encriptaciรณn de la billetera por un error interno. Tu billetera no estรก encriptada.</translation>
+ </message>
+ <message>
+ <source>The supplied passphrases do not match.</source>
+ <translation>Las frases de contraseรฑa no son iguales.</translation>
+ </message>
+ <message>
+ <source>Wallet unlock failed</source>
+ <translation>Fallรณ el desbloqueo de la billetera</translation>
+ </message>
+ <message>
+ <source>The passphrase entered for the wallet decryption was incorrect.</source>
+ <translation>La frase de contraseรฑa que ingresaste para desencriptar la billetera es incorrecta.</translation>
+ </message>
+ <message>
+ <source>Wallet decryption failed</source>
+ <translation>Fallรณ la desencriptaciรณn de la billetera</translation>
+ </message>
+ </context>
+<context>
+ <name>BanTableModel</name>
+ </context>
+<context>
+ <name>BitcoinGUI</name>
+ </context>
+<context>
+ <name>ClientModel</name>
+ </context>
+<context>
+ <name>CoinControlDialog</name>
+ <message>
+ <source>(no label)</source>
+ <translation>(sin etiqueta)</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>OpenURIDialog</name>
+ </context>
+<context>
+ <name>OptionsDialog</name>
+ </context>
+<context>
+ <name>OverviewPage</name>
+ </context>
+<context>
+ <name>PaymentServer</name>
+ </context>
+<context>
+ <name>PeerTableModel</name>
+ </context>
+<context>
+ <name>QObject</name>
+ </context>
+<context>
+ <name>QRImageWidget</name>
+ </context>
+<context>
+ <name>RPCConsole</name>
+ </context>
+<context>
+ <name>ReceiveCoinsDialog</name>
+ </context>
+<context>
+ <name>ReceiveRequestDialog</name>
+ <message>
+ <source>Address</source>
+ <translation>Direcciรณn</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>(sin etiqueta)</translation>
+ </message>
+ </context>
+<context>
+ <name>SendCoinsDialog</name>
+ <message>
+ <source>(no label)</source>
+ <translation>(sin etiqueta)</translation>
+ </message>
+ </context>
+<context>
+ <name>SendCoinsEntry</name>
+ </context>
+<context>
+ <name>ShutdownWindow</name>
+ </context>
+<context>
+ <name>SignVerifyMessageDialog</name>
+ </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>
+ <message>
+ <source>Label</source>
+ <translation>Etiqueta</translation>
+ </message>
+ </context>
+<context>
+ <name>TransactionView</name>
+ <message>
+ <source>Exporting Failed</source>
+ <translation>Fallรณ la exportaciรณn</translation>
+ </message>
+ <message>
+ <source>Comma separated file (*.csv)</source>
+ <translation>Archivo separado por coma (*.csv)</translation>
+ </message>
+ <message>
+ <source>Label</source>
+ <translation>Etiqueta</translation>
+ </message>
+ <message>
+ <source>Address</source>
+ <translation>Direcciรณn</translation>
+ </message>
+ </context>
+<context>
+ <name>UnitDisplayStatusBarControl</name>
+ </context>
+<context>
+ <name>WalletFrame</name>
+ </context>
+<context>
+ <name>WalletModel</name>
+ </context>
+<context>
+ <name>WalletView</name>
+ <message>
+ <source>&amp;Export</source>
+ <translation>&amp;Exportar</translation>
+ </message>
+ <message>
+ <source>Export the data in the current tab to a file</source>
+ <translation>Exportar los datos de la pestaรฑa actual a un archivo</translation>
+ </message>
+ </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 e6d48a29f0..742dee29d0 100644
--- a/src/qt/locale/bitcoin_es_CL.ts
+++ b/src/qt/locale/bitcoin_es_CL.ts
@@ -7,7 +7,7 @@
</message>
<message>
<source>Create a new address</source>
- <translation>Crea una nueva direCrea una nueva direcciรณncciรณn</translation>
+ <translation>Crea una nueva direcciรณn</translation>
</message>
<message>
<source>&amp;New</source>
@@ -46,6 +46,22 @@
<translation>&amp;Borrar</translation>
</message>
<message>
+ <source>Choose the address to send coins to</source>
+ <translation>Selecciona la direccion para enviar coins</translation>
+ </message>
+ <message>
+ <source>Choose the address to receive coins with</source>
+ <translation>Selecciona la direcciรณn para recibir coins</translation>
+ </message>
+ <message>
+ <source>Sending addresses</source>
+ <translation>Direcciรณn de envio</translation>
+ </message>
+ <message>
+ <source>Receiving addresses</source>
+ <translation>Direcciรณn para recibir</translation>
+ </message>
+ <message>
<source>Copy &amp;Label</source>
<translation>Copia &amp;etiqueta</translation>
</message>
@@ -54,9 +70,17 @@
<translation>&amp;Editar</translation>
</message>
<message>
+ <source>Export Address List</source>
+ <translation>Exportar lista de direcciones</translation>
+ </message>
+ <message>
<source>Comma separated file (*.csv)</source>
<translation>Archivos separados por coma (*.csv)</translation>
</message>
+ <message>
+ <source>Exporting Failed</source>
+ <translation>Exportado fallo</translation>
+ </message>
</context>
<context>
<name>AddressTableModel</name>
@@ -226,6 +250,14 @@
<translation>&amp;Cambiar la contraseรฑa...</translation>
</message>
<message>
+ <source>&amp;Sending addresses...</source>
+ <translation>Mandando direcciones</translation>
+ </message>
+ <message>
+ <source>&amp;Receiving addresses...</source>
+ <translation>Recibiendo direcciones</translation>
+ </message>
+ <message>
<source>Open &amp;URI...</source>
<translation>Abrir y url...</translation>
</message>
@@ -258,6 +290,10 @@
<translation>Abre consola de depuraciรณn y diagnรณstico</translation>
</message>
<message>
+ <source>&amp;Verify message...</source>
+ <translation>Verificar mensaje....</translation>
+ </message>
+ <message>
<source>Bitcoin</source>
<translation>Bitcoin</translation>
</message>
@@ -274,6 +310,10 @@
<translation>y recibir</translation>
</message>
<message>
+ <source>Show information about Bitcoin Core</source>
+ <translation>Mostrar informacion sobre Bitcoin Core</translation>
+ </message>
+ <message>
<source>&amp;Show / Hide</source>
<translation>&amp;Mostrar/Ocultar</translation>
</message>
@@ -302,6 +342,18 @@
<translation>bitcoin core</translation>
</message>
<message>
+ <source>Request payments (generates QR codes and bitcoin: URIs)</source>
+ <translation>Pide pagos (genera codigos QR and bitcoin: URls)</translation>
+ </message>
+ <message>
+ <source>&amp;About Bitcoin Core</source>
+ <translation>&amp;Sobre Bitcoin Core</translation>
+ </message>
+ <message>
+ <source>Modify configuration options for Bitcoin Core</source>
+ <translation>Modifica las opciones para BitCoin Core</translation>
+ </message>
+ <message>
<source>%1 and %2</source>
<translation>%1 y %2</translation>
</message>
@@ -360,6 +412,11 @@
<translation>prioridad:</translation>
</message>
<message>
+ <source>Fee:</source>
+ <translation>comisiรณn:
+</translation>
+ </message>
+ <message>
<source>Amount</source>
<translation>Cantidad</translation>
</message>
@@ -368,6 +425,10 @@
<translation>Fecha</translation>
</message>
<message>
+ <source>Confirmations</source>
+ <translation>Confirmaciones</translation>
+ </message>
+ <message>
<source>Confirmed</source>
<translation>Confirmado</translation>
</message>
@@ -388,10 +449,26 @@
<translation>Copiar Cantidad</translation>
</message>
<message>
+ <source>Copy quantity</source>
+ <translation>copiar cantidad</translation>
+ </message>
+ <message>
+ <source>Copy fee</source>
+ <translation>copiar comision</translation>
+ </message>
+ <message>
+ <source>Copy bytes</source>
+ <translation>copiar bytes</translation>
+ </message>
+ <message>
<source>medium</source>
<translation>medio</translation>
</message>
<message>
+ <source>low</source>
+ <translation>bajo</translation>
+ </message>
+ <message>
<source>yes</source>
<translation>si</translation>
</message>
@@ -469,6 +546,10 @@
<translation>versiรณn</translation>
</message>
<message>
+ <source>Command-line options</source>
+ <translation>opciones de linea de comando</translation>
+ </message>
+ <message>
<source>Usage:</source>
<translation>Uso:</translation>
</message>
@@ -794,10 +875,23 @@
<translation>prioridad:</translation>
</message>
<message>
+ <source>Fee:</source>
+ <translation>comisiรณn:
+</translation>
+ </message>
+ <message>
<source>Transaction Fee:</source>
<translation>Comisiรณn transacciรณn:</translation>
</message>
<message>
+ <source>normal</source>
+ <translation>normal</translation>
+ </message>
+ <message>
+ <source>fast</source>
+ <translation>rapido</translation>
+ </message>
+ <message>
<source>Send to multiple recipients at once</source>
<translation>Enviar a mรบltiples destinatarios</translation>
</message>
@@ -826,10 +920,22 @@
<translation>Confirmar el envio de monedas</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 comision</translation>
+ </message>
+ <message>
+ <source>Copy bytes</source>
+ <translation>copiar bytes</translation>
+ </message>
+ <message>
<source>The amount to pay must be larger than 0.</source>
<translation>La cantidad por pagar tiene que ser mayor 0.</translation>
</message>
@@ -1114,10 +1220,18 @@
<translation>Generado pero no acceptado</translation>
</message>
<message>
+ <source>Offline</source>
+ <translation>fuera de linea</translation>
+ </message>
+ <message>
<source>Label</source>
<translation>Etiqueta</translation>
</message>
<message>
+ <source>Unconfirmed</source>
+ <translation>no confirmado</translation>
+ </message>
+ <message>
<source>Received with</source>
<translation>Recibido con</translation>
</message>
@@ -1237,6 +1351,10 @@
<translation>Mostrar detalles de la transacciรณn</translation>
</message>
<message>
+ <source>Exporting Failed</source>
+ <translation>Exportado fallo</translation>
+ </message>
+ <message>
<source>Comma separated file (*.csv)</source>
<translation>Archivos separados por coma (*.csv)</translation>
</message>
diff --git a/src/qt/locale/bitcoin_es_CO.ts b/src/qt/locale/bitcoin_es_CO.ts
new file mode 100644
index 0000000000..ea0664636d
--- /dev/null
+++ b/src/qt/locale/bitcoin_es_CO.ts
@@ -0,0 +1,542 @@
+<TS language="es_CO" version="2.1">
+<context>
+ <name>AddressBookPage</name>
+ <message>
+ <source>Right-click to edit address or label</source>
+ <translation>Click derecho para editar la direcciรณn o etiqueta</translation>
+ </message>
+ <message>
+ <source>Create a new address</source>
+ <translation>Crear una nueva direcciรณn</translation>
+ </message>
+ <message>
+ <source>&amp;New</source>
+ <translation>&amp;Nuevo</translation>
+ </message>
+ <message>
+ <source>Copy the currently selected address to the system clipboard</source>
+ <translation>Copiar la direcciรณn actualmente seleccionada al sistema de portapapeles</translation>
+ </message>
+ <message>
+ <source>&amp;Copy</source>
+ <translation>&amp;Copiar</translation>
+ </message>
+ <message>
+ <source>C&amp;lose</source>
+ <translation>C&amp;errar</translation>
+ </message>
+ <message>
+ <source>&amp;Copy Address</source>
+ <translation>&amp;Copiar direcciรณn</translation>
+ </message>
+ <message>
+ <source>Delete the currently selected address from the list</source>
+ <translation>Borrar la direcciรณn actualmente seleccionada de la lista</translation>
+ </message>
+ <message>
+ <source>&amp;Export</source>
+ <translation>&amp;Exportar</translation>
+ </message>
+ <message>
+ <source>&amp;Delete</source>
+ <translation>&amp;Borrar</translation>
+ </message>
+ <message>
+ <source>Choose the address to send coins to</source>
+ <translation>Escoje la direcciรณn para enviar monedas a</translation>
+ </message>
+ <message>
+ <source>Choose the address to receive coins with</source>
+ <translation>Escoje la direcciรณn para recibir monedas con</translation>
+ </message>
+ <message>
+ <source>C&amp;hoose</source>
+ <translation>E&amp;scojer</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 las direcciones de Bitcoin para enviar pagos . Siempre verifique la cantidad y la direcciรณn de recepciรณn 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 las direcciones de Bitcoin para recibir los pagos . Se recomienda el uso de una nueva direcciรณn de recepciรณn para cada transacciรณn.</translation>
+ </message>
+ <message>
+ <source>Copy &amp;Label</source>
+ <translation>Copiar &amp;Etiqueta</translation>
+ </message>
+ <message>
+ <source>&amp;Edit</source>
+ <translation>&amp;Editar</translation>
+ </message>
+ <message>
+ <source>Export Address List</source>
+ <translation>Exportar lista de direcciones</translation>
+ </message>
+ <message>
+ <source>Comma separated file (*.csv)</source>
+ <translation>Coma(,) archivo separado (*.csv)</translation>
+ </message>
+ <message>
+ <source>Exporting Failed</source>
+ <translation>Exportaciรณn Fallida</translation>
+ </message>
+ <message>
+ <source>There was an error trying to save the address list to %1. Please try again.</source>
+ <translation>Hubo un error intentando guardar la lista de direcciones a %1 Intรฉntelo otravez</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>(ninguna direcciรณn)</translation>
+ </message>
+</context>
+<context>
+ <name>AskPassphraseDialog</name>
+ <message>
+ <source>Passphrase Dialog</source>
+ <translation>Diรกlogo de contraseรฑa</translation>
+ </message>
+ <message>
+ <source>Enter passphrase</source>
+ <translation>Poner contraseรฑa</translation>
+ </message>
+ <message>
+ <source>New passphrase</source>
+ <translation>Nueva contraseรฑa</translation>
+ </message>
+ <message>
+ <source>Repeat new passphrase</source>
+ <translation>Repetir nueva contraseรฑa</translation>
+ </message>
+ <message>
+ <source>Encrypt wallet</source>
+ <translation>Billetera Encriptada</translation>
+ </message>
+ <message>
+ <source>This operation needs your wallet passphrase to unlock the wallet.</source>
+ <translation>Esta operaciรณn necesita tu contraseรฑa de la billetera para desbloquear la billetera</translation>
+ </message>
+ <message>
+ <source>Unlock wallet</source>
+ <translation>Billetera Desbloqueada</translation>
+ </message>
+ <message>
+ <source>This operation needs your wallet passphrase to decrypt the wallet.</source>
+ <translation>Esta operaciรณn necesita tu contraseรฑa de la billetera para desencriptar la billetera.</translation>
+ </message>
+ <message>
+ <source>Decrypt wallet</source>
+ <translation>Billetera Desencriptada</translation>
+ </message>
+ <message>
+ <source>Change passphrase</source>
+ <translation>Cambiar contraseรฑa</translation>
+ </message>
+ <message>
+ <source>Confirm wallet encryption</source>
+ <translation>Confirmar encriptaciรณn de la billetera</translation>
+ </message>
+ <message>
+ <source>Warning: If you encrypt your wallet and lose your passphrase, you will &lt;b&gt;LOSE ALL OF YOUR BITCOINS&lt;/b&gt;!</source>
+ <translation>Precauciรณn: Si tรบ has encriptado tu billetera y has perdido tu contraseรฑa, usted &lt;b&gt;PERDERร TODOS TUS BITCOINS&lt;/b&gt;</translation>
+ </message>
+ <message>
+ <source>Are you sure you wish to encrypt your wallet?</source>
+ <translation>Estas seguro de que deseas encriptar tu billetera?</translation>
+ </message>
+ <message>
+ <source>Bitcoin Core 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>Bitcoin Core se cerrarรก ahora para finalizar el proceso de encriptaciรณn. Recuerda que encriptando tu billetera no protegera por completo tus bitcoins desde robos por malware que infectan tu computadora.</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 copias de seguridad anteriores que han hecho de su archivo cartera debe ser reemplazado por el archivo de la carpeta reciรฉn generado , encriptado . Por razones de seguridad , las copias de seguridad anteriores del archivo cartera sin cifrar se vuelven inรบtiles , tan pronto como empiece a utilizar el nuevo , carpeta cifrada .</translation>
+ </message>
+ <message>
+ <source>Warning: The Caps Lock key is on!</source>
+ <translation>Ojo: El bloqueo de MAYUSCULAS esta activado!</translation>
+ </message>
+ <message>
+ <source>Wallet encrypted</source>
+ <translation>Billetera encriptada</translation>
+ </message>
+ <message>
+ <source>Enter the new passphrase to the wallet.&lt;br/&gt;Please use a passphrase of &lt;b&gt;ten or more random characters&lt;/b&gt;, or &lt;b&gt;eight or more words&lt;/b&gt;.</source>
+ <translation>Poner la nueva contraseรฑa a la billetera.&lt;br/&gt;Por favor usa una contraseรฑa de &lt;b&gt;diez o mรกs palabras aleatorias&lt;/b&gt;, o &lt;b&gt;nueve o mรกs letras&lt;/b&gt;.</translation>
+ </message>
+ <message>
+ <source>Enter the old passphrase and new passphrase to the wallet.</source>
+ <translation>Poner la antigua contraseรฑa y nueva contraseรฑa a la billetera.</translation>
+ </message>
+ <message>
+ <source>Wallet encryption failed</source>
+ <translation>Encriptaciรณn de la billetera fallida</translation>
+ </message>
+ <message>
+ <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source>
+ <translation>Encriptaciรณn de la billetera fallida por un error interno. Tu billetera no ha sido encriptada.</translation>
+ </message>
+ <message>
+ <source>Wallet unlock failed</source>
+ <translation>Fallรณ el desbloqueo de la billetera</translation>
+ </message>
+ <message>
+ <source>The passphrase entered for the wallet decryption was incorrect.</source>
+ <translation>La contraseรฑa tecleada de la desencriptaciรณn de la billetera ha sido incorrecta.</translation>
+ </message>
+ <message>
+ <source>Wallet decryption failed</source>
+ <translation>Encriptaciรณn de la billetera fallida</translation>
+ </message>
+ <message>
+ <source>Wallet passphrase was successfully changed.</source>
+ <translation>La contraseรฑa de la billetera a sido cambiada exitosamente.</translation>
+ </message>
+</context>
+<context>
+ <name>BanTableModel</name>
+ </context>
+<context>
+ <name>BitcoinGUI</name>
+ <message>
+ <source>Synchronizing with network...</source>
+ <translation>Sincronizando con la red...</translation>
+ </message>
+ <message>
+ <source>Node</source>
+ <translation>Nodo</translation>
+ </message>
+ <message>
+ <source>Show general overview of wallet</source>
+ <translation>Mostrar vista general de la billetera</translation>
+ </message>
+ <message>
+ <source>&amp;Transactions</source>
+ <translation>&amp;Transacciones</translation>
+ </message>
+ <message>
+ <source>E&amp;xit</source>
+ <translation>S&amp;alir</translation>
+ </message>
+ <message>
+ <source>Quit application</source>
+ <translation>Salir de la aplicaciรณn</translation>
+ </message>
+ <message>
+ <source>About &amp;Qt</source>
+ <translation>Acerca de &amp;Qt</translation>
+ </message>
+ <message>
+ <source>Show information about Qt</source>
+ <translation>Mostrar informaciรณn sobre Qt</translation>
+ </message>
+ <message>
+ <source>&amp;Options...</source>
+ <translation>&amp;Opciones</translation>
+ </message>
+ <message>
+ <source>&amp;Encrypt Wallet...</source>
+ <translation>&amp;Billetera Encriptada</translation>
+ </message>
+ <message>
+ <source>&amp;Backup Wallet...</source>
+ <translation>&amp;Billetera Copia de seguridad...</translation>
+ </message>
+ <message>
+ <source>&amp;Change Passphrase...</source>
+ <translation>&amp;Cambiar contraseรฑa...</translation>
+ </message>
+ <message>
+ <source>&amp;Sending addresses...</source>
+ <translation>&amp;Enviando Direcciones...</translation>
+ </message>
+ <message>
+ <source>&amp;Receiving addresses...</source>
+ <translation>&amp;Recibiendo Direcciones...</translation>
+ </message>
+ <message>
+ <source>Open &amp;URI...</source>
+ <translation>Abrir &amp;URL...</translation>
+ </message>
+ <message>
+ <source>Bitcoin Core client</source>
+ <translation>Bitcoin Core cliente</translation>
+ </message>
+ <message>
+ <source>Importing blocks from disk...</source>
+ <translation>Importando bloques desde el disco...</translation>
+ </message>
+ <message>
+ <source>Send coins to a Bitcoin address</source>
+ <translation>Enviando monedas a una direcciรณn de Bitcoin</translation>
+ </message>
+ <message>
+ <source>Change the passphrase used for wallet encryption</source>
+ <translation>Cambiar la contraseรฑa usando la encriptaciรณn de la billetera</translation>
+ </message>
+ <message>
+ <source>&amp;Debug window</source>
+ <translation>&amp;Ventana desarrollador</translation>
+ </message>
+ <message>
+ <source>Open debugging and diagnostic console</source>
+ <translation>Abrir consola de diagnรณstico y desarrollo</translation>
+ </message>
+ <message>
+ <source>&amp;Verify message...</source>
+ <translation>&amp;Verificar Mensaje...</translation>
+ </message>
+ <message>
+ <source>Bitcoin</source>
+ <translation>Bitcoin</translation>
+ </message>
+ <message>
+ <source>Wallet</source>
+ <translation>Billetera</translation>
+ </message>
+ <message>
+ <source>&amp;Send</source>
+ <translation>&amp;Enviar</translation>
+ </message>
+ <message>
+ <source>&amp;Receive</source>
+ <translation>&amp;Recibir</translation>
+ </message>
+ <message>
+ <source>Show information about Bitcoin Core</source>
+ <translation>Mostrar informaciรณn sobre Bitcoin Core</translation>
+ </message>
+ <message>
+ <source>&amp;Show / Hide</source>
+ <translation>&amp;Mostrar / Ocultar</translation>
+ </message>
+ <message>
+ <source>Show or hide the main Window</source>
+ <translation>Mostrar u ocultar la Ventana Principal</translation>
+ </message>
+ <message>
+ <source>&amp;File</source>
+ <translation>&amp;Archivo</translation>
+ </message>
+ <message>
+ <source>&amp;Settings</source>
+ <translation>&amp;Configuraciones</translation>
+ </message>
+ <message>
+ <source>&amp;Help</source>
+ <translation>&amp;Ayuda</translation>
+ </message>
+ <message>
+ <source>Bitcoin Core</source>
+ <translation>Bitcoin Core</translation>
+ </message>
+ <message>
+ <source>Error</source>
+ <translation>Error</translation>
+ </message>
+ </context>
+<context>
+ <name>ClientModel</name>
+ </context>
+<context>
+ <name>CoinControlDialog</name>
+ <message>
+ <source>(no label)</source>
+ <translation>(ninguna direcciรณn)</translation>
+ </message>
+ </context>
+<context>
+ <name>EditAddressDialog</name>
+ </context>
+<context>
+ <name>FreespaceChecker</name>
+ </context>
+<context>
+ <name>HelpMessageDialog</name>
+ <message>
+ <source>Bitcoin Core</source>
+ <translation>Bitcoin Core</translation>
+ </message>
+ </context>
+<context>
+ <name>Intro</name>
+ <message>
+ <source>Bitcoin Core</source>
+ <translation>Bitcoin Core</translation>
+ </message>
+ <message>
+ <source>Error</source>
+ <translation>Error</translation>
+ </message>
+ </context>
+<context>
+ <name>OpenURIDialog</name>
+ </context>
+<context>
+ <name>OptionsDialog</name>
+ </context>
+<context>
+ <name>OverviewPage</name>
+ </context>
+<context>
+ <name>PaymentServer</name>
+ </context>
+<context>
+ <name>PeerTableModel</name>
+ </context>
+<context>
+ <name>QObject</name>
+ </context>
+<context>
+ <name>QRImageWidget</name>
+ </context>
+<context>
+ <name>RPCConsole</name>
+ </context>
+<context>
+ <name>ReceiveCoinsDialog</name>
+ </context>
+<context>
+ <name>ReceiveRequestDialog</name>
+ <message>
+ <source>Address</source>
+ <translation>Direcciรณn</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>(ninguna direcciรณn)</translation>
+ </message>
+ </context>
+<context>
+ <name>SendCoinsDialog</name>
+ <message>
+ <source>(no label)</source>
+ <translation>(ninguna direcciรณn)</translation>
+ </message>
+ </context>
+<context>
+ <name>SendCoinsEntry</name>
+ </context>
+<context>
+ <name>ShutdownWindow</name>
+ </context>
+<context>
+ <name>SignVerifyMessageDialog</name>
+ </context>
+<context>
+ <name>SplashScreen</name>
+ <message>
+ <source>Bitcoin Core</source>
+ <translation>Bitcoin Core</translation>
+ </message>
+ </context>
+<context>
+ <name>TrafficGraphWidget</name>
+ </context>
+<context>
+ <name>TransactionDesc</name>
+ </context>
+<context>
+ <name>TransactionDescDialog</name>
+ </context>
+<context>
+ <name>TransactionTableModel</name>
+ <message>
+ <source>Label</source>
+ <translation>Etiqueta</translation>
+ </message>
+ </context>
+<context>
+ <name>TransactionView</name>
+ <message>
+ <source>Exporting Failed</source>
+ <translation>Exportaciรณn Fallida</translation>
+ </message>
+ <message>
+ <source>Comma separated file (*.csv)</source>
+ <translation>Coma(,) archivo separado (*.csv)</translation>
+ </message>
+ <message>
+ <source>Label</source>
+ <translation>Etiqueta</translation>
+ </message>
+ <message>
+ <source>Address</source>
+ <translation>Direcciรณn</translation>
+ </message>
+ </context>
+<context>
+ <name>UnitDisplayStatusBarControl</name>
+ </context>
+<context>
+ <name>WalletFrame</name>
+ </context>
+<context>
+ <name>WalletModel</name>
+ </context>
+<context>
+ <name>WalletView</name>
+ <message>
+ <source>&amp;Export</source>
+ <translation>&amp;Exportar</translation>
+ </message>
+ </context>
+<context>
+ <name>bitcoin-core</name>
+ <message>
+ <source>Insufficient funds</source>
+ <translation>Fondos Insuficientes</translation>
+ </message>
+ <message>
+ <source>Loading wallet...</source>
+ <translation>Cargando billetera...</translation>
+ </message>
+ <message>
+ <source>Cannot write default address</source>
+ <translation>No se puede escribir la direcciรณn por defecto</translation>
+ </message>
+ <message>
+ <source>Rescanning...</source>
+ <translation>Reescaneando</translation>
+ </message>
+ <message>
+ <source>Done loading</source>
+ <translation>Listo Cargando</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_DO.ts b/src/qt/locale/bitcoin_es_DO.ts
index 0463c0f6e1..b4841ca9b8 100644
--- a/src/qt/locale/bitcoin_es_DO.ts
+++ b/src/qt/locale/bitcoin_es_DO.ts
@@ -1076,10 +1076,6 @@
<translation>General</translation>
</message>
<message>
- <source>Using OpenSSL version</source>
- <translation>Utilizando la versiรณn OpenSSL</translation>
- </message>
- <message>
<source>Startup time</source>
<translation>Hora de inicio</translation>
</message>
diff --git a/src/qt/locale/bitcoin_es_MX.ts b/src/qt/locale/bitcoin_es_MX.ts
index fa2b3c0623..b0dfa4ab7c 100644
--- a/src/qt/locale/bitcoin_es_MX.ts
+++ b/src/qt/locale/bitcoin_es_MX.ts
@@ -2,6 +2,10 @@
<context>
<name>AddressBookPage</name>
<message>
+ <source>Right-click to edit address or label</source>
+ <translation>Click derecho para editar tu direcciรณn o etiqueta</translation>
+ </message>
+ <message>
<source>Create a new address</source>
<translation>Crear una direcciรณn nueva</translation>
</message>
@@ -346,6 +350,10 @@
<translation>Acerca de Bitcoin Core</translation>
</message>
<message>
+ <source>Modify configuration options for Bitcoin Core</source>
+ <translation>Modificar las opciones de configuraciรณn de Bitcoin Core</translation>
+ </message>
+ <message>
<source>&amp;Command-line options</source>
<translation>opciones de la &amp;Linea de comandos</translation>
</message>
@@ -354,6 +362,18 @@
<translation>Mostrar mensaje de ayuda del nucleo de Bitcoin para optener una lista con los posibles comandos de Bitcoin</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 al dia </translation>
</message>
@@ -384,6 +404,10 @@
<context>
<name>CoinControlDialog</name>
<message>
+ <source>Quantity:</source>
+ <translation>Cantidad</translation>
+ </message>
+ <message>
<source>Bytes:</source>
<translation>Bytes:</translation>
</message>
@@ -400,6 +424,14 @@
<translation>Cuota:</translation>
</message>
<message>
+ <source>After Fee:</source>
+ <translation>Despuรฉs de los cargos por comisiรณn. </translation>
+ </message>
+ <message>
+ <source>Change:</source>
+ <translation>Cambio</translation>
+ </message>
+ <message>
<source>Amount</source>
<translation>Monto</translation>
</message>
@@ -428,6 +460,10 @@
<translation>Copiar monto</translation>
</message>
<message>
+ <source>Copy transaction ID</source>
+ <translation>Copiar identificaciรณn de la transacciรณn. </translation>
+ </message>
+ <message>
<source>Copy quantity</source>
<translation>Copiar cantidad</translation>
</message>
@@ -452,10 +488,30 @@
<translation>Copiar cambio</translation>
</message>
<message>
+ <source>low</source>
+ <translation>Bajo</translation>
+ </message>
+ <message>
+ <source>none</source>
+ <translation>Ninguno </translation>
+ </message>
+ <message>
+ <source>yes</source>
+ <translation>si</translation>
+ </message>
+ <message>
+ <source>no</source>
+ <translation>no</translation>
+ </message>
+ <message>
<source>(no label)</source>
<translation>(sin etiqueta)</translation>
</message>
- </context>
+ <message>
+ <source>(change)</source>
+ <translation>cambio</translation>
+ </message>
+</context>
<context>
<name>EditAddressDialog</name>
<message>
@@ -501,6 +557,10 @@
</context>
<context>
<name>FreespaceChecker</name>
+ <message>
+ <source>name</source>
+ <translation>nombre</translation>
+ </message>
</context>
<context>
<name>HelpMessageDialog</name>
@@ -539,6 +599,10 @@
<source>Bitcoin Core</source>
<translation>nucleo Bitcoin</translation>
</message>
+ <message>
+ <source>Error</source>
+ <translation>Error</translation>
+ </message>
</context>
<context>
<name>OpenURIDialog</name>
@@ -557,6 +621,10 @@
<source>W&amp;allet</source>
<translation>Cartera</translation>
</message>
+ <message>
+ <source>none</source>
+ <translation>Ninguno </translation>
+ </message>
</context>
<context>
<name>OverviewPage</name>
@@ -676,6 +744,10 @@
<translation>Enviar monedas</translation>
</message>
<message>
+ <source>Quantity:</source>
+ <translation>Cantidad</translation>
+ </message>
+ <message>
<source>Bytes:</source>
<translation>Bytes:</translation>
</message>
@@ -692,6 +764,14 @@
<translation>Cuota:</translation>
</message>
<message>
+ <source>After Fee:</source>
+ <translation>Despuรฉs de los cargos por comisiรณn. </translation>
+ </message>
+ <message>
+ <source>Change:</source>
+ <translation>Cambio</translation>
+ </message>
+ <message>
<source>fast</source>
<translation>rรกpido</translation>
</message>
@@ -1063,6 +1143,10 @@
<translation>copiar monto</translation>
</message>
<message>
+ <source>Copy transaction ID</source>
+ <translation>Copiar identificaciรณn de la transacciรณn. </translation>
+ </message>
+ <message>
<source>Edit label</source>
<translation>Editar capa </translation>
</message>
@@ -1178,6 +1262,14 @@
<translation>Opciones de cartera:</translation>
</message>
<message>
+ <source>Information</source>
+ <translation>Informaciรณn </translation>
+ </message>
+ <message>
+ <source>Warning</source>
+ <translation>Aviso</translation>
+ </message>
+ <message>
<source>Loading addresses...</source>
<translation>Cargando direcciones...</translation>
</message>
@@ -1193,5 +1285,9 @@
<source>Done loading</source>
<translation>Carga completa</translation>
</message>
- </context>
+ <message>
+ <source>Error</source>
+ <translation>Error</translation>
+ </message>
+</context>
</TS> \ No newline at end of file
diff --git a/src/qt/locale/bitcoin_et.ts b/src/qt/locale/bitcoin_et.ts
index 945e4cfa58..089f01035d 100644
--- a/src/qt/locale/bitcoin_et.ts
+++ b/src/qt/locale/bitcoin_et.ts
@@ -830,10 +830,6 @@
<translation>รœldine</translation>
</message>
<message>
- <source>Using OpenSSL version</source>
- <translation>Kasutan OpenSSL versiooni</translation>
- </message>
- <message>
<source>Startup time</source>
<translation>Kรคivitamise hetk</translation>
</message>
diff --git a/src/qt/locale/bitcoin_fa.ts b/src/qt/locale/bitcoin_fa.ts
index 7ab3b77da3..02c216765c 100644
--- a/src/qt/locale/bitcoin_fa.ts
+++ b/src/qt/locale/bitcoin_fa.ts
@@ -1000,10 +1000,6 @@
<translation>ูพู†ุฌุฑู‡ู” ุงุดฺฉุงู„ุฒุฏุงŒŒ</translation>
</message>
<message>
- <source>Using OpenSSL version</source>
- <translation>ู†ุณุฎู‡ู” OpenSSL ุงุณุชูุงุฏู‡ ุดุฏู‡</translation>
- </message>
- <message>
<source>Startup time</source>
<translation>ุฒู…ุงู† ุขุบุงุฒ ุจู‡ ฺฉุงุฑ</translation>
</message>
diff --git a/src/qt/locale/bitcoin_fi.ts b/src/qt/locale/bitcoin_fi.ts
index 57987b26ec..0fb6aebb9f 100644
--- a/src/qt/locale/bitcoin_fi.ts
+++ b/src/qt/locale/bitcoin_fi.ts
@@ -1474,10 +1474,6 @@
<translation>Yleinen</translation>
</message>
<message>
- <source>Using OpenSSL version</source>
- <translation>Kรคytรถssรค oleva OpenSSL-versio</translation>
- </message>
- <message>
<source>Using BerkeleyDB version</source>
<translation>Kรคyttรครค BerkeleyDB-versiota</translation>
</message>
@@ -2002,6 +1998,10 @@
<translation>Muokattu:</translation>
</message>
<message>
+ <source>(Smart fee not initialized yet. This usually takes a few blocks...)</source>
+ <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>
@@ -2908,10 +2908,38 @@
<translation>Jos &lt;category&gt; on toimittamatta tai jos &lt;category&gt; = 1, tulosta kaikki debug-tieto.</translation>
</message>
<message>
+ <source>Please check that your computer's date and time are correct! If your clock is wrong Bitcoin Core will not work properly.</source>
+ <translation>Tarkistathan ettรค tietokoneesi pรคivรคmรครคrรค ja kellonaika ovat oikeassa! Jos kellosi on vรครคrรคssรค, Bitcoin Core ei toimi oikein.</translation>
+ </message>
+ <message>
+ <source>Prune configured below the minimum of %d MiB. Please use a higher number.</source>
+ <translation>Karsinta konfiguroitu alle minimin %d MiB. Kรคytรค surempaa numeroa.</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>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, &gt;%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รค, &gt;%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>
+ <message>
<source>Error: A fatal internal error occurred, see debug.log for details</source>
<translation>Virhe: Kriittinen sisรคinen virhe kohdattiin, katso debug.log lisรคtietoja varten</translation>
</message>
<message>
+ <source>Fee (in %s/kB) to add to transactions you send (default: %s)</source>
+ <translation>Kulu (muodossa %s/kB) joka lisรคtรครคn rahansiirtoihin joita lรคhetรคt (oletus: %s)</translation>
+ </message>
+ <message>
+ <source>Pruning blockstore...</source>
+ <translation>Karsitaan lohkovarastoa...</translation>
+ </message>
+ <message>
<source>Run in the background as a daemon and accept commands</source>
<translation>Aja taustalla daemonina ja hyvรคksy komennot</translation>
</message>
@@ -2924,6 +2952,10 @@
<translation>Hyvรคksy yhteyksiรค ulkopuolelta (vakioasetus: 1 jos -proxy tai -connect ei mรครคritelty)</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>
+ </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>
@@ -2968,6 +3000,10 @@
<translation>Varoitus: wallet.dat -lompakkotiedosto on korruptoitunut, tiedot pelastettu. Alkuperรคinen wallet.dat -lompakkotiedosto on tallennettu wallet.{timestamp}.bak kansioon %s; jos balanssisi tai siirtohistoria on virheellinen, sinun tulisi palauttaa lompakkotiedosto varmuuskopiosta.</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>
+ </message>
+ <message>
<source>-maxmempool must be at least %d MB</source>
<translation>-maxmempool on oltava vรคhintรครคn %d MB</translation>
</message>
@@ -3088,18 +3124,22 @@
<translation>Lompakon valinnat:</translation>
</message>
<message>
- <source>Warning: This version is obsolete; upgrade required!</source>
- <translation>Varoitus: Tรคmรค versio on vanhentunut; pรคivittรคmistรค vaaditaan!</translation>
- </message>
- <message>
<source>You need to rebuild the database using -reindex to change -txindex</source>
<translation>Sinun tulee uudelleenrakentaa tietokanta kรคyttรคen -reindex vaihtaen -txindex</translation>
</message>
<message>
+ <source>Allow JSON-RPC connections from specified source. Valid for &lt;ip&gt; 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>Salli JSON-RPC-yhteydet mรครคritetystรค lรคhteestรค. Kelvolliset arvot &lt;ip&gt; ovat yksittรคinen IP (esim. 1.2.3.4), verkko/verkkomaski (esim. 1.2.3.4/255.255.255.0) tai verkko/luokaton reititys (esim. 1.2.3.4/24). Tรคtรค valintatapaa voidaan kรคyttรครค useita kertoja</translation>
+ </message>
+ <message>
<source>Cannot obtain a lock on data directory %s. Bitcoin Core is probably already running.</source>
<translation>Ei voida lukita data-hakemistoa %s. Bitcoin Core on luultavasti jo kรคynnissรค.</translation>
</message>
<message>
+ <source>Discover own IP addresses (default: 1 when listening and no -externalip or -proxy)</source>
+ <translation>Paljasta omat IP-osoitteet (oletus: 1 kun kuunnellaan ja -externalip tai -proxy ei ole kรคytรถssรค)</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>
@@ -3164,6 +3204,10 @@
<translation>Virheellinen mรครคrรค -mintxfee=&lt;amount&gt;: '%s'</translation>
</message>
<message>
+ <source>Keep at most &lt;n&gt; unconnectable transactions in memory (default: %u)</source>
+ <translation>Pidรค enimmillรครคn &lt;n&gt; yhdistรคmiskelvotonta rahansiirtoa muistissa (oletus: %u)</translation>
+ </message>
+ <message>
<source>Node relay options:</source>
<translation>Vรคlityssolmukohdan asetukset:</translation>
</message>
@@ -3284,10 +3328,22 @@
<translation>Virhe ladattaessa wallet.dat-tiedostoa: Lompakko vioittunut</translation>
</message>
<message>
+ <source>-maxtxfee is set very high! Fees this large could be paid on a single transaction.</source>
+ <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 &lt;n&gt; hours (default: %u)</source>
<translation>ร„lรค pidรค rahansiirtoja muistivarannoissa kauemmin kuin &lt;n&gt; tuntia (oletus: %u)</translation>
</message>
<message>
+ <source>Error reading wallet.dat! All keys read correctly, but transaction data or address book entries might be missing or incorrect.</source>
+ <translation>Virhe lukiessa wallet.dat-tiedostoa! Kaikki avaimet luettiin onnistuneesti, mutta rahansiirtotiedot tai osoitekirjan sisรคltรถ saattavat olla muuttuneita tai vรครคriรค.</translation>
+ </message>
+ <message>
<source>How thorough the block verification of -checkblocks is (0-4, default: %u)</source>
<translation>Kuinka lรคpikรคyvรค lohkojen -checkblocks -todennus on (0-4, oletus: %u)</translation>
</message>
@@ -3300,6 +3356,10 @@
<translation>(oletus: %s)</translation>
</message>
<message>
+ <source>Always query for peer addresses via DNS lookup (default: %u)</source>
+ <translation>Pyydรค vertaisten osoitteita aina DNS-kyselyjen avulla (oletus: %u)</translation>
+ </message>
+ <message>
<source>Error loading wallet.dat</source>
<translation>Virhe ladattaessa wallet.dat-tiedostoa</translation>
</message>
@@ -3328,6 +3388,10 @@
<translation>Kuuntele yhteyksiรค portissa &lt;port&gt; (oletus: %u tai testnet: %u)</translation>
</message>
<message>
+ <source>Maintain at most &lt;n&gt; connections to peers (default: %u)</source>
+ <translation>Yllรคpidรค enimmillรครคn &lt;n&gt; yhteyttรค vertaisiin (oletus: %u)</translation>
+ </message>
+ <message>
<source>Make the wallet broadcast transactions</source>
<translation>Aseta lompakko kuuluttamaan rahansiirtoja</translation>
</message>
@@ -3340,6 +3404,10 @@
<translation>Maksimi yhteyttรค kohden kรคytettรคvรค lรคhetyspuskurin koko, &lt;n&gt;*1000 tavua (oletus: %u)</translation>
</message>
<message>
+ <source>Prepend debug output with timestamp (default: %u)</source>
+ <translation>Lisรครค debug-tietojen alkuun aikaleimat (oletus: %u)</translation>
+ </message>
+ <message>
<source>Relay and mine data carrier transactions (default: %u)</source>
<translation>Vรคlitรค ja louhi dataa kantavia rahansiirtoja (oletus: %u)</translation>
</message>
@@ -3364,6 +3432,10 @@
<translation>Mรครคritรค asetustiedosto (oletus: %s)</translation>
</message>
<message>
+ <source>Specify connection timeout in milliseconds (minimum: 1, default: %d)</source>
+ <translation>Mรครคritรค yhteyden aikakatkaisu millisekunneissa (minimi: 1, oletus: %d)</translation>
+ </message>
+ <message>
<source>Specify pid file (default: %s)</source>
<translation>Mรครคritรค pid-tiedosto (oletus: %s)</translation>
</message>
@@ -3372,6 +3444,10 @@
<translation>Kรคytรค vahvistamattomia vaihtorahoja lรคhetettรคessรค rahansiirtoja (oletus: %u)</translation>
</message>
<message>
+ <source>Threshold for disconnecting misbehaving peers (default: %u)</source>
+ <translation>Aikavรคli sopimattomien vertaisten yhteyksien katkaisuun (oletus: %u)</translation>
+ </message>
+ <message>
<source>Unknown network specified in -onlynet: '%s'</source>
<translation>Tuntematon verkko -onlynet parametrina: '%s'</translation>
</message>
diff --git a/src/qt/locale/bitcoin_fil.ts b/src/qt/locale/bitcoin_fil.ts
new file mode 100644
index 0000000000..fba8238371
--- /dev/null
+++ b/src/qt/locale/bitcoin_fil.ts
@@ -0,0 +1,157 @@
+<TS language="fil" version="2.1">
+<context>
+ <name>AddressBookPage</name>
+ <message>
+ <source>Create a new address</source>
+ <translation>Gumawa ng bagong address</translation>
+ </message>
+ <message>
+ <source>Copy the currently selected address to the system clipboard</source>
+ <translation>Kopyahin ang napiling tahanan sa clipboard</translation>
+ </message>
+ <message>
+ <source>&amp;Copy</source>
+ <translation>Kumopya</translation>
+ </message>
+ <message>
+ <source>C&amp;lose</source>
+ <translation>Isarado</translation>
+ </message>
+ <message>
+ <source>&amp;Copy Address</source>
+ <translation>Tumulad ng kinatatahanan</translation>
+ </message>
+ <message>
+ <source>Delete the currently selected address from the list</source>
+ <translation>Alisin ang napiling address sa pagpipilian</translation>
+ </message>
+ <message>
+ <source>Choose the address to send coins to</source>
+ <translation>Pumili ng pagpapadalahang address</translation>
+ </message>
+ <message>
+ <source>Choose the address to receive coins with</source>
+ <translation>Piliin ang address ng nagpadala</translation>
+ </message>
+ <message>
+ <source>C&amp;hoose</source>
+ <translation>Piliin</translation>
+ </message>
+ <message>
+ <source>Sending addresses</source>
+ <translation>Address pagpapadala</translation>
+ </message>
+ <message>
+ <source>Receiving addresses</source>
+ <translation>Address bilang pagtanggap</translation>
+ </message>
+ </context>
+<context>
+ <name>AddressTableModel</name>
+ </context>
+<context>
+ <name>AskPassphraseDialog</name>
+ </context>
+<context>
+ <name>BanTableModel</name>
+ </context>
+<context>
+ <name>BitcoinGUI</name>
+ </context>
+<context>
+ <name>ClientModel</name>
+ </context>
+<context>
+ <name>CoinControlDialog</name>
+ </context>
+<context>
+ <name>EditAddressDialog</name>
+ </context>
+<context>
+ <name>FreespaceChecker</name>
+ </context>
+<context>
+ <name>HelpMessageDialog</name>
+ </context>
+<context>
+ <name>Intro</name>
+ </context>
+<context>
+ <name>OpenURIDialog</name>
+ </context>
+<context>
+ <name>OptionsDialog</name>
+ </context>
+<context>
+ <name>OverviewPage</name>
+ </context>
+<context>
+ <name>PaymentServer</name>
+ </context>
+<context>
+ <name>PeerTableModel</name>
+ </context>
+<context>
+ <name>QObject</name>
+ </context>
+<context>
+ <name>QRImageWidget</name>
+ </context>
+<context>
+ <name>RPCConsole</name>
+ </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>
+ </context>
+<context>
+ <name>ShutdownWindow</name>
+ </context>
+<context>
+ <name>SignVerifyMessageDialog</name>
+ </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>
+ </context>
+</TS> \ No newline at end of file
diff --git a/src/qt/locale/bitcoin_fr.ts b/src/qt/locale/bitcoin_fr.ts
index a0b9feb9ad..65808c7740 100644
--- a/src/qt/locale/bitcoin_fr.ts
+++ b/src/qt/locale/bitcoin_fr.ts
@@ -1244,7 +1244,7 @@
</message>
<message>
<source>Mined balance that has not yet matured</source>
- <translation>Le solde gรฉnรฉrรฉ n'est pas encore mรปr</translation>
+ <translation>Le solde minรฉ n'est pas encore mรปr</translation>
</message>
<message>
<source>Balances</source>
@@ -1474,10 +1474,6 @@
<translation>Gรฉnรฉral</translation>
</message>
<message>
- <source>Using OpenSSL version</source>
- <translation>Version d'OpenSSL utilisรฉe</translation>
- </message>
- <message>
<source>Using BerkeleyDB version</source>
<translation>Version BerkeleyDB utilisรฉe</translation>
</message>
@@ -2980,6 +2976,18 @@
<translation>Accepter les connexions entrantes (par dรฉfautย : 1 si aucun -proxy ou -connect )</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>
+ </message>
+ <message>
+ <source>A fee rate (in %s/kB) that will be used when fee estimation has insufficient data (default: %s)</source>
+ <translation>Un taux de frais (en %s/Ko) qui sera utilisรฉ si l'estimation de frais ne possรจde pas suffisamment de donnรฉes (par dรฉfaut : %s)</translation>
+ </message>
+ <message>
+ <source>Accept relayed transactions received from whitelisted peers even when not relaying transactions (default: %d)</source>
+ <translation>Accepter les transactions relayรฉes reรงues de pairs de la liste blanche mรชme si le nล“ud ne relaie pas les transactions (par dรฉfaut : %d)</translation>
+ </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>
</message>
@@ -3012,6 +3020,10 @@
<translation>Impossible de se lier ร  %s sur cet ordinateur. Bitcoin Core fonctionne probablement dรฉjร .</translation>
</message>
<message>
+ <source>Unsupported argument -whitelistalwaysrelay ignored, use -whitelistrelay and/or -whitelistforcerelay.</source>
+ <translation>Argument non pris charge -whitelistalwaysrelay ignorรฉ, utiliser -whitelistrelay et/ou -whitelistforcerelay.</translation>
+ </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>
</message>
@@ -3028,6 +3040,10 @@
<translation>Avertissement : le rรฉseau ne semble pas totalement d'accord ! Quelques mineurs semblent รฉprouver des difficultรฉs.</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>
+ <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>
</message>
@@ -3048,6 +3064,10 @@
<translation>&lt;category&gt; peut รชtre :</translation>
</message>
<message>
+ <source>Append comment to the user agent string</source>
+ <translation>Ajouter un commentaire ร  la chaรฎne d'agent utilisateur</translation>
+ </message>
+ <message>
<source>Block creation options:</source>
<translation>Options de crรฉation de bloc :</translation>
</message>
@@ -3128,10 +3148,22 @@
<translation>Adresse -onion invalide : ยซ %s ยป</translation>
</message>
<message>
+ <source>Invalid amount for -fallbackfee=&lt;amount&gt;: '%s'</source>
+ <translation>Montant invalide pour -fallbackfee=&lt;amount&gt; : ยซ %s ยป</translation>
+ </message>
+ <message>
<source>Keep the transaction memory pool below &lt;n&gt; megabytes (default: %u)</source>
<translation>Garder la rรฉserve de mรฉmoire transactionnelle sous &lt;n&gt; mรฉgaoctets (par dรฉfaut : %u)</translation>
</message>
<message>
+ <source>Location of the auth cookie (default: data dir)</source>
+ <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>
@@ -3140,6 +3172,10 @@
<translation>Seulement se connecter aux nล“uds du rรฉseau &lt;net&gt; (IPv4, IPv6 ou oignon)</translation>
</message>
<message>
+ <source>Print version and exit</source>
+ <translation>Imprimer la version et quitter</translation>
+ </message>
+ <message>
<source>Prune cannot be configured with a negative value.</source>
<translation>L'รฉlagage ne peut pas รชtre configurรฉ avec une valeur nรฉgative.</translation>
</message>
@@ -3196,10 +3232,6 @@
<translation>Options du portefeuille :</translation>
</message>
<message>
- <source>Warning: This version is obsolete; upgrade required!</source>
- <translation>Avertissement : cette version est obsolรจte. Une mise ร  niveau est exigรฉe !</translation>
- </message>
- <message>
<source>You need to rebuild the database using -reindex to change -txindex</source>
<translation>Vous devez reconstruire la base de donnรฉes en utilisant -reindex afin de modifier -txindex</translation>
</message>
@@ -3296,10 +3328,6 @@
<translation>Activation de la meilleure chaรฎne...</translation>
</message>
<message>
- <source>Always relay transactions received from whitelisted peers (default: %d)</source>
- <translation>Toujours relayer les transactions reรงues des pairs de la liste blanche (par dรฉfaut : %d)</translation>
- </message>
- <message>
<source>Attempt to recover private keys from a corrupt wallet.dat on startup</source>
<translation>Tenter de rรฉcupรฉrer les clefs privรฉes d'un wallet.dat corrompu lors du dรฉmarrage</translation>
</message>
@@ -3381,7 +3409,7 @@
</message>
<message>
<source>Receive and display P2P network alerts (default: %u)</source>
- <translation>Recevoir et afficher les alertes du rรฉseau poste ร  poste (%u par dรฉfaut)</translation>
+ <translation>Recevoir et afficher les alertes du rรฉseau poste ร  poste (par dรฉfaut : %u)</translation>
</message>
<message>
<source>Reducing -maxconnections from %d to %d, because of system limitations.</source>
@@ -3464,6 +3492,10 @@
<translation>Avertissement</translation>
</message>
<message>
+ <source>Warning: unknown new rules activated (versionbit %i)</source>
+ <translation>Avertissement : nouvelles rรจgles inconnues activรฉes (bit de version %i)</translation>
+ </message>
+ <message>
<source>Whether to operate in a blocks only mode (default: %u)</source>
<translation>Faut-il fonctionner en mode blocs seulement (par dรฉfaut : %u)</translation>
</message>
diff --git a/src/qt/locale/bitcoin_fr_FR.ts b/src/qt/locale/bitcoin_fr_FR.ts
index df63243353..9a2ac551c6 100644
--- a/src/qt/locale/bitcoin_fr_FR.ts
+++ b/src/qt/locale/bitcoin_fr_FR.ts
@@ -2,26 +2,103 @@
<context>
<name>AddressBookPage</name>
<message>
+ <source>Right-click to edit address or label</source>
+ <translation>Double cliquez afin de modifier l'adresse ou l'รฉtiquette</translation>
+ </message>
+ <message>
<source>Create a new address</source>
<translation>Crรฉer une nouvelle adresse</translation>
</message>
<message>
+ <source>&amp;New</source>
+ <translation>&amp;Nouveau</translation>
+ </message>
+ <message>
<source>Copy the currently selected address to the system clipboard</source>
<translation>Copier l'adresse surlignรฉe dans votre presse-papiers</translation>
</message>
<message>
+ <source>&amp;Copy</source>
+ <translation>&amp;Copie</translation>
+ </message>
+ <message>
+ <source>C&amp;lose</source>
+ <translation>F&amp;ermer</translation>
+ </message>
+ <message>
+ <source>&amp;Copy Address</source>
+ <translation>&amp;Adresse de copie</translation>
+ </message>
+ <message>
+ <source>Delete the currently selected address from the list</source>
+ <translation>Supprimer l'adresse sรฉlectionnรฉe de la liste</translation>
+ </message>
+ <message>
<source>Export the data in the current tab to a file</source>
<translation>Exporter les donnรฉes de l'onglet courant vers un fichier</translation>
</message>
<message>
+ <source>&amp;Export</source>
+ <translation>&amp;Exporter...</translation>
+ </message>
+ <message>
<source>&amp;Delete</source>
<translation>&amp;Supprimer</translation>
</message>
<message>
+ <source>Choose the address to send coins to</source>
+ <translation>Choisissez une adresse oรน envoyer les bitcoins</translation>
+ </message>
+ <message>
+ <source>Choose the address to receive coins with</source>
+ <translation>Choisissez une adresse oรน recevoir les bitcoins</translation>
+ </message>
+ <message>
+ <source>C&amp;hoose</source>
+ <translation>C&amp;oisir</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 qui vous permettent d'envoyer des paiements. Vรฉrifiez toujours le montant et l'adresse de rรฉception 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 qui vous permettent de recevoir des paiements. Il est recommandรฉ d'utiliser une nouvelle adresse de rรฉception pour chaque transaction</translation>
+ </message>
+ <message>
+ <source>Copy &amp;Label</source>
+ <translation>Copier &amp;ร‰tiquette </translation>
+ </message>
+ <message>
+ <source>&amp;Edit</source>
+ <translation>&amp;ร‰diter </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>
- </context>
+ <message>
+ <source>Exporting Failed</source>
+ <translation>ร‰chec de l'export</translation>
+ </message>
+ <message>
+ <source>There was an error trying to save the address list to %1. Please try again.</source>
+ <translation>Il y a eu une erreur durant la tentative de sauvegarde de la liste dโ€™adresse vers %1.
+Rรฉessayez.</translation>
+ </message>
+</context>
<context>
<name>AddressTableModel</name>
<message>
@@ -40,6 +117,10 @@
<context>
<name>AskPassphraseDialog</name>
<message>
+ <source>Passphrase Dialog</source>
+ <translation>Dialogue mot de passe</translation>
+ </message>
+ <message>
<source>Enter passphrase</source>
<translation>Entrez la phrase de passe</translation>
</message>
@@ -80,10 +161,30 @@
<translation>Confirmer le chiffrement du porte-monnaie</translation>
</message>
<message>
+ <source>Warning: If you encrypt your wallet and lose your passphrase, you will &lt;b&gt;LOSE ALL OF YOUR BITCOINS&lt;/b&gt;!</source>
+ <translation>Attention: Si vous cryptez votre portefeuille et que vous perdez votre mot de passe vous &lt;b&gt; PERDREZ TOUS VOS BITCOINS&lt;/b&gt;!</translation>
+ </message>
+ <message>
+ <source>Are you sure you wish to encrypt your wallet?</source>
+ <translation>รŠtes-vous sรปr de de vouloir crypter votre portefeuille ? </translation>
+ </message>
+ <message>
+ <source>Bitcoin Core 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>Bitcoin Core fermera maintenant pour finir le processus de chiffrement. Rappelez-vous que crypter votre portefeuille ne protรฉge pas totalement vos bitcoins d'รชtre volรฉ par un malware ayant infectรฉ votre ordinateur. </translation>
+ </message>
+ <message>
+ <source>Warning: The Caps Lock key is on!</source>
+ <translation>Attention : La touche majuscule est enfoncรฉ.</translation>
+ </message>
+ <message>
<source>Wallet encrypted</source>
<translation>Porte-monnaie chiffrรฉ</translation>
</message>
<message>
+ <source>Enter the old passphrase and new passphrase to the wallet.</source>
+ <translation>Entrez l'ancien mot de passe et le nouveau mot de passe pour le portefeuille</translation>
+ </message>
+ <message>
<source>Wallet encryption failed</source>
<translation>Le chiffrement du porte-monnaie a รฉchouรฉ</translation>
</message>
@@ -107,13 +208,29 @@
<source>Wallet decryption failed</source>
<translation>Le dรฉcryptage du porte-monnaie a รฉchouรฉ</translation>
</message>
- </context>
+ <message>
+ <source>Wallet passphrase was successfully changed.</source>
+ <translation>Le changement du mot de passe du portefeuille ร  รฉtรฉ effectuรฉ avec succรจs.</translation>
+ </message>
+</context>
<context>
<name>BanTableModel</name>
- </context>
+ <message>
+ <source>IP/Netmask</source>
+ <translation>IP/Masque de sous rรฉseau</translation>
+ </message>
+ <message>
+ <source>Banned Until</source>
+ <translation>Banni jusque </translation>
+ </message>
+</context>
<context>
<name>BitcoinGUI</name>
<message>
+ <source>Sign &amp;message...</source>
+ <translation>Signer &amp;message...</translation>
+ </message>
+ <message>
<source>Synchronizing with network...</source>
<translation>Synchronisation avec le rรฉseau...</translation>
</message>
@@ -122,6 +239,10 @@
<translation>&amp;Vue d'ensemble</translation>
</message>
<message>
+ <source>Node</source>
+ <translation>Nล“ud</translation>
+ </message>
+ <message>
<source>Show general overview of wallet</source>
<translation>Affiche une vue d'ensemble du porte-monnaie</translation>
</message>
@@ -154,6 +275,46 @@
<translation>&amp;Options...</translation>
</message>
<message>
+ <source>&amp;Encrypt Wallet...</source>
+ <translation>&amp;Chiffrer le portefeuille </translation>
+ </message>
+ <message>
+ <source>&amp;Backup Wallet...</source>
+ <translation>&amp;Sauvegarder le portefeuille</translation>
+ </message>
+ <message>
+ <source>&amp;Change Passphrase...</source>
+ <translation>&amp;Modifier le mot de passe</translation>
+ </message>
+ <message>
+ <source>&amp;Sending addresses...</source>
+ <translation>&amp;Adresses d'envoi</translation>
+ </message>
+ <message>
+ <source>&amp;Receiving addresses...</source>
+ <translation>&amp;Adresses de rรฉception</translation>
+ </message>
+ <message>
+ <source>Open &amp;URI...</source>
+ <translation>Ouvrir &amp;URI</translation>
+ </message>
+ <message>
+ <source>Bitcoin Core client</source>
+ <translation>Client Bitcoin Core</translation>
+ </message>
+ <message>
+ <source>Importing blocks from disk...</source>
+ <translation>Importer les blocs depuis le disque...</translation>
+ </message>
+ <message>
+ <source>Reindexing blocks on disk...</source>
+ <translation>Rรฉindexer les blocs sur le disque...</translation>
+ </message>
+ <message>
+ <source>Send coins to a Bitcoin address</source>
+ <translation>Envoyer des piรจces ร  une adresse Bitcoin</translation>
+ </message>
+ <message>
<source>Backup wallet to another location</source>
<translation>Sauvegarder le porte-monnaie ร  un autre emplacement</translation>
</message>
@@ -162,14 +323,54 @@
<translation>Modifier la phrase de passe utilisรฉe pour le cryptage du porte-monnaie</translation>
</message>
<message>
+ <source>&amp;Debug window</source>
+ <translation>&amp;Fenรชtre de dรฉbogage</translation>
+ </message>
+ <message>
+ <source>Open debugging and diagnostic console</source>
+ <translation>Ouvrir la console de dรฉbogage et de diagnostic</translation>
+ </message>
+ <message>
+ <source>&amp;Verify message...</source>
+ <translation>&amp;Vรฉrification du message</translation>
+ </message>
+ <message>
<source>Bitcoin</source>
<translation>Bitcoin</translation>
</message>
<message>
+ <source>Wallet</source>
+ <translation>Portefeuille</translation>
+ </message>
+ <message>
<source>&amp;Send</source>
<translation>&amp;Envoyer</translation>
</message>
<message>
+ <source>&amp;Receive</source>
+ <translation>&amp;Rรฉception</translation>
+ </message>
+ <message>
+ <source>Show information about Bitcoin Core</source>
+ <translation>Montrer les informations ร  propos de Bitcoin Core</translation>
+ </message>
+ <message>
+ <source>&amp;Show / Hide</source>
+ <translation>&amp;Montrer / Cacher</translation>
+ </message>
+ <message>
+ <source>Show or hide the main Window</source>
+ <translation>Montrer ou cacher la fenรชtre principale</translation>
+ </message>
+ <message>
+ <source>Encrypt the private keys that belong to your wallet</source>
+ <translation>Crypter les clรฉ privรฉes qui appartiennent votre portefeuille</translation>
+ </message>
+ <message>
+ <source>Sign messages with your Bitcoin addresses to prove you own them</source>
+ <translation>Signer vos messages avec vos adresses Bitcoin pour prouver que vous les dรฉtenez</translation>
+ </message>
+ <message>
<source>&amp;File</source>
<translation>&amp;Fichier</translation>
</message>
@@ -186,6 +387,86 @@
<translation>Barre d'outils des onglets</translation>
</message>
<message>
+ <source>Bitcoin Core</source>
+ <translation>Bitcoin Core</translation>
+ </message>
+ <message>
+ <source>Request payments (generates QR codes and bitcoin: URIs)</source>
+ <translation>Demander des paiements (gรฉnรฉrer QR codes et bitcoin: URIs)</translation>
+ </message>
+ <message>
+ <source>&amp;About Bitcoin Core</source>
+ <translation>&amp;ร€ propos de Bitcoin</translation>
+ </message>
+ <message>
+ <source>Modify configuration options for Bitcoin Core</source>
+ <translation>Modifier les options de configuration de Bitcoin Core</translation>
+ </message>
+ <message>
+ <source>Show the list of used sending addresses and labels</source>
+ <translation>Montrer la liste des adresses d'envois utilisรฉes et les รฉtiquettes</translation>
+ </message>
+ <message>
+ <source>Open a bitcoin: URI or payment request</source>
+ <translation>Ouvrir un bitcoin: URI ou demande de paiement</translation>
+ </message>
+ <message>
+ <source>&amp;Command-line options</source>
+ <translation>&amp;Options de ligne de commande</translation>
+ </message>
+ <message numerus="yes">
+ <source>%n active connection(s) to Bitcoin network</source>
+ <translation><numerusform>%n connexion active au rรฉseau Bitcoin</numerusform><numerusform>%n connexions actives au rรฉseau Bitcoin</numerusform></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>
+ <message>
+ <source>Last received block was generated %1 ago.</source>
+ <translation>Le dernier bloc reรงu a รฉtรฉ gรฉnรฉrรฉ %1.</translation>
+ </message>
+ <message>
+ <source>Transactions after this will not yet be visible.</source>
+ <translation>Les transactions ne seront plus visible aprรจs ceci.</translation>
+ </message>
+ <message>
+ <source>Error</source>
+ <translation>Erreur</translation>
+ </message>
+ <message>
+ <source>Warning</source>
+ <translation>Attention</translation>
+ </message>
+ <message>
+ <source>Information</source>
+ <translation>Information</translation>
+ </message>
+ <message>
<source>Up to date</source>
<translation>ร€ jour</translation>
</message>
@@ -194,6 +475,36 @@
<translation>Rattrapage...</translation>
</message>
<message>
+ <source>Date: %1
+</source>
+ <translation>Date: %1
+</translation>
+ </message>
+ <message>
+ <source>Amount: %1
+</source>
+ <translation>Montant:%1
+</translation>
+ </message>
+ <message>
+ <source>Type: %1
+</source>
+ <translation>Type: %1
+</translation>
+ </message>
+ <message>
+ <source>Label: %1
+</source>
+ <translation>ร‰tiquette: %1
+</translation>
+ </message>
+ <message>
+ <source>Address: %1
+</source>
+ <translation>Adresse: %1
+</translation>
+ </message>
+ <message>
<source>Sent transaction</source>
<translation>Transaction envoyรฉe</translation>
</message>
@@ -212,26 +523,90 @@
</context>
<context>
<name>ClientModel</name>
- </context>
+ <message>
+ <source>Network Alert</source>
+ <translation>Alerte rรฉseau</translation>
+ </message>
+</context>
<context>
<name>CoinControlDialog</name>
<message>
+ <source>Coin Selection</source>
+ <translation>Sรฉlection de piรจce </translation>
+ </message>
+ <message>
+ <source>Quantity:</source>
+ <translation>Quantitรฉ:</translation>
+ </message>
+ <message>
+ <source>Bytes:</source>
+ <translation>Octets:</translation>
+ </message>
+ <message>
<source>Amount:</source>
<translation>Montant :</translation>
</message>
<message>
+ <source>Priority:</source>
+ <translation>Prioritรฉ:</translation>
+ </message>
+ <message>
+ <source>Fee:</source>
+ <translation>Frais:</translation>
+ </message>
+ <message>
+ <source>Dust:</source>
+ <translation>Poussiรจre: </translation>
+ </message>
+ <message>
+ <source>After Fee:</source>
+ <translation>Aprรจs frais:</translation>
+ </message>
+ <message>
+ <source>Change:</source>
+ <translation>Change:</translation>
+ </message>
+ <message>
+ <source>(un)select all</source>
+ <translation>(dรฉ)sรฉlectionnรฉ tout:</translation>
+ </message>
+ <message>
+ <source>Tree mode</source>
+ <translation>Mode arbre</translation>
+ </message>
+ <message>
+ <source>List mode</source>
+ <translation>Mode list</translation>
+ </message>
+ <message>
<source>Amount</source>
<translation>Montant</translation>
</message>
<message>
+ <source>Received with label</source>
+ <translation>Reรงu avec : </translation>
+ </message>
+ <message>
+ <source>Received with address</source>
+ <translation>Reรงue avec l'adresse</translation>
+ </message>
+ <message>
<source>Date</source>
<translation>Date</translation>
</message>
<message>
+ <source>Confirmations</source>
+ <translation>Confirmations</translation>
+ </message>
+ <message>
<source>Confirmed</source>
<translation>Confirmรฉe</translation>
</message>
<message>
+ <source>Priority</source>
+ <translation>Prioritรฉ</translation>
+ </message>
+ <message>
<source>Copy address</source>
<translation>Copier l'adresse</translation>
</message>
@@ -244,10 +619,130 @@
<translation>Copier le montant</translation>
</message>
<message>
+ <source>Copy transaction ID</source>
+ <translation>Copie ID transaction</translation>
+ </message>
+ <message>
+ <source>Lock unspent</source>
+ <translation>Verrouiller les non dรฉpensรฉs</translation>
+ </message>
+ <message>
+ <source>Unlock unspent</source>
+ <translation>Dรฉverrouiller les non dรฉpensรฉs</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 priority</source>
+ <translation>Copier la prioritรฉ </translation>
+ </message>
+ <message>
+ <source>Copy dust</source>
+ <translation>Copier la poussiรจre </translation>
+ </message>
+ <message>
+ <source>Copy change</source>
+ <translation>Copier changement </translation>
+ </message>
+ <message>
+ <source>highest</source>
+ <translation>le plus รฉlevรฉ</translation>
+ </message>
+ <message>
+ <source>higher</source>
+ <translation>plus haute</translation>
+ </message>
+ <message>
+ <source>high</source>
+ <translation>haut</translation>
+ </message>
+ <message>
+ <source>medium-high</source>
+ <translation>moyen-รฉlevรฉ</translation>
+ </message>
+ <message>
+ <source>medium</source>
+ <translation>moyen</translation>
+ </message>
+ <message>
+ <source>low-medium</source>
+ <translation>bas-moyen</translation>
+ </message>
+ <message>
+ <source>low</source>
+ <translation>bas</translation>
+ </message>
+ <message>
+ <source>lower</source>
+ <translation>infรฉrieur</translation>
+ </message>
+ <message>
+ <source>lowest</source>
+ <translation>le plus bas </translation>
+ </message>
+ <message>
+ <source>(%1 locked)</source>
+ <translation>(%1 verrouillรฉ)</translation>
+ </message>
+ <message>
+ <source>none</source>
+ <translation>aucun</translation>
+ </message>
+ <message>
+ <source>This label turns red if the transaction size is greater than 1000 bytes.</source>
+ <translation>Cette รฉtiquette devient rouge si la taille de la transaction est plus grande que 1000 octets</translation>
+ </message>
+ <message>
+ <source>This label turns red if the priority is smaller than "medium".</source>
+ <translation>Cette รฉtiquette devient rouge si la prioritรฉ est plus petite que "moyen"</translation>
+ </message>
+ <message>
+ <source>Can vary +/- %1 satoshi(s) per input.</source>
+ <translation>Peut varier de +/- %1 satoshi(s) par entrรฉe.</translation>
+ </message>
+ <message>
+ <source>yes</source>
+ <translation>oui</translation>
+ </message>
+ <message>
+ <source>no</source>
+ <translation>non</translation>
+ </message>
+ <message>
+ <source>This means a fee of at least %1 per kB is required.</source>
+ <translation>Cela signifie que des frais d'au moins %1 par kO sont requis.</translation>
+ </message>
+ <message>
+ <source>Can vary +/- 1 byte per input.</source>
+ <translation>Peut varier de +/- 1 octet par entrรฉe.</translation>
+ </message>
+ <message>
<source>(no label)</source>
<translation>(aucune รฉtiquette)</translation>
</message>
- </context>
+ <message>
+ <source>change from %1 (%2)</source>
+ <translation>changement de %1 (%2)</translation>
+ </message>
+ <message>
+ <source>(change)</source>
+ <translation>(changement)</translation>
+ </message>
+</context>
<context>
<name>EditAddressDialog</name>
<message>
@@ -283,6 +778,10 @@
<translation>L'adresse fournie ยซ %1 ยป est dรฉjร  prรฉsente dans le carnet d'adresses.</translation>
</message>
<message>
+ <source>The entered address "%1" is not a valid Bitcoin address.</source>
+ <translation>L'adresse entrรฉe "%1" n'est pas une adresse Bitcoin valide.</translation>
+ </message>
+ <message>
<source>Could not unlock wallet.</source>
<translation>Impossible de dรฉverrouiller le porte-monnaie.</translation>
</message>
@@ -293,20 +792,124 @@
</context>
<context>
<name>FreespaceChecker</name>
- </context>
+ <message>
+ <source>A new data directory will be created.</source>
+ <translation>Un nouveau rรฉpertoire de donnรฉes sera crรฉรฉ. </translation>
+ </message>
+ <message>
+ <source>name</source>
+ <translation>nom</translation>
+ </message>
+ <message>
+ <source>Path already exists, and is not a directory.</source>
+ <translation>Le chemin existe dรฉjร  et ce n'est pas un rรฉpertoire. </translation>
+ </message>
+ <message>
+ <source>Cannot create data directory here.</source>
+ <translation>Impossible de crรฉer un rรฉpertoire ici.</translation>
+ </message>
+</context>
<context>
<name>HelpMessageDialog</name>
<message>
+ <source>Bitcoin Core</source>
+ <translation>Bitcoin Core</translation>
+ </message>
+ <message>
+ <source>version</source>
+ <translation>version</translation>
+ </message>
+ <message>
+ <source>(%1-bit)</source>
+ <translation>(%1-bit)</translation>
+ </message>
+ <message>
+ <source>About Bitcoin Core</source>
+ <translation>ร€ propos de Bitcoin Core</translation>
+ </message>
+ <message>
+ <source>Command-line options</source>
+ <translation>Options de ligne de commande</translation>
+ </message>
+ <message>
<source>Usage:</source>
<translation>Utilisation :</translation>
</message>
+ <message>
+ <source>command-line options</source>
+ <translation>Options de ligne de commande</translation>
+ </message>
+ <message>
+ <source>UI Options:</source>
+ <translation>Options interface graphique:</translation>
+ </message>
+ <message>
+ <source>Start minimized</source>
+ <translation>Dรฉmarrer sous forme minimisรฉe</translation>
+ </message>
</context>
<context>
<name>Intro</name>
- </context>
+ <message>
+ <source>Welcome</source>
+ <translation>Bienvenue </translation>
+ </message>
+ <message>
+ <source>Welcome to Bitcoin Core.</source>
+ <translation>Bienvenue sur Bitcoin Core.</translation>
+ </message>
+ <message>
+ <source>Use the default data directory</source>
+ <translation>Utiliser le rรฉpertoire par dรฉfaut </translation>
+ </message>
+ <message>
+ <source>Use a custom data directory:</source>
+ <translation>Utiliser votre propre rรฉpertoire</translation>
+ </message>
+ <message>
+ <source>Bitcoin Core</source>
+ <translation>Bitcoin Core</translation>
+ </message>
+ <message>
+ <source>Error: Specified data directory "%1" cannot be created.</source>
+ <translation>Erreur: Le rรฉpertoire de donnรฉes "%1" n'a pas pu รชtre crรฉรฉ. </translation>
+ </message>
+ <message>
+ <source>Error</source>
+ <translation>Erreur</translation>
+ </message>
+ <message numerus="yes">
+ <source>%n GB of free space available</source>
+ <translation><numerusform>%n GO d'espace libre disponible</numerusform><numerusform>%n GO d'espace libre disponible</numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <source>(of %n GB needed)</source>
+ <translation><numerusform>(%n GB nรฉcessaire)</numerusform><numerusform>(%n GB nรฉcessaire)</numerusform></translation>
+ </message>
+</context>
<context>
<name>OpenURIDialog</name>
- </context>
+ <message>
+ <source>Open URI</source>
+ <translation>Ouvrir URI</translation>
+ </message>
+ <message>
+ <source>Open payment request from URI or file</source>
+ <translation>Ouvrir une demande de paiement depuis une URI ou un fichier</translation>
+ </message>
+ <message>
+ <source>URI:</source>
+ <translation>URI:</translation>
+ </message>
+ <message>
+ <source>Select payment request file</source>
+ <translation>Sรฉlectionner un fichier de demande de paiement</translation>
+ </message>
+ <message>
+ <source>Select payment request file to open</source>
+ <translation>Sรฉlectionnez le fichier de demande de paiement ร  ouvrir</translation>
+ </message>
+</context>
<context>
<name>OptionsDialog</name>
<message>
@@ -314,6 +917,50 @@
<translation>Options</translation>
</message>
<message>
+ <source>&amp;Main</source>
+ <translation>&amp;Principal</translation>
+ </message>
+ <message>
+ <source>Size of &amp;database cache</source>
+ <translation>Taille du cache de la base de donnรฉes.</translation>
+ </message>
+ <message>
+ <source>MB</source>
+ <translation>MO</translation>
+ </message>
+ <message>
+ <source>Accept connections from outside</source>
+ <translation>Accepter les connexions venant de l'extรฉrieur</translation>
+ </message>
+ <message>
+ <source>Allow incoming connections</source>
+ <translation>Autoriser les connexions entrantes</translation>
+ </message>
+ <message>
+ <source>IP address of the proxy (e.g. IPv4: 127.0.0.1 / IPv6: ::1)</source>
+ <translation>Adresse IP du proxy (e.g. IPv4: 127.0.0.1 / IPv6: ::1)</translation>
+ </message>
+ <message>
+ <source>Reset all client options to default.</source>
+ <translation>Rรฉinitialiser toutes les options du client par dรฉfaut.</translation>
+ </message>
+ <message>
+ <source>&amp;Reset Options</source>
+ <translation>&amp;Options de rรฉinitialisation </translation>
+ </message>
+ <message>
+ <source>&amp;Network</source>
+ <translation>&amp;Rรฉseau</translation>
+ </message>
+ <message>
+ <source>Automatically start Bitcoin Core after logging in to the system.</source>
+ <translation>Dรฉmarrer automatiquement Bitcoin Core aprรจs s'รชtre connectรฉ au systรจme. </translation>
+ </message>
+ <message>
+ <source>Expert</source>
+ <translation>Expert</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>Ouvrir le port du client Bitcoin automatiquement sur le routeur. Cela ne fonctionne que si votre routeur supporte l'UPnP et si la fonctionnalitรฉ est activรฉe.</translation>
</message>
@@ -322,6 +969,38 @@
<translation>Ouvrir le port avec l'&amp;UPnP</translation>
</message>
<message>
+ <source>Proxy &amp;IP:</source>
+ <translation>Proxy &amp;IP:</translation>
+ </message>
+ <message>
+ <source>&amp;Port:</source>
+ <translation>&amp;Port:</translation>
+ </message>
+ <message>
+ <source>Port of the proxy (e.g. 9050)</source>
+ <translation>Port du proxy (e.g. 9050)</translation>
+ </message>
+ <message>
+ <source>Used for reaching peers via:</source>
+ <translation>Utilisรฉ pour contacter des pairs via:</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>&amp;Window</source>
+ <translation>&amp;Fenรชtre</translation>
+ </message>
+ <message>
<source>&amp;Minimize to the tray instead of the taskbar</source>
<translation>&amp;Minimiser dans la barre systรจme au lieu de la barre des tรขches</translation>
</message>
@@ -329,37 +1008,429 @@
<source>M&amp;inimize on close</source>
<translation>Mi&amp;nimiser lors de la fermeture</translation>
</message>
- </context>
+ <message>
+ <source>&amp;Display</source>
+ <translation>&amp;Afficher</translation>
+ </message>
+ <message>
+ <source>User Interface &amp;language:</source>
+ <translation>Interface utilisateur &amp;langage:</translation>
+ </message>
+ <message>
+ <source>&amp;OK</source>
+ <translation>&amp;OK</translation>
+ </message>
+ <message>
+ <source>&amp;Cancel</source>
+ <translation>&amp;Annuler </translation>
+ </message>
+ <message>
+ <source>default</source>
+ <translation>defaut</translation>
+ </message>
+ <message>
+ <source>none</source>
+ <translation>aucun</translation>
+ </message>
+ <message>
+ <source>Confirm options reset</source>
+ <translation>Confirmer les options de rรฉinitialisation </translation>
+ </message>
+ <message>
+ <source>Client restart required to activate changes.</source>
+ <translation>Redรฉmarrage du client nรฉcessaire pour activer les changements.</translation>
+ </message>
+ <message>
+ <source>This change would require a client restart.</source>
+ <translation>Ce changement nรฉcessiterait un redรฉmarrage du client.</translation>
+ </message>
+ <message>
+ <source>The supplied proxy address is invalid.</source>
+ <translation>L'adresse du proxy est invalide.</translation>
+ </message>
+</context>
<context>
<name>OverviewPage</name>
<message>
<source>Form</source>
<translation>Formulaire</translation>
</message>
+ <message>
+ <source>Watch-only:</source>
+ <translation>Regarder seulement:</translation>
+ </message>
+ <message>
+ <source>Available:</source>
+ <translation>Disponible: </translation>
+ </message>
+ <message>
+ <source>Pending:</source>
+ <translation>En attente:</translation>
+ </message>
+ <message>
+ <source>Immature:</source>
+ <translation>Immature:</translation>
+ </message>
+ <message>
+ <source>Balances</source>
+ <translation>Balances</translation>
+ </message>
+ <message>
+ <source>Total:</source>
+ <translation>Total:</translation>
+ </message>
+ <message>
+ <source>Your current total balance</source>
+ <translation>Votre balance totale courante</translation>
+ </message>
+ <message>
+ <source>Spendable:</source>
+ <translation>Dรฉpensable: </translation>
+ </message>
+ <message>
+ <source>Recent transactions</source>
+ <translation>Transactions rรฉcentes </translation>
+ </message>
</context>
<context>
<name>PaymentServer</name>
- </context>
+ <message>
+ <source>Invalid payment address %1</source>
+ <translation>Adresse de paiement invalide %1</translation>
+ </message>
+ <message>
+ <source>Payment request rejected</source>
+ <translation>Requรชte de paiement rejetรฉe </translation>
+ </message>
+ <message>
+ <source>Payment request is not initialized.</source>
+ <translation>La demande de paiement n'a pas รฉtรฉ initialisรฉe.</translation>
+ </message>
+ <message>
+ <source>Payment request error</source>
+ <translation>Erreur lors de la requรชte de paiement</translation>
+ </message>
+ <message>
+ <source>Payment request expired.</source>
+ <translation>Demande de paiement expirรฉe.</translation>
+ </message>
+ <message>
+ <source>Invalid payment request.</source>
+ <translation>Demande de paiement invalide.</translation>
+ </message>
+ <message>
+ <source>Refund from %1</source>
+ <translation>Remboursement de %1</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 de rรฉseau</translation>
+ </message>
+</context>
<context>
<name>PeerTableModel</name>
- </context>
+ <message>
+ <source>User Agent</source>
+ <translation>Agent Utilisateur</translation>
+ </message>
+ <message>
+ <source>Node/Service</source>
+ <translation>Nล“ud/Service </translation>
+ </message>
+ <message>
+ <source>Ping Time</source>
+ <translation>Temps du ping</translation>
+ </message>
+</context>
<context>
<name>QObject</name>
<message>
<source>Amount</source>
<translation>Montant</translation>
</message>
- </context>
+ <message>
+ <source>Enter a Bitcoin address (e.g. %1)</source>
+ <translation>Entrer une adresse Bitcoin (e.g. %1)</translation>
+ </message>
+ <message>
+ <source>%1 d</source>
+ <translation>%1 j</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>Aucun</translation>
+ </message>
+ <message>
+ <source>N/A</source>
+ <translation>N/A</translation>
+ </message>
+ <message>
+ <source>%1 ms</source>
+ <translation>%1 ms</translation>
+ </message>
+</context>
<context>
<name>QRImageWidget</name>
- </context>
+ <message>
+ <source>&amp;Save Image...</source>
+ <translation>&amp;Sauvegarder image</translation>
+ </message>
+ <message>
+ <source>&amp;Copy Image</source>
+ <translation>&amp;Copier image</translation>
+ </message>
+ <message>
+ <source>Save QR Code</source>
+ <translation>Sauvegarder QR code</translation>
+ </message>
+ <message>
+ <source>PNG Image (*.png)</source>
+ <translation>Image PNG (*.png)</translation>
+ </message>
+</context>
<context>
<name>RPCConsole</name>
<message>
+ <source>Client name</source>
+ <translation>Nom du client</translation>
+ </message>
+ <message>
+ <source>N/A</source>
+ <translation>N/A </translation>
+ </message>
+ <message>
+ <source>Client version</source>
+ <translation>Version du client</translation>
+ </message>
+ <message>
+ <source>&amp;Information</source>
+ <translation>&amp;Information</translation>
+ </message>
+ <message>
+ <source>Debug window</source>
+ <translation>Fenรชtre de dรฉbogage </translation>
+ </message>
+ <message>
+ <source>General</source>
+ <translation>Gรฉnรฉral</translation>
+ </message>
+ <message>
+ <source>Using BerkeleyDB version</source>
+ <translation>Version BerkeleyDButilisรฉe </translation>
+ </message>
+ <message>
+ <source>Startup time</source>
+ <translation>Le temps de dรฉmarrage</translation>
+ </message>
+ <message>
+ <source>Network</source>
+ <translation>Rรฉseau</translation>
+ </message>
+ <message>
<source>Name</source>
<translation>Nom</translation>
</message>
- </context>
+ <message>
+ <source>Number of connections</source>
+ <translation>Nombre de connexions</translation>
+ </message>
+ <message>
+ <source>Block chain</source>
+ <translation>Chaรฎne de bloc </translation>
+ </message>
+ <message>
+ <source>Current number of blocks</source>
+ <translation>Nombre courant de blocs</translation>
+ </message>
+ <message>
+ <source>Memory Pool</source>
+ <translation>Mรฉmoire du pool</translation>
+ </message>
+ <message>
+ <source>Current number of transactions</source>
+ <translation>Nombre courant de transactions</translation>
+ </message>
+ <message>
+ <source>Memory usage</source>
+ <translation>Usage de la mรฉmoire</translation>
+ </message>
+ <message>
+ <source>Received</source>
+ <translation>Reรงu </translation>
+ </message>
+ <message>
+ <source>Sent</source>
+ <translation>Envoyรฉ</translation>
+ </message>
+ <message>
+ <source>&amp;Peers</source>
+ <translation>&amp;Pairs</translation>
+ </message>
+ <message>
+ <source>Banned peers</source>
+ <translation>Pairs bannis</translation>
+ </message>
+ <message>
+ <source>Whitelisted</source>
+ <translation>Autorisรฉ par la liste</translation>
+ </message>
+ <message>
+ <source>Direction</source>
+ <translation>Direction</translation>
+ </message>
+ <message>
+ <source>Version</source>
+ <translation>Version</translation>
+ </message>
+ <message>
+ <source>Starting Block</source>
+ <translation>Bloc de dรฉpart</translation>
+ </message>
+ <message>
+ <source>Synced Blocks</source>
+ <translation>Blocs Synchronisรฉs </translation>
+ </message>
+ <message>
+ <source>User Agent</source>
+ <translation>Agent Utilisateur</translation>
+ </message>
+ <message>
+ <source>Services</source>
+ <translation>Services</translation>
+ </message>
+ <message>
+ <source>Ban Score</source>
+ <translation>Score de ban</translation>
+ </message>
+ <message>
+ <source>Connection Time</source>
+ <translation>Temps de connexion</translation>
+ </message>
+ <message>
+ <source>Last Send</source>
+ <translation>Dernier envoyรฉ</translation>
+ </message>
+ <message>
+ <source>Last Receive</source>
+ <translation>Dernier reรงu</translation>
+ </message>
+ <message>
+ <source>Ping Time</source>
+ <translation>Temps du ping</translation>
+ </message>
+ <message>
+ <source>Ping Wait</source>
+ <translation>Attente du ping</translation>
+ </message>
+ <message>
+ <source>&amp;Open</source>
+ <translation>&amp;Ouvert</translation>
+ </message>
+ <message>
+ <source>&amp;Console</source>
+ <translation>&amp;Console</translation>
+ </message>
+ <message>
+ <source>&amp;Network Traffic</source>
+ <translation>&amp;Trafic rรฉseau</translation>
+ </message>
+ <message>
+ <source>&amp;Clear</source>
+ <translation>&amp;Nettoyer</translation>
+ </message>
+ <message>
+ <source>Totals</source>
+ <translation>Totaux</translation>
+ </message>
+ <message>
+ <source>In:</source>
+ <translation>Entrรฉe:</translation>
+ </message>
+ <message>
+ <source>Out:</source>
+ <translation>Sortie:</translation>
+ </message>
+ <message>
+ <source>Build date</source>
+ <translation>Date de crรฉation</translation>
+ </message>
+ <message>
+ <source>Debug log file</source>
+ <translation>Fichier du journal de dรฉbogage</translation>
+ </message>
+ <message>
+ <source>Clear console</source>
+ <translation>Nettoyer la console</translation>
+ </message>
+ <message>
+ <source>1 &amp;hour</source>
+ <translation>1 &amp;heure</translation>
+ </message>
+ <message>
+ <source>1 &amp;day</source>
+ <translation>1 &amp;jour</translation>
+ </message>
+ <message>
+ <source>1 &amp;week</source>
+ <translation>1 &amp;semaine</translation>
+ </message>
+ <message>
+ <source>1 &amp;year</source>
+ <translation>1 &amp;an</translation>
+ </message>
+ <message>
+ <source>%1 B</source>
+ <translation>%1 O</translation>
+ </message>
+ <message>
+ <source>%1 KB</source>
+ <translation>%1 KO</translation>
+ </message>
+ <message>
+ <source>%1 MB</source>
+ <translation>%1 MO</translation>
+ </message>
+ <message>
+ <source>%1 GB</source>
+ <translation>%1 GO</translation>
+ </message>
+ <message>
+ <source>via %1</source>
+ <translation>via %1</translation>
+ </message>
+ <message>
+ <source>never</source>
+ <translation>jamais</translation>
+ </message>
+ <message>
+ <source>Yes</source>
+ <translation>Oui</translation>
+ </message>
+ <message>
+ <source>No</source>
+ <translation>Non</translation>
+ </message>
+ <message>
+ <source>Unknown</source>
+ <translation>Inconnu</translation>
+ </message>
+</context>
<context>
<name>ReceiveCoinsDialog</name>
<message>
@@ -375,10 +1446,38 @@
<translation>Message :</translation>
</message>
<message>
+ <source>Clear all fields of the form.</source>
+ <translation>Nettoyer tous les champs du formulaire.</translation>
+ </message>
+ <message>
+ <source>Clear</source>
+ <translation>Nettoyer</translation>
+ </message>
+ <message>
+ <source>Requested payments history</source>
+ <translation>Historique des demandes de paiements.</translation>
+ </message>
+ <message>
+ <source>&amp;Request payment</source>
+ <translation>&amp;Demande de paiement</translation>
+ </message>
+ <message>
+ <source>Show</source>
+ <translation>Montrer</translation>
+ </message>
+ <message>
+ <source>Remove</source>
+ <translation>Retirer</translation>
+ </message>
+ <message>
<source>Copy label</source>
<translation>Copier l'รฉtiquette</translation>
</message>
<message>
+ <source>Copy message</source>
+ <translation>Copier message</translation>
+ </message>
+ <message>
<source>Copy amount</source>
<translation>Copier le montant</translation>
</message>
@@ -390,6 +1489,30 @@
<translation>QR Code</translation>
</message>
<message>
+ <source>Copy &amp;URI</source>
+ <translation>Copier &amp;URI</translation>
+ </message>
+ <message>
+ <source>Copy &amp;Address</source>
+ <translation>Copier &amp;Adresse</translation>
+ </message>
+ <message>
+ <source>&amp;Save Image...</source>
+ <translation>&amp;Sauvegarder 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>
@@ -428,7 +1551,15 @@
<source>(no label)</source>
<translation>(aucune รฉtiquette)</translation>
</message>
- </context>
+ <message>
+ <source>(no message)</source>
+ <translation>(pas de message)</translation>
+ </message>
+ <message>
+ <source>(no amount)</source>
+ <translation>(pas de montant)</translation>
+ </message>
+</context>
<context>
<name>SendCoinsDialog</name>
<message>
@@ -436,18 +1567,98 @@
<translation>Envoyer des piรจces</translation>
</message>
<message>
+ <source>Inputs...</source>
+ <translation>Sorties...</translation>
+ </message>
+ <message>
+ <source>automatically selected</source>
+ <translation>Automatiquement sรฉlectionnรฉ </translation>
+ </message>
+ <message>
<source>Insufficient funds!</source>
<translation>Fonds insuffisants</translation>
</message>
<message>
+ <source>Quantity:</source>
+ <translation>Quantitรฉ:</translation>
+ </message>
+ <message>
+ <source>Bytes:</source>
+ <translation>Octets:</translation>
+ </message>
+ <message>
<source>Amount:</source>
<translation>Montant :</translation>
</message>
<message>
+ <source>Priority:</source>
+ <translation>Prioritรฉ:</translation>
+ </message>
+ <message>
+ <source>Fee:</source>
+ <translation>Frais:</translation>
+ </message>
+ <message>
+ <source>After Fee:</source>
+ <translation>Aprรจs frais:</translation>
+ </message>
+ <message>
+ <source>Change:</source>
+ <translation>Change:</translation>
+ </message>
+ <message>
+ <source>Transaction Fee:</source>
+ <translation>Frais de transaction</translation>
+ </message>
+ <message>
+ <source>Choose...</source>
+ <translation>Choisir...</translation>
+ </message>
+ <message>
+ <source>per kilobyte</source>
+ <translation>par kilo octet</translation>
+ </message>
+ <message>
+ <source>Hide</source>
+ <translation>Cacher</translation>
+ </message>
+ <message>
+ <source>total at least</source>
+ <translation>Au total au moins</translation>
+ </message>
+ <message>
+ <source>Recommended:</source>
+ <translation>Recommandรฉ: </translation>
+ </message>
+ <message>
+ <source>Confirmation time:</source>
+ <translation>Temps de confirmation:</translation>
+ </message>
+ <message>
+ <source>normal</source>
+ <translation>normal</translation>
+ </message>
+ <message>
+ <source>fast</source>
+ <translation>rapide</translation>
+ </message>
+ <message>
<source>Send to multiple recipients at once</source>
<translation>Envoyer des piรจces ร  plusieurs destinataires ร  la fois</translation>
</message>
<message>
+ <source>Clear all fields of the form.</source>
+ <translation>Nettoyer tous les champs du formulaire.</translation>
+ </message>
+ <message>
+ <source>Dust:</source>
+ <translation>Poussiรจre: </translation>
+ </message>
+ <message>
+ <source>Clear &amp;All</source>
+ <translation>Nettoyer &amp;Tout</translation>
+ </message>
+ <message>
<source>Balance:</source>
<translation>Solde :</translation>
</message>
@@ -460,18 +1671,86 @@
<translation>Confirmer l'envoi des piรจces</translation>
</message>
<message>
+ <source>%1 to %2</source>
+ <translation>%1 ร  %2</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 priority</source>
+ <translation>Copier la prioritรฉ </translation>
+ </message>
+ <message>
+ <source>Copy change</source>
+ <translation>Copier changement </translation>
+ </message>
+ <message>
+ <source>Total Amount %1</source>
+ <translation>Montant Total %1</translation>
+ </message>
+ <message>
+ <source>or</source>
+ <translation>ou</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 excรจde votre balance. </translation>
+ </message>
+ <message>
+ <source>Transaction creation failed!</source>
+ <translation>ร‰chec de la crรฉation de la transaction </translation>
+ </message>
+ <message>
+ <source>Payment request expired.</source>
+ <translation>Demande de paiement expirรฉe. </translation>
+ </message>
+ <message>
+ <source>Pay only the required fee of %1</source>
+ <translation>Payer seulement les frais obligatoire de %1</translation>
+ </message>
+ <message>
+ <source>Warning: Invalid Bitcoin address</source>
+ <translation>Attention: Adresse Bitcoin Invalide</translation>
+ </message>
+ <message>
<source>(no label)</source>
<translation>(aucune รฉtiquette)</translation>
</message>
- </context>
+ <message>
+ <source>Copy dust</source>
+ <translation>Copier la poussiรจre </translation>
+ </message>
+ <message>
+ <source>Are you sure you want to send?</source>
+ <translation>รŠtes-vous sรปr de vouloir envoyer ?</translation>
+ </message>
+ <message>
+ <source>added as transaction fee</source>
+ <translation>Ajoute en tant que frais de transaction</translation>
+ </message>
+</context>
<context>
<name>SendCoinsEntry</name>
<message>
@@ -491,6 +1770,14 @@
<translation>&amp;ร‰tiquette :</translation>
</message>
<message>
+ <source>Choose previously used address</source>
+ <translation>Choisir une adresse prรฉcรฉdemment utilisรฉe </translation>
+ </message>
+ <message>
+ <source>This is a normal payment.</source>
+ <translation>C'est un paiement normal.</translation>
+ </message>
+ <message>
<source>Alt+A</source>
<translation>Alt+A</translation>
</message>
@@ -503,6 +1790,10 @@
<translation>Alt+P</translation>
</message>
<message>
+ <source>Remove this entry</source>
+ <translation>Retirer cette entrรฉe</translation>
+ </message>
+ <message>
<source>Message:</source>
<translation>Message :</translation>
</message>
@@ -510,7 +1801,11 @@
<source>Pay To:</source>
<translation>Payer ร  :</translation>
</message>
- </context>
+ <message>
+ <source>Memo:</source>
+ <translation>Memo:</translation>
+ </message>
+</context>
<context>
<name>ShutdownWindow</name>
</context>
@@ -521,6 +1816,10 @@
<translation>&amp;Signer le message</translation>
</message>
<message>
+ <source>Choose previously used address</source>
+ <translation>Choisir une adresse prรฉcรฉdemment utilisรฉe </translation>
+ </message>
+ <message>
<source>Alt+A</source>
<translation>Alt+A</translation>
</message>
@@ -537,20 +1836,76 @@
<translation>Entrez ici le message que vous dรฉsirez signer</translation>
</message>
<message>
+ <source>Signature</source>
+ <translation>Signature</translation>
+ </message>
+ <message>
+ <source>Copy the current signature to the system clipboard</source>
+ <translation>Copier l'adresse courante dans le presse papier</translation>
+ </message>
+ <message>
<source>Sign &amp;Message</source>
<translation>&amp;Signer le message</translation>
</message>
- </context>
+ <message>
+ <source>Clear &amp;All</source>
+ <translation>Nettoyer &amp;Tout</translation>
+ </message>
+ <message>
+ <source>&amp;Verify Message</source>
+ <translation>&amp;Vรฉrifier message</translation>
+ </message>
+ <message>
+ <source>Verify &amp;Message</source>
+ <translation>Vรฉrifier &amp;Message</translation>
+ </message>
+ <message>
+ <source>The entered address is invalid.</source>
+ <translation>L'adresse entrรฉe est invalide. </translation>
+ </message>
+ <message>
+ <source>Please check the address and try again.</source>
+ <translation>Vรฉrifiez l'adresse et rรฉessayer. </translation>
+ </message>
+ <message>
+ <source>Message signed.</source>
+ <translation>Message signรฉ. </translation>
+ </message>
+ <message>
+ <source>Please check the signature and try again.</source>
+ <translation>Vรฉrifiez la signature et rรฉessayer.</translation>
+ </message>
+ <message>
+ <source>Message verification failed.</source>
+ <translation>Vรฉrification du message รฉchouรฉe.</translation>
+ </message>
+ <message>
+ <source>Message verified.</source>
+ <translation>Message vรฉrifiรฉ. </translation>
+ </message>
+</context>
<context>
<name>SplashScreen</name>
<message>
+ <source>Bitcoin Core</source>
+ <translation>Bitcoin Core</translation>
+ </message>
+ <message>
+ <source>The Bitcoin Core developers</source>
+ <translation>Les dรฉveloppeurs de Bitcoin Core</translation>
+ </message>
+ <message>
<source>[testnet]</source>
<translation>[testnet]</translation>
</message>
</context>
<context>
<name>TrafficGraphWidget</name>
- </context>
+ <message>
+ <source>KB/s</source>
+ <translation>KO/s</translation>
+ </message>
+</context>
<context>
<name>TransactionDesc</name>
<message>
@@ -574,29 +1929,109 @@
<translation>Date</translation>
</message>
<message>
+ <source>Source</source>
+ <translation>Source</translation>
+ </message>
+ <message>
<source>Generated</source>
<translation>Gรฉnรฉrรฉ</translation>
</message>
<message>
+ <source>From</source>
+ <translation>De</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>Lecture uniquement</translation>
+ </message>
+ <message>
+ <source>label</source>
+ <translation>ร‰tiquette </translation>
+ </message>
+ <message>
<source>Credit</source>
<translation>Crรฉdit</translation>
</message>
<message>
+ <source>not accepted</source>
+ <translation>Pas acceptรฉ</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 transaction</translation>
+ </message>
+ <message>
+ <source>Merchant</source>
+ <translation>Marchant</translation>
+ </message>
+ <message>
+ <source>Debug information</source>
+ <translation>Information 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>
+ <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>Open for %n more block(s)</source>
+ <translation><numerusform>Ouvert pour %n bloc de plus</numerusform><numerusform>Ouvert pour %n blocs de plus</numerusform></translation>
+ </message>
<message>
<source>unknown</source>
<translation>inconnue</translation>
@@ -623,6 +2058,10 @@
<source>Type</source>
<translation>Type</translation>
</message>
+ <message numerus="yes">
+ <source>Open for %n more block(s)</source>
+ <translation><numerusform>Ouvert pour %n bloc de plus</numerusform><numerusform>Ouvert pour %n blocs de plus</numerusform></translation>
+ </message>
<message>
<source>Open until %1</source>
<translation>Ouvert jusqu'ร  %1</translation>
@@ -640,10 +2079,18 @@
<translation>Gรฉnรฉrรฉ mais pas acceptรฉ</translation>
</message>
<message>
+ <source>Offline</source>
+ <translation>Hors ligne</translation>
+ </message>
+ <message>
<source>Label</source>
<translation>ร‰tiquette</translation>
</message>
<message>
+ <source>Unconfirmed</source>
+ <translation>Non Confirmรฉ</translation>
+ </message>
+ <message>
<source>Received with</source>
<translation>Reรงues avec</translation>
</message>
@@ -664,6 +2111,10 @@
<translation>Extraction</translation>
</message>
<message>
+ <source>watch-only</source>
+ <translation>Lecture uniquement</translation>
+ </message>
+ <message>
<source>(n/a)</source>
<translation>(indisponible)</translation>
</message>
@@ -755,10 +2206,30 @@
<translation>Copier le montant</translation>
</message>
<message>
+ <source>Copy transaction ID</source>
+ <translation>Copie ID transaction</translation>
+ </message>
+ <message>
<source>Edit label</source>
<translation>ร‰diter 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 des transactions</translation>
+ </message>
+ <message>
+ <source>Exporting Failed</source>
+ <translation>ร‰chec de l'export</translation>
+ </message>
+ <message>
+ <source>Exporting Successful</source>
+ <translation>Export rรฉalisรฉ avec sucรฉs </translation>
+ </message>
+ <message>
<source>Comma separated file (*.csv)</source>
<translation>Valeurs sรฉparรฉes par des virgules (*.csv)</translation>
</message>
@@ -800,7 +2271,11 @@
</context>
<context>
<name>WalletFrame</name>
- </context>
+ <message>
+ <source>No wallet has been loaded.</source>
+ <translation>Aucun portefeuille a รฉtรฉ chargรฉ.</translation>
+ </message>
+</context>
<context>
<name>WalletModel</name>
<message>
@@ -811,6 +2286,10 @@
<context>
<name>WalletView</name>
<message>
+ <source>&amp;Export</source>
+ <translation>&amp;Exporter...</translation>
+ </message>
+ <message>
<source>Export the data in the current tab to a file</source>
<translation>Exporter les donnรฉes de l'onglet courant vers un fichier</translation>
</message>
@@ -826,7 +2305,11 @@
<source>Backup Failed</source>
<translation>La sauvegarde a รฉchouรฉ</translation>
</message>
- </context>
+ <message>
+ <source>Backup Successful</source>
+ <translation>Sauvegarde rรฉussie</translation>
+ </message>
+</context>
<context>
<name>bitcoin-core</name>
<message>
@@ -838,6 +2321,10 @@
<translation>Spรฉcifier le rรฉpertoire de donnรฉes</translation>
</message>
<message>
+ <source>Specify your own public address</source>
+ <translation>Spรฉcifier votre adresse publique </translation>
+ </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>
</message>
@@ -846,14 +2333,95 @@
<translation>Fonctionner en arriรจre-plan en tant que dรฉmon et accepter les commandes</translation>
</message>
<message>
+ <source>&lt;category&gt; can be:</source>
+ <translation>&lt;category&gt; peut รชtre:</translation>
+ </message>
+ <message>
+ <source>Block creation options:</source>
+ <translation>Options de crรฉation de bloc:</translation>
+ </message>
+ <message>
+ <source>Connection options:</source>
+ <translation>Options de connexion:</translation>
+ </message>
+ <message>
+ <source>Debugging/Testing options:</source>
+ <translation>Options de dรฉbogage/test </translation>
+ </message>
+ <message>
+ <source>Importing...</source>
+ <translation>
+Importation ...</translation>
+ </message>
+ <message>
+ <source>Verifying blocks...</source>
+ <translation>Vรฉrifications des blocs...</translation>
+ </message>
+ <message>
+ <source>Verifying wallet...</source>
+ <translation>Vรฉrification du portefeuille...</translation>
+ </message>
+ <message>
+ <source>Wallet options:</source>
+ <translation>Options du portefeuille:</translation>
+ </message>
+ <message>
+ <source>(default: %u)</source>
+ <translation>(dรฉfaut: %u)</translation>
+ </message>
+ <message>
+ <source>Connect through SOCKS5 proxy</source>
+ <translation>Connectรฉ au travers du proxy SOCKS5</translation>
+ </message>
+ <message>
+ <source>Information</source>
+ <translation>Information</translation>
+ </message>
+ <message>
+ <source>Node relay options:</source>
+ <translation>Options du relais de nล“ud: </translation>
+ </message>
+ <message>
+ <source>RPC server options:</source>
+ <translation>Options de serveur RPC:</translation>
+ </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>
</message>
<message>
+ <source>Signing transaction failed</source>
+ <translation>Transaction signรฉe รฉchouรฉe</translation>
+ </message>
+ <message>
+ <source>This is experimental software.</source>
+ <translation>C'est un logiciel expรฉrimental.</translation>
+ </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 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>
+ <message>
+ <source>Transaction too large</source>
+ <translation>Transaction trop grande</translation>
+ </message>
+ <message>
<source>Username for JSON-RPC connections</source>
<translation>Nom d'utilisateur pour les connexions JSON-RPC</translation>
</message>
<message>
+ <source>Warning</source>
+ <translation>Attention</translation>
+ </message>
+ <message>
<source>Password for JSON-RPC connections</source>
<translation>Mot de passe pour les connexions JSON-RPC</translation>
</message>
@@ -870,10 +2438,26 @@
<translation>Erreur lors du chargement de wallet.dat : porte-monnaie corrompu</translation>
</message>
<message>
+ <source>(default: %s)</source>
+ <translation>(dรฉfaut: %s)</translation>
+ </message>
+ <message>
<source>Error loading wallet.dat</source>
<translation>Erreur lors du chargement de wallet.dat</translation>
</message>
<message>
+ <source>Generate coins (default: %u)</source>
+ <translation>Gรฉnรฉrer des piรจces (dรฉfaut: %u)</translation>
+ </message>
+ <message>
+ <source>Invalid -proxy address: '%s'</source>
+ <translation>Adresse -proxy invalide: '%s'</translation>
+ </message>
+ <message>
+ <source>Specify pid file (default: %s)</source>
+ <translation>Spรฉcifier le pid du fichier (dรฉfaut: %s)</translation>
+ </message>
+ <message>
<source>Insufficient funds</source>
<translation>Fonds insuffisants</translation>
</message>
@@ -886,6 +2470,14 @@
<translation>Chargement du porte-monnaie...</translation>
</message>
<message>
+ <source>Cannot downgrade wallet</source>
+ <translation>Vous ne pouvez pas rรฉtrograder votre portefeuille</translation>
+ </message>
+ <message>
+ <source>Cannot write default address</source>
+ <translation>Impossible d'รฉcrire l'adresse par dรฉfaut</translation>
+ </message>
+ <message>
<source>Rescanning...</source>
<translation>Nouvelle analyse...</translation>
</message>
@@ -893,5 +2485,9 @@
<source>Done loading</source>
<translation>Chargement terminรฉ</translation>
</message>
- </context>
+ <message>
+ <source>Error</source>
+ <translation>Erreur</translation>
+ </message>
+</context>
</TS> \ No newline at end of file
diff --git a/src/qt/locale/bitcoin_gl.ts b/src/qt/locale/bitcoin_gl.ts
index 96d4adeba9..50b081d205 100644
--- a/src/qt/locale/bitcoin_gl.ts
+++ b/src/qt/locale/bitcoin_gl.ts
@@ -984,10 +984,6 @@
<translation>Ventana de Depuraciรณn</translation>
</message>
<message>
- <source>Using OpenSSL version</source>
- <translation>Usar versiรณn OpenSSL</translation>
- </message>
- <message>
<source>Startup time</source>
<translation>Tempo de arranque</translation>
</message>
diff --git a/src/qt/locale/bitcoin_he.ts b/src/qt/locale/bitcoin_he.ts
index 926d206206..d937e211b0 100644
--- a/src/qt/locale/bitcoin_he.ts
+++ b/src/qt/locale/bitcoin_he.ts
@@ -2,6 +2,10 @@
<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>
@@ -164,6 +168,10 @@
<translation>ื”ืื ืื›ืŸ ืœื”ืฆืคื™ืŸ ืืช ื”ืืจื ืง?</translation>
</message>
<message>
+ <source>Bitcoin Core 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>ืœื™ื‘ืช ื‘ื™ื˜ืงื•ื™ืŸ ืชื™ืกื’ืจ ืขื›ืฉื™ื• ื›ื“ื™ ืœืกื™ื™ื ืืช ืชืœื™ืš ื”ื”ืฆืคื ื”. ื–ื›ื•ืจ ื›ื™ ื”ืฆืคื ื” ืื™ื ื” ื™ื›ื•ืœื” ืœื”ื’ืŸ ืขืœื™ื™ืš ื‘ืื•ืคืŸ ืžืœื ืžื’ื ื™ื‘ื” ืฉืžืงื•ืจื” ื‘ืชื•ื›ื ื•ืช ื–ื“ื•ื ื™ื•ืช ื”ืžืฆื•ื™ื•ืช ื‘ืžื—ืฉื‘ ืฉืœืš.</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>
@@ -180,6 +188,10 @@
<translation>ื ื ืœื”ื–ื™ืŸ ืืช ืžื™ืœืช ื”ืฆื•ืคืŸ ื”ื—ื“ืฉื” ืœืืจื ืง.&lt;br/&gt;ื›ื“ืื™ ืœื”ืฉืชืžืฉ ื‘ืžื™ืœืช ืฆื•ืคืŸ ื”ืžื•ืจื›ื‘ืช ืž&lt;b&gt;ืขืฉืจื” ืชื•ื•ื™ื ืืงืจืื™ื™ื ื•ืžืขืœื”&lt;/b&gt;, ืื• &lt;b&gt;ืฉืžื•ื ื” ืžื™ืœื™ื ื•ืžืขืœื”&lt;/b&gt;.</translation>
</message>
<message>
+ <source>Enter the old passphrase and new passphrase to the wallet.</source>
+ <translation>ื”ื›ื ืก ืืช ืžื™ืœืช ื”ืฆื•ืคืŸ ื”ื™ืฉื ื” ื•ืžื™ืœืช ืฆื•ืคืŸ ื—ื“ืฉื” ืœืืจื ืง ืฉืœืš.</translation>
+ </message>
+ <message>
<source>Wallet encryption failed</source>
<translation>ื”ืฆืคื ืช ื”ืืจื ืง ื ื›ืฉืœื”</translation>
</message>
@@ -1260,10 +1272,6 @@
<translation>ื›ืœืœื™</translation>
</message>
<message>
- <source>Using OpenSSL version</source>
- <translation>ืฉื™ืžื•ืฉ ื‘ึพOpenSSL ื’ืจืกื”</translation>
- </message>
- <message>
<source>Using BerkeleyDB version</source>
<translation>ืฉื™ืžื•ืฉ ื‘ึพBerkeleyDB ื’ืจืกื”</translation>
</message>
diff --git a/src/qt/locale/bitcoin_hr.ts b/src/qt/locale/bitcoin_hr.ts
index 413dc21857..f9d744aa3e 100644
--- a/src/qt/locale/bitcoin_hr.ts
+++ b/src/qt/locale/bitcoin_hr.ts
@@ -1018,10 +1018,6 @@
<translation>Konzola za dijagnostiku</translation>
</message>
<message>
- <source>Using OpenSSL version</source>
- <translation>OpenSSL verzija u upotrebi</translation>
- </message>
- <message>
<source>Network</source>
<translation>Mreลพa</translation>
</message>
diff --git a/src/qt/locale/bitcoin_hu.ts b/src/qt/locale/bitcoin_hu.ts
index ab4517ccfa..839ee883bd 100644
--- a/src/qt/locale/bitcoin_hu.ts
+++ b/src/qt/locale/bitcoin_hu.ts
@@ -964,6 +964,10 @@
<translation>Itt beรกllรญthatod a kezelล‘felรผlet nyelvรฉt. A beรกllรญtรกs a Bitcoin รบjraindรญtรกsa utรกn lรฉp รฉrvรฉnybe.</translation>
</message>
<message>
+ <source>Third party transaction URLs</source>
+ <translation>Harmadik fรฉl tranzakciรณ URL-ek</translation>
+ </message>
+ <message>
<source>Reset all client options to default.</source>
<translation>Minden kliensbeรกllรญtรกs alapรฉrtelmezettre รกllรญtรกsa.</translation>
</message>
@@ -1258,10 +1262,6 @@
<translation>รltalรกnos</translation>
</message>
<message>
- <source>Using OpenSSL version</source>
- <translation>Hasznรกlt OpenSSL verziรณ</translation>
- </message>
- <message>
<source>Using BerkeleyDB version</source>
<translation>Hasznรกlt BerkeleyDB verziรณ</translation>
</message>
diff --git a/src/qt/locale/bitcoin_id_ID.ts b/src/qt/locale/bitcoin_id_ID.ts
index 1b626fbf23..e1ec7ae7fa 100644
--- a/src/qt/locale/bitcoin_id_ID.ts
+++ b/src/qt/locale/bitcoin_id_ID.ts
@@ -59,19 +59,19 @@
</message>
<message>
<source>Sending addresses</source>
- <translation>Alamat-alamat mengirim</translation>
+ <translation>Alamat pengirim</translation>
</message>
<message>
<source>Receiving addresses</source>
- <translation>Alamat-alamat menerima</translation>
+ <translation>Alamat penerima</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>Alamat-alamat Anda supaya mengirim pembayaran. Periksalah jumlah dan alamat penerima setiap kali Anda mengirim Bitcoin.</translation>
+ <translation>Alamat-alamat Anda untuk mengirim pembayaran. Periksalah jumlah dan alamat penerima setiap kali Anda mengirim 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>Alamat-alamat Anda supaya menerima pembayaran. Dianjurkan agar Anda menggunakan alamat menerima yang baru untuk setiap transaksi.</translation>
+ <translation>Alamat-alamat Anda untuk menerima pembayaran. Dianjurkan agar Anda menggunakan alamat yang baru untuk setiap transaksi.</translation>
</message>
<message>
<source>Copy &amp;Label</source>
@@ -93,7 +93,11 @@
<source>Exporting Failed</source>
<translation>Proses Ekspor Gagal</translation>
</message>
- </context>
+ <message>
+ <source>There was an error trying to save the address list to %1. Please try again.</source>
+ <translation>Terjadi kesalahan saat menyimpan daftar alamat ke %1. Silakan coba lagi.</translation>
+ </message>
+</context>
<context>
<name>AddressTableModel</name>
<message>
@@ -133,7 +137,7 @@
</message>
<message>
<source>This operation needs your wallet passphrase to unlock the wallet.</source>
- <translation>Operasi ini memerlukan kata kunci dompet Anda untuk membuka dompet ini.</translation>
+ <translation>Operasi ini memerlukan kata kunci dompet Anda untuk membuka dompet.</translation>
</message>
<message>
<source>Unlock wallet</source>
@@ -141,7 +145,7 @@
</message>
<message>
<source>This operation needs your wallet passphrase to decrypt the wallet.</source>
- <translation>Operasi ini memerlukan kata kunci dompet Anda untuk mendekripsi dompet ini.</translation>
+ <translation>Operasi ini memerlukan kata kunci dompet Anda untuk mendekripsi dompet.</translation>
</message>
<message>
<source>Decrypt wallet</source>
@@ -157,11 +161,19 @@
</message>
<message>
<source>Warning: If you encrypt your wallet and lose your passphrase, you will &lt;b&gt;LOSE ALL OF YOUR BITCOINS&lt;/b&gt;!</source>
- <translation>Perhatian: Jika anda mengenkripsi dompet anda dan lupa kata kuncinya, anda pasti &lt;b&gt;KEHILANGAN SELURUH BITCOIN ANDA&lt;/B&gt;!</translation>
+ <translation>Perhatian: Jika anda mengenkripsi dompet anda dan lupa kata kuncinya, anda akan &lt;b&gt;KEHILANGAN SELURUH BITCOIN ANDA&lt;/b&gt;!</translation>
</message>
<message>
<source>Are you sure you wish to encrypt your wallet?</source>
- <translation>Apakah kamu yakin ingin mengenkripsi dompet anda?</translation>
+ <translation>Apakah Anda yakin ingin mengenkripsi dompet Anda?</translation>
+ </message>
+ <message>
+ <source>Bitcoin Core 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>Bitcoin Core akan ditutup untuk menyelesaikan proses enkripsi. Mohon diingat bahwa mengenkripsi dompet Anda tidak akan sepenuhnya melindungi bitcoin Anda dari virus atau malware yang menginfeksi komputer Anda.</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>PENTING: Setiap back up yang sudah Anda buat sebaiknya diganti dengan data dompet Anda yang baru dan terenkripsi. Untuk alasan keamanan, data back up tidak terenkripsi yang sudah Anda buat sebelumnya tidak akan dapat digunakan setelah Anda mulai menggunakan dompet yang baru dan terenkripsi.</translation>
</message>
<message>
<source>Warning: The Caps Lock key is on!</source>
@@ -172,6 +184,14 @@
<translation>Dompet terenkripsi</translation>
</message>
<message>
+ <source>Enter the new passphrase to the wallet.&lt;br/&gt;Please use a passphrase of &lt;b&gt;ten or more random characters&lt;/b&gt;, or &lt;b&gt;eight or more words&lt;/b&gt;.</source>
+ <translation>Masukkan kata kunci untuk dompet Anda.&lt;br/&gt;Mohon gunakan kata kunci &lt;b&gt;yang terdiri dari 10 karakter acak&lt;/b&gt;, atau &lt;b&gt;delapan atau beberapa kata lagi&lt;/b&gt;.</translation>
+ </message>
+ <message>
+ <source>Enter the old passphrase and new passphrase to the wallet.</source>
+ <translation>Masukkan kata kunci lama dan kata kunci baru dompet Anda.</translation>
+ </message>
+ <message>
<source>Wallet encryption failed</source>
<translation>Enkripsi dompet gagal</translation>
</message>
@@ -197,12 +217,20 @@
</message>
<message>
<source>Wallet passphrase was successfully changed.</source>
- <translation>Kata kunci untuk dompet berubah berhasil.</translation>
+ <translation>Kata kunci dompet Anda berhasil diubah.</translation>
</message>
</context>
<context>
<name>BanTableModel</name>
- </context>
+ <message>
+ <source>IP/Netmask</source>
+ <translation>IP/Netmask</translation>
+ </message>
+ <message>
+ <source>Banned Until</source>
+ <translation>Di banned sampai</translation>
+ </message>
+</context>
<context>
<name>BitcoinGUI</name>
<message>
@@ -223,7 +251,7 @@
</message>
<message>
<source>Show general overview of wallet</source>
- <translation>Tampilkan kilasan umum dari dompet</translation>
+ <translation>Tampilkan gambaran umum dompet Anda</translation>
</message>
<message>
<source>&amp;Transactions</source>
@@ -231,7 +259,7 @@
</message>
<message>
<source>Browse transaction history</source>
- <translation>Jelajah sejarah transaksi</translation>
+ <translation>Lihat riwayat transaksi</translation>
</message>
<message>
<source>E&amp;xit</source>
@@ -267,11 +295,11 @@
</message>
<message>
<source>&amp;Sending addresses...</source>
- <translation>Alamat-alamat &amp;Mengirim</translation>
+ <translation>&amp;Alamat-alamat untuk mengirim...</translation>
</message>
<message>
<source>&amp;Receiving addresses...</source>
- <translation>Alamat-alamat &amp;Menerima</translation>
+ <translation>&amp;Alamat-alamat untuk menerima...</translation>
</message>
<message>
<source>Open &amp;URI...</source>
@@ -279,15 +307,15 @@
</message>
<message>
<source>Bitcoin Core client</source>
- <translation>Client Bitcoin Inti</translation>
+ <translation>Klien Bitcoin Core</translation>
</message>
<message>
<source>Importing blocks from disk...</source>
- <translation>Blok-blok sedang di-impor dari disk</translation>
+ <translation>Mengimpor blok dari disk...</translation>
</message>
<message>
<source>Reindexing blocks on disk...</source>
- <translation>Mengindex ulang block di harddisk...</translation>
+ <translation>Mengindex ulang blok di dalam disk...</translation>
</message>
<message>
<source>Send coins to a Bitcoin address</source>
@@ -331,11 +359,11 @@
</message>
<message>
<source>Show information about Bitcoin Core</source>
- <translation>Tampilkan informasi tentang Bitcoin Inti</translation>
+ <translation>Tampilkan informasi tentang Bitcoin Core</translation>
</message>
<message>
<source>&amp;Show / Hide</source>
- <translation>&amp;Sunjukkan / Menyembungi</translation>
+ <translation>&amp;Tampilkan / Sembunyikan</translation>
</message>
<message>
<source>Show or hide the main Window</source>
@@ -343,15 +371,15 @@
</message>
<message>
<source>Encrypt the private keys that belong to your wallet</source>
- <translation>Mengenkripsi kunci-kunci pribadi yang dipunyai dompetmu</translation>
+ <translation>Enkripsi private key yang dimiliki dompet Anda</translation>
</message>
<message>
<source>Sign messages with your Bitcoin addresses to prove you own them</source>
- <translation>Tandalah pesanan dengan alamat-alamat Bitcoin Anda supaya membuktikan pesanan itu dikirim oleh Anda</translation>
+ <translation>Tanda tangani sebuah pesan menggunakan alamat Bitcoin Anda untuk membuktikan bahwa Anda adalah pemilik alamat tersebut</translation>
</message>
<message>
<source>Verify messages to ensure they were signed with specified Bitcoin addresses</source>
- <translation>Periksakan pesan-pesan supaya menjaminkan ditandatangani oleh alamat Bitcoin yang terperinci</translation>
+ <translation>Verifikasi pesan untuk memastikan bahwa pesan tersebut ditanda tangani oleh suatu alamat Bitcoin tertentu</translation>
</message>
<message>
<source>&amp;File</source>
@@ -375,13 +403,17 @@
</message>
<message>
<source>Request payments (generates QR codes and bitcoin: URIs)</source>
- <translation>Permintaan pembayaran (membangkitkan kode QR dan bitcoin: URIs)</translation>
+ <translation>Permintaan pembayaran (membuat kode QR dan bitcoin: URIs)</translation>
</message>
<message>
<source>&amp;About Bitcoin Core</source>
<translation>&amp;Mengenai Bitcoin Core</translation>
</message>
<message>
+ <source>Modify configuration options for Bitcoin Core</source>
+ <translation>Modifikasi pengaturan konfigurasi untuk Bitcoin Core</translation>
+ </message>
+ <message>
<source>Show the list of used sending addresses and labels</source>
<translation>Tampilkan daftar alamat dan label yang terkirim</translation>
</message>
@@ -395,21 +427,25 @@
</message>
<message>
<source>&amp;Command-line options</source>
- <translation>&amp;pilihan Perintah-baris</translation>
+ <translation>&amp;pilihan Command-line</translation>
</message>
<message>
<source>Show the Bitcoin Core help message to get a list with possible Bitcoin command-line options</source>
- <translation>Tampilkan pesan bantuan Bitcoin Core untuk memberikan daftar pilihan perintah-baris yang memungkinkan dalam aplikasi Bitcoin</translation>
+ <translation>Tampilkan pesan bantuan Bitcoin Core untuk mendapatkan daftar pilihan Command-line</translation>
</message>
<message numerus="yes">
<source>%n active connection(s) to Bitcoin network</source>
- <translation><numerusform>%n hubungan aktif ke jaringan Bitcoin</numerusform></translation>
+ <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>
@@ -435,15 +471,15 @@
</message>
<message>
<source>Last received block was generated %1 ago.</source>
- <translation>Blok terakhir dibuat %1 lalu.</translation>
+ <translation>Blok terakhir yang diterima %1 lalu.</translation>
</message>
<message>
<source>Transactions after this will not yet be visible.</source>
- <translation>Transaksi setelah ini tidak akan ditampilkan</translation>
+ <translation>Transaksi setelah ini belum akan terlihat.</translation>
</message>
<message>
<source>Error</source>
- <translation>Gagal</translation>
+ <translation>Terjadi sebuah kesalahan</translation>
</message>
<message>
<source>Warning</source>
@@ -531,7 +567,7 @@
</message>
<message>
<source>Amount:</source>
- <translation>Nilai:</translation>
+ <translation>Jumlah:</translation>
</message>
<message>
<source>Priority:</source>
@@ -542,12 +578,16 @@
<translation>Biaya:</translation>
</message>
<message>
+ <source>Dust:</source>
+ <translation>Dust:</translation>
+ </message>
+ <message>
<source>After Fee:</source>
<translation>Dengan Biaya:</translation>
</message>
<message>
<source>Change:</source>
- <translation>Uang Kembali:</translation>
+ <translation>Kembalian:</translation>
</message>
<message>
<source>(un)select all</source>
@@ -555,7 +595,7 @@
</message>
<message>
<source>Tree mode</source>
- <translation>mode pohon</translation>
+ <translation>Tree mode</translation>
</message>
<message>
<source>List mode</source>
@@ -563,7 +603,15 @@
</message>
<message>
<source>Amount</source>
- <translation>Nilai</translation>
+ <translation>Jumlah</translation>
+ </message>
+ <message>
+ <source>Received with label</source>
+ <translation>Diterima dengan label</translation>
+ </message>
+ <message>
+ <source>Received with address</source>
+ <translation>Diterima dengan alamat</translation>
</message>
<message>
<source>Date</source>
@@ -571,7 +619,7 @@
</message>
<message>
<source>Confirmations</source>
- <translation>Konfirmasi-konfirmasi</translation>
+ <translation>Konfirmasi</translation>
</message>
<message>
<source>Confirmed</source>
@@ -591,19 +639,19 @@
</message>
<message>
<source>Copy amount</source>
- <translation>Salin nilai</translation>
+ <translation>Salin jumlah</translation>
</message>
<message>
<source>Copy transaction ID</source>
- <translation>Menyalinkan ID transaksi</translation>
+ <translation>Salin ID transaksi</translation>
</message>
<message>
<source>Lock unspent</source>
- <translation>Kunci terpakai.</translation>
+ <translation>Kunci unspent.</translation>
</message>
<message>
<source>Unlock unspent</source>
- <translation>Membuka kunci terpakai</translation>
+ <translation>Buka unspent</translation>
</message>
<message>
<source>Copy quantity</source>
@@ -626,8 +674,12 @@
<translation>Salin prioritas</translation>
</message>
<message>
+ <source>Copy dust</source>
+ <translation>Salin dust</translation>
+ </message>
+ <message>
<source>Copy change</source>
- <translation>Salin uang kembali</translation>
+ <translation>Salin kembalian</translation>
</message>
<message>
<source>highest</source>
@@ -674,6 +726,22 @@
<translation>tidak satupun</translation>
</message>
<message>
+ <source>This label turns red if the transaction size is greater than 1000 bytes.</source>
+ <translation>Label ini akan menjadi merah apabila ukuran transaksi melebihi 1000 bytes.</translation>
+ </message>
+ <message>
+ <source>This label turns red if the priority is smaller than "medium".</source>
+ <translation>Label ini akan menjadi merah apabila prioritasnya lebih kecil dari "sedang"</translation>
+ </message>
+ <message>
+ <source>This label turns red if any recipient receives an amount smaller than %1.</source>
+ <translation>Label ini akan menjadi merah apabila penerima menerima jumlah yang lebih kecil dari %1.</translation>
+ </message>
+ <message>
+ <source>Can vary +/- %1 satoshi(s) per input.</source>
+ <translation>Dapat beragam +/- %1 satoshi per input.</translation>
+ </message>
+ <message>
<source>yes</source>
<translation>ya</translation>
</message>
@@ -683,15 +751,15 @@
</message>
<message>
<source>This means a fee of at least %1 per kB is required.</source>
- <translation>Berarti perlu biaya lebih dari %1 untuk setiap kB.</translation>
+ <translation>Perlu biaya lebih dari %1 untuk setiap kB.</translation>
</message>
<message>
<source>Can vary +/- 1 byte per input.</source>
- <translation>Boleh berbeda +/- 1 byte setiap masukan.</translation>
+ <translation>Dapat beragam +/- 1 byte per input.</translation>
</message>
<message>
<source>Transactions with higher priority are more likely to get included into a block.</source>
- <translation>Makin penting transaksinya, makin kemungkinan akan termasuk dalam blok.</translation>
+ <translation>Transaksi dengan prioritas lebih tinggi akan lebih cepat dimasukkan kedalam blok.</translation>
</message>
<message>
<source>(no label)</source>
@@ -699,11 +767,11 @@
</message>
<message>
<source>change from %1 (%2)</source>
- <translation>uang kembali dari %1 (%2)</translation>
+ <translation>kembalian dari %1 (%2)</translation>
</message>
<message>
<source>(change)</source>
- <translation>(uang kembali)</translation>
+ <translation>(kembalian)</translation>
</message>
</context>
<context>
@@ -718,11 +786,11 @@
</message>
<message>
<source>The label associated with this address list entry</source>
- <translation>Label yang terkait dengan daftar alamat yang dimasukkan ini</translation>
+ <translation>Label yang terkait dengan daftar alamat</translation>
</message>
<message>
<source>The address associated with this address list entry. This can only be modified for sending addresses.</source>
- <translation>Alamat yang terkait dengan entri buku alamat ini. Hanya dapat diubah untuk alamat pengirim.</translation>
+ <translation>Alamat yang terkait dengan daftar alamat. Hanya dapat diubah untuk alamat pengirim.</translation>
</message>
<message>
<source>&amp;Address</source>
@@ -773,15 +841,15 @@
</message>
<message>
<source>Directory already exists. Add %1 if you intend to create a new directory here.</source>
- <translation>Direktori masih ada. Tambahlah %1 kalau ingin membuat direktori baru disini.</translation>
+ <translation>Direktori masih ada. Tambahlah %1 apabila Anda ingin membuat direktori baru disini.</translation>
</message>
<message>
<source>Path already exists, and is not a directory.</source>
- <translation>Masih ada Path, dan path itu bukan direktori.</translation>
+ <translation>Sudah ada path, dan itu bukan direktori.</translation>
</message>
<message>
<source>Cannot create data directory here.</source>
- <translation>Tidak busa membuat direktori untuk data disini.</translation>
+ <translation>Tidak bisa membuat direktori data disini.</translation>
</message>
</context>
<context>
@@ -795,12 +863,16 @@
<translation>versi</translation>
</message>
<message>
+ <source>(%1-bit)</source>
+ <translation>(%1-bit)</translation>
+ </message>
+ <message>
<source>About Bitcoin Core</source>
<translation>Mengenai Bitcoin Core</translation>
</message>
<message>
<source>Command-line options</source>
- <translation>pilihan Perintah-baris</translation>
+ <translation>Pilihan Command-line</translation>
</message>
<message>
<source>Usage:</source>
@@ -808,9 +880,37 @@
</message>
<message>
<source>command-line options</source>
- <translation>pilihan perintah-baris</translation>
+ <translation>pilihan command-line</translation>
</message>
- </context>
+ <message>
+ <source>UI Options:</source>
+ <translation>Pilihan UI:</translation>
+ </message>
+ <message>
+ <source>Choose data directory on startup (default: %u)</source>
+ <translation>Pilih direktori data saat memulai (default: %u)</translation>
+ </message>
+ <message>
+ <source>Set language, for example "de_DE" (default: system locale)</source>
+ <translation>Pilih bahasa, contoh "id_ID" (default: system locale)</translation>
+ </message>
+ <message>
+ <source>Start minimized</source>
+ <translation>Start minimized</translation>
+ </message>
+ <message>
+ <source>Set SSL root certificates for payment request (default: -system-)</source>
+ <translation>Pilih sertifikat root SSL untuk permintaan pembayaran {default: -system-)</translation>
+ </message>
+ <message>
+ <source>Show splash screen on startup (default: %u)</source>
+ <translation>Tampilkan layar kilat saat memulai (default: %u)</translation>
+ </message>
+ <message>
+ <source>Reset all settings changes made over the GUI</source>
+ <translation>Reset semua pengaturan yang dibuat dari GUI</translation>
+ </message>
+</context>
<context>
<name>Intro</name>
<message>
@@ -822,26 +922,42 @@
<translation>Selamat Datang ke Bitcoin Core</translation>
</message>
<message>
+ <source>As this is the first time the program is launched, you can choose where Bitcoin Core will store its data.</source>
+ <translation>Ini adalah pertama kali program ini dijalankan, Anda dapat memilih dimana Bitcoin Core menyimpan data.</translation>
+ </message>
+ <message>
+ <source>Bitcoin Core will download and store a copy of the Bitcoin block chain. At least %1GB 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>Bitcoin Core akan mengunduh dan menyimpan salinan dari block chain Bitcoin. Setidaknya %1GB data akan disimpan di direktori ini, dan akan terus bertambah. Dompet Anda juga akan disimpan di direktori ini.</translation>
+ </message>
+ <message>
<source>Use the default data directory</source>
- <translation>Menggunakan direktori untuk data yang biasa.</translation>
+ <translation>Gunakan direktori data default.</translation>
</message>
<message>
<source>Use a custom data directory:</source>
- <translation>Menggunakan direktori data yang dipilih Anda:</translation>
+ <translation>Gunakan direktori pilihan Anda:</translation>
</message>
<message>
<source>Bitcoin Core</source>
<translation>Bitcoin Core</translation>
</message>
<message>
+ <source>Error: Specified data directory "%1" cannot be created.</source>
+ <translation>Kesalahan: Direktori data "%1" tidak dapat dibuat.</translation>
+ </message>
+ <message>
<source>Error</source>
- <translation>Gagal</translation>
+ <translation>Kesalahan</translation>
</message>
<message numerus="yes">
<source>%n GB of free space available</source>
- <translation><numerusform>%n GB dari ruang yang tersedia</numerusform></translation>
+ <translation><numerusform>%n GB ruang kosong tersedia.</numerusform></translation>
</message>
- </context>
+ <message numerus="yes">
+ <source>(of %n GB needed)</source>
+ <translation><numerusform>(dari %n GB yang dibutuhkan)</numerusform></translation>
+ </message>
+</context>
<context>
<name>OpenURIDialog</name>
<message>
@@ -850,7 +966,7 @@
</message>
<message>
<source>Open payment request from URI or file</source>
- <translation>Buka permintaan pembayaran dari URI atau arsip</translation>
+ <translation>Buka permintaan pembayaran dari URI atau data</translation>
</message>
<message>
<source>URI:</source>
@@ -858,11 +974,11 @@
</message>
<message>
<source>Select payment request file</source>
- <translation>Pilihlah arsip permintaan pembayaran</translation>
+ <translation>Pilih data permintaan pembayaran</translation>
</message>
<message>
<source>Select payment request file to open</source>
- <translation>Pilihlah arsip permintaan pembayaran yang Anda ingin membuka</translation>
+ <translation>Pilih data permintaan pembayaran yang akan dibuka</translation>
</message>
</context>
<context>
@@ -876,24 +992,52 @@
<translation>&amp;Utama</translation>
</message>
<message>
+ <source>Size of &amp;database cache</source>
+ <translation>Ukuran cache &amp;database</translation>
+ </message>
+ <message>
<source>MB</source>
<translation>MB</translation>
</message>
<message>
+ <source>Number of script &amp;verification threads</source>
+ <translation>Jumlah script &amp;verification threads</translation>
+ </message>
+ <message>
+ <source>Accept connections from outside</source>
+ <translation>Terima koneksi dari luar</translation>
+ </message>
+ <message>
+ <source>Allow incoming connections</source>
+ <translation>Perbolehkan koneksi masuk</translation>
+ </message>
+ <message>
<source>IP address of the proxy (e.g. IPv4: 127.0.0.1 / IPv6: ::1)</source>
<translation>Alamat IP proxy (cth. 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>Minimalisasi aplikasi ketika jendela ditutup. Ketika pilihan ini dipilih, aplikasi akan menutup seluruhnya jika anda memilih Keluar di menu yang tersedia.</translation>
+ </message>
+ <message>
+ <source>The user interface language can be set here. This setting will take effect after restarting Bitcoin Core.</source>
+ <translation>Bahasa interface pengguna bisa diubah disini. Pengaturan ini akan memberikan efek setelah Bitcoin Core di-restart.</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>URL pihak ketika (misalnya sebuah block explorer) yang mumcul dalam tab transaksi sebagai konteks menu. %s dalam URL diganti dengan kode transaksi. URL dipisahkan dengan tanda vertikal |.</translation>
+ </message>
+ <message>
<source>Third party transaction URLs</source>
- <translation>Transaksi URLs pihak ketiga</translation>
+ <translation>URL transaksi pihak ketiga</translation>
</message>
<message>
<source>Active command-line options that override above options:</source>
- <translation>pilihan perintah-baris aktif menimpa atas pilihan-pilihan: </translation>
+ <translation>Pilihan command-line yang aktif menimpa diatas opsi: </translation>
</message>
<message>
<source>Reset all client options to default.</source>
- <translation>Reset setiap pilihan untuk pilihan biasa</translation>
+ <translation>Kembalikan semua pengaturan ke awal.</translation>
</message>
<message>
<source>&amp;Reset Options</source>
@@ -904,6 +1048,18 @@
<translation>&amp;Jaringan</translation>
</message>
<message>
+ <source>Automatically start Bitcoin Core after logging in to the system.</source>
+ <translation>Buka Bitcoin Core secara otomatis setelah Anda log-in ke sistem Anda.</translation>
+ </message>
+ <message>
+ <source>&amp;Start Bitcoin Core on system login</source>
+ <translation>&amp;Mulai Bitcoin Core saat log-in sistem</translation>
+ </message>
+ <message>
+ <source>(0 = auto, &lt;0 = leave that many cores free)</source>
+ <translation>(0 = auto, &lt;0 = leave that many cores free)</translation>
+ </message>
+ <message>
<source>W&amp;allet</source>
<translation>D&amp;ompet</translation>
</message>
@@ -913,7 +1069,7 @@
</message>
<message>
<source>Enable coin &amp;control features</source>
- <translation>Nyalain cara &amp;pengaturan koin</translation>
+ <translation>Perbolehkan fitur &amp;pengaturan koin</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>
@@ -932,6 +1088,10 @@
<translation>Petakan port dengan &amp;UPnP</translation>
</message>
<message>
+ <source>Connect to the Bitcoin network through a SOCKS5 proxy.</source>
+ <translation>Hubungkan ke jaringan Bitcoin melalui SOCKS5 proxy.</translation>
+ </message>
+ <message>
<source>Proxy &amp;IP:</source>
<translation>IP Proxy:</translation>
</message>
@@ -1198,10 +1358,6 @@
<translation>Umum</translation>
</message>
<message>
- <source>Using OpenSSL version</source>
- <translation>Menggunakan versi OpenSSL</translation>
- </message>
- <message>
<source>Startup time</source>
<translation>Waktu nyala</translation>
</message>
@@ -1596,6 +1752,10 @@
<translation>Hapus informasi dari form.</translation>
</message>
<message>
+ <source>Dust:</source>
+ <translation>Dust:</translation>
+ </message>
+ <message>
<source>Clear &amp;All</source>
<translation>Hapus &amp;Semua</translation>
</message>
@@ -1692,6 +1852,10 @@
<translation>(tidak ada label)</translation>
</message>
<message>
+ <source>Copy dust</source>
+ <translation>Salin dust</translation>
+ </message>
+ <message>
<source>Are you sure you want to send?</source>
<translation>Apakah Anda yakin ingin kirim?</translation>
</message>
diff --git a/src/qt/locale/bitcoin_it.ts b/src/qt/locale/bitcoin_it.ts
index d510b1063b..2f14c42014 100644
--- a/src/qt/locale/bitcoin_it.ts
+++ b/src/qt/locale/bitcoin_it.ts
@@ -950,6 +950,10 @@
<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>
@@ -1471,10 +1475,6 @@ Per specificare piรน URL separarli con una barra verticale "|".</translation>
<translation>Generale</translation>
</message>
<message>
- <source>Using OpenSSL version</source>
- <translation>Versione OpenSSL in uso</translation>
- </message>
- <message>
<source>Using BerkeleyDB version</source>
<translation>Versione BerkeleyDB in uso</translation>
</message>
@@ -2850,7 +2850,7 @@ Per specificare piรน URL separarli con una barra verticale "|".</translation>
<name>UnitDisplayStatusBarControl</name>
<message>
<source>Unit to show amounts in. Click to select another unit.</source>
- <translation>Unitร  con cui visualizzare gli importi. Clicca per selezionare un altra unitร .</translation>
+ <translation>Unitร  con cui visualizzare gli importi. Clicca per selezionare un'altra unitร .</translation>
</message>
</context>
<context>
@@ -3193,10 +3193,6 @@ Per specificare piรน URL separarli con una barra verticale "|".</translation>
<translation>Opzioni portamonete:</translation>
</message>
<message>
- <source>Warning: This version is obsolete; upgrade required!</source>
- <translation>Attenzione: questa versione รจ obsoleta. Aggiornamento necessario!</translation>
- </message>
- <message>
<source>You need to rebuild the database using -reindex to change -txindex</source>
<translation>รˆ necessario ricostruire il database usando -reindex per cambiare -txindex</translation>
</message>
@@ -3293,10 +3289,6 @@ Per specificare piรน URL separarli con una barra verticale "|".</translation>
<translation>Attivazione della blockchain migliore...</translation>
</message>
<message>
- <source>Always relay transactions received from whitelisted peers (default: %d)</source>
- <translation>Trasmetti sempre le transazioni ricevute da peers whitelisted (default: %d)</translation>
- </message>
- <message>
<source>Attempt to recover private keys from a corrupt wallet.dat on startup</source>
<translation>Prova a recuperare le chiavi private da un wallet corrotto all'avvio</translation>
</message>
diff --git a/src/qt/locale/bitcoin_it_IT.ts b/src/qt/locale/bitcoin_it_IT.ts
new file mode 100644
index 0000000000..46ad0e9339
--- /dev/null
+++ b/src/qt/locale/bitcoin_it_IT.ts
@@ -0,0 +1,325 @@
+<TS language="it_IT" version="2.1">
+<context>
+ <name>AddressBookPage</name>
+ <message>
+ <source>Right-click to edit address or label</source>
+ <translation>Click destro per modificare indirizzo o etichetta</translation>
+ </message>
+ <message>
+ <source>Create a new address</source>
+ <translation>Crea un nuovo indirizzo</translation>
+ </message>
+ <message>
+ <source>&amp;New</source>
+ <translation>nuovo</translation>
+ </message>
+ <message>
+ <source>Copy the currently selected address to the system clipboard</source>
+ <translation>copia l'indirizzo selezionato correntemente nella clipboard di sistema</translation>
+ </message>
+ <message>
+ <source>&amp;Copy</source>
+ <translation>copia</translation>
+ </message>
+ <message>
+ <source>C&amp;lose</source>
+ <translation>chiudi </translation>
+ </message>
+ <message>
+ <source>&amp;Copy Address</source>
+ <translation>copia indirizzo </translation>
+ </message>
+ <message>
+ <source>Delete the currently selected address from the list</source>
+ <translation>Cancella l'indirizzo attualmente selezionato dalla lista.</translation>
+ </message>
+ <message>
+ <source>Export the data in the current tab to a file</source>
+ <translation>Esportare i dati nella scheda corrente in un file</translation>
+ </message>
+ <message>
+ <source>&amp;Export</source>
+ <translation>Esporta</translation>
+ </message>
+ <message>
+ <source>&amp;Delete</source>
+ <translation>Cancella</translation>
+ </message>
+ <message>
+ <source>Choose the address to send coins to</source>
+ <translation>Scegli l'indirizzo a cui inviare denaro</translation>
+ </message>
+ <message>
+ <source>Choose the address to receive coins with</source>
+ <translation>Scegli l'indirizzo con cui ricevere i coin</translation>
+ </message>
+ <message>
+ <source>C&amp;hoose</source>
+ <translation>Scegli</translation>
+ </message>
+ <message>
+ <source>Sending addresses</source>
+ <translation>Indirizzi mittenti</translation>
+ </message>
+ <message>
+ <source>Receiving addresses</source>
+ <translation>Indirizzi destinatari</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>Questi sono gli indirizzi Bitcoin per l'invio di pagamenti. Controlla sempre la quantitร  e l'indirizzo di ricezione prima di inviare monete.</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 per ricevere pagamenti. Si raccomanda di generare un nuovo indirizzo per ogni transazione</translation>
+ </message>
+ <message>
+ <source>Copy &amp;Label</source>
+ <translation>copia etichetta</translation>
+ </message>
+ <message>
+ <source>&amp;Edit</source>
+ <translation>Modifica</translation>
+ </message>
+ <message>
+ <source>Export Address List</source>
+ <translation>Esporta lista degli indirizzi</translation>
+ </message>
+ <message>
+ <source>Comma separated file (*.csv)</source>
+ <translation>Contenuto del file separato da virgole (*.csv)</translation>
+ </message>
+ <message>
+ <source>Exporting Failed</source>
+ <translation>Esportazione fallita</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>
+ <message>
+ <source>Enter passphrase</source>
+ <translation>Invia passphrase</translation>
+ </message>
+ <message>
+ <source>New passphrase</source>
+ <translation>Nuova passphrase</translation>
+ </message>
+ <message>
+ <source>Repeat new passphrase</source>
+ <translation>Ripeti nuova passphrase</translation>
+ </message>
+ <message>
+ <source>Encrypt wallet</source>
+ <translation>Cifra portagoflio</translation>
+ </message>
+ <message>
+ <source>This operation needs your wallet passphrase to unlock the wallet.</source>
+ <translation>Questa operazione richiede la passphrase del tuo portafoglio per sbloccare il portafoglio.</translation>
+ </message>
+ <message>
+ <source>Unlock wallet</source>
+ <translation>Sblocca portafoglio</translation>
+ </message>
+ <message>
+ <source>Decrypt wallet</source>
+ <translation>decifra portafoglio</translation>
+ </message>
+ <message>
+ <source>Change passphrase</source>
+ <translation>cambia passphrase</translation>
+ </message>
+ <message>
+ <source>Confirm wallet encryption</source>
+ <translation>conferma cifrazione del portagoglio</translation>
+ </message>
+ <message>
+ <source>Wallet encrypted</source>
+ <translation>portafoglio cifrato</translation>
+ </message>
+ <message>
+ <source>Wallet unlock failed</source>
+ <translation>sblocco portafoglio fallito</translation>
+ </message>
+ </context>
+<context>
+ <name>BanTableModel</name>
+ <message>
+ <source>Banned Until</source>
+ <translation>bannato fino </translation>
+ </message>
+</context>
+<context>
+ <name>BitcoinGUI</name>
+ <message>
+ <source>&amp;Transactions</source>
+ <translation>Transazioni</translation>
+ </message>
+ </context>
+<context>
+ <name>ClientModel</name>
+ </context>
+<context>
+ <name>CoinControlDialog</name>
+ <message>
+ <source>(no label)</source>
+ <translation>(nessuna etichetta)
+</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>OpenURIDialog</name>
+ </context>
+<context>
+ <name>OptionsDialog</name>
+ </context>
+<context>
+ <name>OverviewPage</name>
+ </context>
+<context>
+ <name>PaymentServer</name>
+ </context>
+<context>
+ <name>PeerTableModel</name>
+ </context>
+<context>
+ <name>QObject</name>
+ </context>
+<context>
+ <name>QRImageWidget</name>
+ </context>
+<context>
+ <name>RPCConsole</name>
+ </context>
+<context>
+ <name>ReceiveCoinsDialog</name>
+ </context>
+<context>
+ <name>ReceiveRequestDialog</name>
+ <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>
+ <source>(no label)</source>
+ <translation>(nessuna etichetta)
+</translation>
+ </message>
+ </context>
+<context>
+ <name>SendCoinsEntry</name>
+ </context>
+<context>
+ <name>ShutdownWindow</name>
+ </context>
+<context>
+ <name>SignVerifyMessageDialog</name>
+ </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>
+ <message>
+ <source>Label</source>
+ <translation>Etichetta</translation>
+ </message>
+ </context>
+<context>
+ <name>TransactionView</name>
+ <message>
+ <source>Exporting Failed</source>
+ <translation>Esportazione fallita</translation>
+ </message>
+ <message>
+ <source>Comma separated file (*.csv)</source>
+ <translation>Contenuto del file separato da virgole (*.csv)</translation>
+ </message>
+ <message>
+ <source>Label</source>
+ <translation>Etichetta</translation>
+ </message>
+ <message>
+ <source>Address</source>
+ <translation>Indirizzo</translation>
+ </message>
+ </context>
+<context>
+ <name>UnitDisplayStatusBarControl</name>
+ </context>
+<context>
+ <name>WalletFrame</name>
+ </context>
+<context>
+ <name>WalletModel</name>
+ </context>
+<context>
+ <name>WalletView</name>
+ <message>
+ <source>&amp;Export</source>
+ <translation>Esporta</translation>
+ </message>
+ <message>
+ <source>Export the data in the current tab to a file</source>
+ <translation>Esportare i dati nella scheda corrente in un file</translation>
+ </message>
+ </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 4344fd0436..06fd27fa16 100644
--- a/src/qt/locale/bitcoin_ja.ts
+++ b/src/qt/locale/bitcoin_ja.ts
@@ -1474,10 +1474,6 @@
<translation>ไธ€่ˆฌ</translation>
</message>
<message>
- <source>Using OpenSSL version</source>
- <translation>ไฝฟ็”จไธญใฎ OpenSSL ใฎใƒใƒผใ‚ธใƒงใƒณ</translation>
- </message>
- <message>
<source>Using BerkeleyDB version</source>
<translation>ไฝฟ็”จไธญใฎBerkleyDBใƒใƒผใ‚ธใƒงใƒณ</translation>
</message>
@@ -2980,6 +2976,18 @@
<translation>ๅค–้ƒจใ‹ใ‚‰ใฎๆŽฅ็ถšใ‚’่จฑๅฏ (ๅˆๆœŸๅ€ค: -proxy ใพใŸใฏ -connect ใ‚’ไฝฟ็”จใ—ใฆใ„ใชใ„ๅ ดๅˆใฏ1)</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>
+ <message>
+ <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>
<translation>ๆŒ‡ๅฎšใฎใ‚ขใƒ‰ใƒฌใ‚นใธใƒใ‚คใƒณใƒ‰ใ—ใ€ใใฎไธŠใงๅธธใซใƒชใ‚นใƒณใ—ใพใ™ใ€‚IPv6 ใฏ [ใƒ›ใ‚นใƒˆๅ]:ใƒใƒผใƒˆ็•ชๅท ใจ่กจ่จ˜ใ—ใพใ™</translation>
</message>
@@ -2996,6 +3004,10 @@
<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>
+ </message>
+ <message>
<source>Set the number of script verification threads (%u to %d, 0 = auto, &lt;0 = leave that many cores free, default: %d)</source>
<translation>ใ‚นใ‚ฏใƒชใƒ—ใƒˆๆคœ่จผใ‚นใƒฌใƒƒใƒ‰ใ‚’่จญๅฎš (%uใ‹ใ‚‰%dใฎ้–“, 0 = ่‡ชๅ‹•, &lt;0 = ใŸใใ•ใ‚“ใฎใ‚ณใ‚ขใ‚’่‡ช็”ฑใซใ—ใฆใŠใ, ๅˆๆœŸๅ€ค: %d)</translation>
</message>
@@ -3012,6 +3024,10 @@
<translation>ใ“ใฎใ‚ณใƒณใƒ”ใƒฅใƒผใ‚ฟใฎ %s ใซใƒใ‚คใƒณใƒ‰ใ™ใ‚‹ใ“ใจใŒใงใใพใ›ใ‚“ใ€‚ใŠใใ‚‰ใ Bitcoin Core ใฏๆ—ขใซๅฎŸ่กŒใ•ใ‚Œใฆใ„ใพใ™ใ€‚</translation>
</message>
<message>
+ <source>Unsupported argument -whitelistalwaysrelay ignored, use -whitelistrelay and/or -whitelistforcerelay.</source>
+ <translation>ใ‚ตใƒใƒผใƒˆใ•ใ‚Œใฆใ„ใชใ„ๅผ•ๆ•ฐ -whitelistalwaysrelay ใฏ็„ก่ฆ–ใ•ใ‚Œใพใ—ใŸใ€‚-whitelistrelay ใพใŸใฏ -whitelistforcerelay ใ‚’ๅˆฉ็”จใ—ใฆใใ ใ•ใ„</translation>
+ </message>
+ <message>
<source>Use UPnP to map the listening port (default: 1 when listening and no -proxy)</source>
<translation>ใƒชใ‚นใƒณ ใƒใƒผใƒˆใฎๅ‰ฒๅฝ“ใซ UPnP ใ‚’ไฝฟ็”จ (ๅˆๆœŸๅ€ค: ใƒชใ‚นใƒณไธญใŠใ‚ˆใณ-proxyใŒๆŒ‡ๅฎšใ•ใ‚Œใฆใ„ใชใ„ๅ ดๅˆใฏ1)</translation>
</message>
@@ -3028,6 +3044,10 @@
<translation>่ญฆๅ‘Š๏ผš ใƒใƒƒใƒˆใƒฏใƒผใ‚ฏใฏๅฎŒๅ…จใซๅŒๆ„ใ—ใชใ„ใฟใŸใ„ใงใ™ใ€‚ใƒžใ‚คใƒŠใƒผใฏไฝ•ใ‹ใฎๅ•้กŒใ‚’็ตŒ้จ“ใ—ใฆใ‚‹ใฟใŸใ„ใชใ‚“ใงใ™ใ€‚</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: 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>
@@ -3048,6 +3068,10 @@
<translation>&lt;category&gt;ใฏไปฅไธ‹ใฎๅ€คใ‚’ๆŒ‡ๅฎšใงใใพใ™๏ผš</translation>
</message>
<message>
+ <source>Append comment to the user agent string</source>
+ <translation>ใƒฆใƒผใ‚ถใ‚จใƒผใ‚ธใ‚งใƒณใƒˆๆ–‡ๅญ—ๅˆ—ใซใ‚ณใƒกใƒณใƒˆใ‚’</translation>
+ </message>
+ <message>
<source>Block creation options:</source>
<translation>ใƒ–ใƒญใƒƒใ‚ฏไฝœๆˆใ‚ชใƒ—ใ‚ทใƒงใƒณ:</translation>
</message>
@@ -3093,6 +3117,10 @@
<translation>&lt;address&gt; ใซๅฏพใ—ใ€็”Ÿใƒˆใƒฉใƒณใ‚ถใ‚ฏใ‚ทใƒงใƒณใฎๅ…ฌ้–‹ใ‚’ๆœ‰ๅŠนใซใ™ใ‚‹</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>
@@ -3129,10 +3157,22 @@
<translation>็„กๅŠนใช -onion ใ‚ขใƒ‰ใƒฌใ‚น๏ผš'%s'</translation>
</message>
<message>
+ <source>Invalid amount for -fallbackfee=&lt;amount&gt;: '%s'</source>
+ <translation>ไธๆญฃใช้ก -fallbackfee=&lt;amount&gt;: '%s'</translation>
+ </message>
+ <message>
<source>Keep the transaction memory pool below &lt;n&gt; megabytes (default: %u)</source>
<translation>ใƒˆใƒฉใƒณใ‚ถใ‚ฏใ‚ทใƒงใƒณใฎใƒกใƒขใƒชใƒปใƒ—ใƒผใƒซใฎ็ท้‡ใ‚’ &lt;n&gt; ใƒกใ‚ฌใƒใ‚คใƒˆไปฅไธ‹ใซ็ถญๆŒใ™ใ‚‹ (ๅˆๆœŸๅ€ค: %u)</translation>
</message>
<message>
+ <source>Location of the auth cookie (default: data dir)</source>
+ <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>
@@ -3141,6 +3181,10 @@
<translation>&lt;net&gt; (ipv4, ipv6 ใพใŸใฏ onion) ใƒใƒƒใƒˆใƒฏใƒผใ‚ฏๅ†…ใฎใƒŽใƒผใƒ‰ใ ใ‘ใซๆŽฅ็ถšใ™ใ‚‹</translation>
</message>
<message>
+ <source>Print version and exit</source>
+ <translation>ใƒใƒผใ‚ธใƒงใƒณใ‚’่กจ็คบใ—็ต‚ไบ†</translation>
+ </message>
+ <message>
<source>Prune cannot be configured with a negative value.</source>
<translation>ๅ‰ชๅฎšๅ€คใฏ่ฒ ใฎๅ€คใซ่จญๅฎšใงใใพใ›ใ‚“ใ€‚</translation>
</message>
@@ -3197,10 +3241,6 @@
<translation>ใ‚ฆใ‚ฉใƒฌใƒƒใƒˆใ‚ชใƒ—ใ‚ทใƒงใƒณ๏ผš</translation>
</message>
<message>
- <source>Warning: This version is obsolete; upgrade required!</source>
- <translation>่ญฆๅ‘Š: ใ“ใฎใƒใƒผใ‚ธใƒงใƒณใฏใ‚ตใƒใƒผใƒˆใ•ใ‚Œใพใ›ใ‚“ใ€‚ใ‚ขใƒƒใƒ—ใ‚ฐใƒฌใƒผใƒ‰ใŒๅฟ…่ฆใงใ™๏ผ</translation>
- </message>
- <message>
<source>You need to rebuild the database using -reindex to change -txindex</source>
<translation>-txindex ใ‚’ๅค‰ๆ›ดใ™ใ‚‹ใซใฏ -reindex ใ‚’ไฝฟ็”จใ—ใฆใƒ‡ใƒผใ‚ฟใƒ™ใƒผใ‚นใ‚’ๅ†ๆง‹็ฏ‰ใ™ใ‚‹ๅฟ…่ฆใŒใ‚ใ‚Šใพใ™</translation>
</message>
@@ -3297,10 +3337,6 @@
<translation>ๆœ€ๅ„ช่‰ฏใฎใƒใ‚งใ‚คใƒณใ‚’ๆœ‰ๅŠนๅŒ–ใ—ใฆใ„ใพใ™...</translation>
</message>
<message>
- <source>Always relay transactions received from whitelisted peers (default: %d)</source>
- <translation>ใƒ›ใƒฏใ‚คใƒˆใƒชใ‚นใƒˆใซใ‚ใ‚‹ใƒ”ใ‚ขใ‹ใ‚‰ๅ—ใ‘ๅ–ใฃใŸใƒˆใƒฉใƒณใ‚ถใ‚ฏใ‚ทใƒงใƒณใ‚’ๅธธใซใƒชใƒฌใƒผใ™ใ‚‹ (ๅˆๆœŸๅ€ค: %d)</translation>
- </message>
- <message>
<source>Attempt to recover private keys from a corrupt wallet.dat on startup</source>
<translation>่ตทๅ‹•ๆ™‚ใซๅฃŠใ‚ŒใŸ wallet.dat ใ‹ใ‚‰็ง˜ๅฏ†้ตใ‚’ๅพฉๆ—งใ™ใ‚‹ใ“ใจใ‚’่ฉฆใ™</translation>
</message>
@@ -3465,6 +3501,10 @@
<translation>่ญฆๅ‘Š</translation>
</message>
<message>
+ <source>Warning: unknown new rules activated (versionbit %i)</source>
+ <translation>่ญฆๅ‘Š: ๆœช็Ÿฅใฎๆ–ฐใ—ใ„ใƒซใƒผใƒซใŒๆœ‰ๅŠนๅŒ–ใ•ใ‚Œใพใ—ใŸ (ใƒใƒผใ‚ธใƒงใƒณใƒ“ใƒƒใƒˆ %i)</translation>
+ </message>
+ <message>
<source>Whether to operate in a blocks only mode (default: %u)</source>
<translation>ใƒ–ใƒญใƒƒใ‚ฏ้™ๅฎšใƒขใƒผใƒ‰ใซใŠใ„ใฆๅ‹•ไฝœใ‚’่กŒใ†ใ‹ใฉใ†ใ‹ (ๅˆๆœŸๅ€ค: %u)</translation>
</message>
diff --git a/src/qt/locale/bitcoin_ka.ts b/src/qt/locale/bitcoin_ka.ts
index 11c73ec767..1a072d1df1 100644
--- a/src/qt/locale/bitcoin_ka.ts
+++ b/src/qt/locale/bitcoin_ka.ts
@@ -1112,10 +1112,6 @@
<translation>แƒกแƒแƒ”แƒ แƒ—แƒ</translation>
</message>
<message>
- <source>Using OpenSSL version</source>
- <translation>OpenSSL-แƒ˜แƒก แƒ•แƒ”แƒ แƒกแƒ˜แƒ</translation>
- </message>
- <message>
<source>Startup time</source>
<translation>แƒกแƒขแƒแƒ แƒขแƒ˜แƒก แƒ“แƒ แƒ</translation>
</message>
diff --git a/src/qt/locale/bitcoin_ko_KR.ts b/src/qt/locale/bitcoin_ko_KR.ts
index ce48ce249f..34aeafcd5c 100644
--- a/src/qt/locale/bitcoin_ko_KR.ts
+++ b/src/qt/locale/bitcoin_ko_KR.ts
@@ -11,7 +11,7 @@
</message>
<message>
<source>&amp;New</source>
- <translation>์ƒˆ ํ•ญ๋ชฉ(N)</translation>
+ <translation>์ƒˆ ํ•ญ๋ชฉ(&amp;N)</translation>
</message>
<message>
<source>Copy the currently selected address to the system clipboard</source>
@@ -19,11 +19,11 @@
</message>
<message>
<source>&amp;Copy</source>
- <translation>๋ณต์‚ฌ</translation>
+ <translation>๋ณต์‚ฌ(&amp;C)</translation>
</message>
<message>
<source>C&amp;lose</source>
- <translation>๋‹ซ๊ธฐ (L)</translation>
+ <translation>๋‹ซ๊ธฐ(&amp;L)</translation>
</message>
<message>
<source>&amp;Copy Address</source>
@@ -39,11 +39,11 @@
</message>
<message>
<source>&amp;Export</source>
- <translation>&amp;๋‚ด๋ณด๋‚ด๊ธฐ</translation>
+ <translation>๋‚ด๋ณด๋‚ด๊ธฐ(&amp;E)</translation>
</message>
<message>
<source>&amp;Delete</source>
- <translation>&amp;์‚ญ์ œ</translation>
+ <translation>์‚ญ์ œ(&amp;D)</translation>
</message>
<message>
<source>Choose the address to send coins to</source>
@@ -55,7 +55,7 @@
</message>
<message>
<source>C&amp;hoose</source>
- <translation>์„ ํƒํ•˜๊ธฐ (H)</translation>
+ <translation>์„ ํƒํ•˜๊ธฐ(&amp;H)</translation>
</message>
<message>
<source>Sending addresses</source>
@@ -67,7 +67,7 @@
</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>
+ <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>
@@ -75,11 +75,11 @@
</message>
<message>
<source>Copy &amp;Label</source>
- <translation>๋ผ๋ฒจ ๋ณต์‚ฌ</translation>
+ <translation>๋ผ๋ฒจ ๋ณต์‚ฌ(&amp;L)</translation>
</message>
<message>
<source>&amp;Edit</source>
- <translation>ํŽธ์ง‘&amp;</translation>
+ <translation>ํŽธ์ง‘(&amp;E)</translation>
</message>
<message>
<source>Export Address List</source>
@@ -168,6 +168,10 @@
<translation>์ง€๊ฐ‘ ์•”ํ˜ธํ™”๋ฅผ ํ—ˆ์šฉํ•˜์‹œ๊ฒ ์Šต๋‹ˆ๊นŒ?</translation>
</message>
<message>
+ <source>Bitcoin Core 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>๋น„ํŠธ์ฝ”์ธ ์ฝ”์–ด๋Š” ์•”ํ˜ธํ™” ๊ณผ์ •์„ ๋งˆ๋ฌด๋ฆฌ ํ•˜๊ธฐ ์œ„ํ•ด ์ข…๋ฃŒ๋ฉ๋‹ˆ๋‹ค. ๋‹น์‹ ์˜ ์ง€๊ฐ‘์„ ์•”ํ˜ธํ™”ํ•˜๋Š” ๊ฒƒ์ด ์—ฌ๋Ÿฌ๋ถ„์˜ ์ปดํ“จํ„ฐ์— ํ•ด๋ฅผ ๋ผ์น˜๋Š” ํ”„๋กœ๊ทธ๋žจ์œผ๋กœ๋ถ€ํ„ฐ ์—ฌ๋Ÿฌ๋ถ„์˜ ๋น„ํŠธ์ฝ”์ธ์„ ์™„์ „ํžˆ ๋ณดํ˜ธํ•ด์ฃผ์ง€๋Š” ๋ชปํ•œ๋‹ค๋Š” ์‚ฌ์‹ค์„ ๊ธฐ์–ตํ•˜์‹ญ์‹œ์˜ค.</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>
@@ -180,6 +184,10 @@
<translation>์ง€๊ฐ‘ ์•”ํ˜ธํ™” ์™„๋ฃŒ</translation>
</message>
<message>
+ <source>Enter the new passphrase to the wallet.&lt;br/&gt;Please use a passphrase of &lt;b&gt;ten or more random characters&lt;/b&gt;, or &lt;b&gt;eight or more words&lt;/b&gt;.</source>
+ <translation>์ง€๊ฐ‘์— ์ƒˆ๋กœ์šด ๋น„๋ฐ€๋ฌธ๊ตฌ๋ฅผ ์ž…๋ ฅํ•˜์„ธ์š”.&lt;br/&gt;๋น„๋ฐ€๋ฌธ๊ตฌ๋ฅผ &lt;b&gt;์—ด ๊ฐœ ์ด์ƒ์˜ ๋ฌด์ž‘์œ„ ๊ธ€์ž&lt;/b&gt; ํ˜น์€ &lt;b&gt;์—ฌ๋Ÿ๊ฐœ ์ด์ƒ์˜ ๋‹จ์–ด๋กœ&lt;b&gt; ์ •ํ•˜์„ธ์š”.</translation>
+ </message>
+ <message>
<source>Enter the old passphrase and new passphrase to the wallet.</source>
<translation>์ง€๊ฐ‘์˜ ๊ธฐ์กด ์•”ํ˜ธ์™€ ์ƒˆ๋กœ์šด ์•”ํ˜ธ๋ฅผ ์ž…๋ ฅํ•ด์ฃผ์„ธ์š”.</translation>
</message>
@@ -189,7 +197,7 @@
</message>
<message>
<source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source>
- <translation>์ง€๊ฐ‘ ์•”ํ˜ธํ™”๋Š” ๋‚ด๋ถ€ ์—๋Ÿฌ๋กœ ์ธํ•ด ์‹คํŒจํ–ˆ์Šต๋‹ˆ๋‹ค. ๋‹น์‹ ์˜ ์ง€๊ฐ‘์€ ์•”ํ˜ธํ™” ๋˜์ง€ ์•Š์•˜์Šต๋‹ˆ๋‹ค.</translation>
+ <translation>์ง€๊ฐ‘ ์•”ํ˜ธํ™”๋Š” ๋‚ด๋ถ€ ์˜ค๋ฅ˜๋กœ ์ธํ•ด ์‹คํŒจํ–ˆ์Šต๋‹ˆ๋‹ค. ๋‹น์‹ ์˜ ์ง€๊ฐ‘์€ ์•”ํ˜ธํ™” ๋˜์ง€ ์•Š์•˜์Šต๋‹ˆ๋‹ค.</translation>
</message>
<message>
<source>The supplied passphrases do not match.</source>
@@ -214,12 +222,20 @@
</context>
<context>
<name>BanTableModel</name>
- </context>
+ <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 &amp;message...</source>
- <translation>๋ฉ”์‹œ์ง€ ์„œ๋ช…&amp;...</translation>
+ <translation>๋ฉ”์‹œ์ง€ ์„œ๋ช…(&amp;M)...</translation>
</message>
<message>
<source>Synchronizing with network...</source>
@@ -227,7 +243,7 @@
</message>
<message>
<source>&amp;Overview</source>
- <translation>&amp;๊ฐœ์š”</translation>
+ <translation>๊ฐœ์š”(&amp;O)</translation>
</message>
<message>
<source>Node</source>
@@ -239,7 +255,7 @@
</message>
<message>
<source>&amp;Transactions</source>
- <translation>&amp;๊ฑฐ๋ž˜</translation>
+ <translation>๊ฑฐ๋ž˜(&amp;T)</translation>
</message>
<message>
<source>Browse transaction history</source>
@@ -251,11 +267,11 @@
</message>
<message>
<source>Quit application</source>
- <translation>์ ์šฉ ์ค‘๋‹จ</translation>
+ <translation>์–ดํ”Œ๋ฆฌ์ผ€์ด์…˜ ์ข…๋ฃŒ</translation>
</message>
<message>
<source>About &amp;Qt</source>
- <translation>Qt ์ •๋ณด(&amp;Q)</translation>
+ <translation>&amp;Qt ์ •๋ณด</translation>
</message>
<message>
<source>Show information about Qt</source>
@@ -263,31 +279,31 @@
</message>
<message>
<source>&amp;Options...</source>
- <translation>&amp;์˜ต์…˜</translation>
+ <translation>์˜ต์…˜(&amp;O)</translation>
</message>
<message>
<source>&amp;Encrypt Wallet...</source>
- <translation>์ง€๊ฐ‘ ์•”ํ˜ธํ™”&amp;...</translation>
+ <translation>์ง€๊ฐ‘ ์•”ํ˜ธํ™”(&amp;E)...</translation>
</message>
<message>
<source>&amp;Backup Wallet...</source>
- <translation>์ง€๊ฐ‘ ๋ฐฑ์—…&amp;...</translation>
+ <translation>์ง€๊ฐ‘ ๋ฐฑ์—…(&amp;B)...</translation>
</message>
<message>
<source>&amp;Change Passphrase...</source>
- <translation>์•”ํ˜ธ๋ฌธ ๋ณ€๊ฒฝ&amp;...</translation>
+ <translation>์•”ํ˜ธ๋ฌธ ๋ณ€๊ฒฝ(&amp;C)...</translation>
</message>
<message>
<source>&amp;Sending addresses...</source>
- <translation>&amp;์ฃผ์†Œ ๋ณด๋‚ด๋Š” ์ค‘</translation>
+ <translation>๋ณด๋‚ด๋Š” ์ฃผ์†Œ(&amp;S)</translation>
</message>
<message>
<source>&amp;Receiving addresses...</source>
- <translation>&amp; ์ฃผ์†Œ ๋ฐ›๋Š” ์ค‘</translation>
+ <translation>๋ฐ›๋Š” ์ฃผ์†Œ(&amp;R)</translation>
</message>
<message>
<source>Open &amp;URI...</source>
- <translation>URI&amp;์—ด๊ธฐ...</translation>
+ <translation>&amp;URI ์—ด๊ธฐ...</translation>
</message>
<message>
<source>Bitcoin Core client</source>
@@ -315,7 +331,7 @@
</message>
<message>
<source>&amp;Debug window</source>
- <translation>๋””๋ฒ„๊ทธ ์ฐฝ&amp;</translation>
+ <translation>๋””๋ฒ„๊ทธ ์ฐฝ(&amp;D)</translation>
</message>
<message>
<source>Open debugging and diagnostic console</source>
@@ -323,7 +339,7 @@
</message>
<message>
<source>&amp;Verify message...</source>
- <translation>๋ฉ”์‹œ์ง€ ํ™•์ธ&amp;...</translation>
+ <translation>๋ฉ”์‹œ์ง€ ํ™•์ธ(&amp;V)...</translation>
</message>
<message>
<source>Bitcoin</source>
@@ -367,15 +383,15 @@
</message>
<message>
<source>&amp;File</source>
- <translation>&amp;ํŒŒ์ผ</translation>
+ <translation>ํŒŒ์ผ(&amp;F)</translation>
</message>
<message>
<source>&amp;Settings</source>
- <translation>&amp;์„ค์ •</translation>
+ <translation>์„ค์ •(&amp;S)</translation>
</message>
<message>
<source>&amp;Help</source>
- <translation>&amp;๋„์›€๋ง</translation>
+ <translation>๋„์›€๋ง(&amp;H)</translation>
</message>
<message>
<source>Tabs toolbar</source>
@@ -391,7 +407,11 @@
</message>
<message>
<source>&amp;About Bitcoin Core</source>
- <translation>&amp;๋น„ํŠธ์ฝ”์ธ ์ฝ”์–ด ์†Œ๊ฐœ</translation>
+ <translation>๋น„ํŠธ์ฝ”์ธ ์ฝ”์–ด ์†Œ๊ฐœ(&amp;A)</translation>
+ </message>
+ <message>
+ <source>Modify configuration options for Bitcoin Core</source>
+ <translation>๋น„ํŠธ์ฝ”์ธ ์ฝ”์–ด์— ๋Œ€ํ•œ ์„ค์ •์„ ์ˆ˜์ •ํ•ฉ๋‹ˆ๋‹ค.</translation>
</message>
<message>
<source>Show the list of used sending addresses and labels</source>
@@ -407,17 +427,25 @@
</message>
<message>
<source>&amp;Command-line options</source>
- <translation>๋ช…๋ น์–ด-๋ผ์ธ ์˜ต์…˜</translation>
+ <translation>๋ช…๋ น์ค„ ์˜ต์…˜(&amp;C)</translation>
</message>
<message>
<source>Show the Bitcoin Core help message to get a list with possible Bitcoin command-line options</source>
- <translation>์‚ฌ์šฉํ•  ์ˆ˜ ์žˆ๋Š” ๋น„ํŠธ์ฝ”์ธ ๋ช…๋ น์–ด ์˜ต์…˜ ๋ชฉ๋ก์„ ๊ฐ€์ ธ์˜ค๊ธฐ ์œ„ํ•ด Bitcoin-Qt ๋„์›€๋ง ๋ฉ”์‹œ์ง€๋ฅผ ํ‘œ์‹œํ•ฉ๋‹ˆ๋‹ค.</translation>
+ <translation>์‚ฌ์šฉํ•  ์ˆ˜ ์žˆ๋Š” ๋น„ํŠธ์ฝ”์ธ ๋ช…๋ น์ค„ ์˜ต์…˜ ๋ชฉ๋ก์„ ๊ฐ€์ ธ์˜ค๊ธฐ ์œ„ํ•ด Bitcoin-Qt ๋„์›€๋ง ๋ฉ”์‹œ์ง€๋ฅผ ํ‘œ์‹œํ•ฉ๋‹ˆ๋‹ค.</translation>
+ </message>
+ <message numerus="yes">
+ <source>%n active connection(s) to Bitcoin network</source>
+ <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>
@@ -575,7 +603,15 @@
</message>
<message>
<source>Amount</source>
- <translation>๊ฑฐ๋ž˜๋Ÿ‰</translation>
+ <translation>๊ฑฐ๋ž˜์•ก</translation>
+ </message>
+ <message>
+ <source>Received with label</source>
+ <translation>์ž…๊ธˆ๊ณผ ํ•จ๊ป˜ ์ˆ˜์‹ ๋œ ๋ผ๋ฒจ</translation>
+ </message>
+ <message>
+ <source>Received with address</source>
+ <translation>์ž…๊ธˆ๊ณผ ํ•จ๊ป˜ ์ˆ˜์‹ ๋œ ์ฃผ์†Œ</translation>
</message>
<message>
<source>Date</source>
@@ -599,11 +635,11 @@
</message>
<message>
<source>Copy label</source>
- <translation>ํ‘œ ๋ณต์‚ฌํ•˜๊ธฐ</translation>
+ <translation>๋ผ๋ฒจ ๋ณต์‚ฌํ•˜๊ธฐ</translation>
</message>
<message>
<source>Copy amount</source>
- <translation>๊ฑฐ๋ž˜๋Ÿ‰ ๋ณต์‚ฌ</translation>
+ <translation>๊ฑฐ๋ž˜์•ก ๋ณต์‚ฌ</translation>
</message>
<message>
<source>Copy transaction ID</source>
@@ -638,6 +674,14 @@
<translation>์šฐ์„ ๋„ ๋ณต์‚ฌ</translation>
</message>
<message>
+ <source>Copy dust</source>
+ <translation>๋”์ŠคํŠธ ๋ณต์‚ฌ</translation>
+ </message>
+ <message>
+ <source>Copy change</source>
+ <translation>์ž”๋ˆ ๋ณต์‚ฌ</translation>
+ </message>
+ <message>
<source>highest</source>
<translation>์•„์ฃผ ๋†’์Œ</translation>
</message>
@@ -682,6 +726,22 @@
<translation>์—†์Œ</translation>
</message>
<message>
+ <source>This label turns red if the transaction size is greater than 1000 bytes.</source>
+ <translation>์ด ๋ผ๋ฒจ์€ 1000๋ฐ”์ดํŠธ ์ด์ƒ์˜ ๊ฑฐ๋ž˜๊ฐ€ ์ด๋ฃจ์–ด์ง€๋ฉด ๋ถ‰๊ฒŒ ๋ณ€ํ•ฉ๋‹ˆ๋‹ค.</translation>
+ </message>
+ <message>
+ <source>This label turns red if the priority is smaller than "medium".</source>
+ <translation>์ด ๋ผ๋ฒจ์€ ์šฐ์„ ์ˆœ์œ„๊ฐ€ "๋ณดํ†ต" ์ดํ•˜์ธ ๊ฒฝ์šฐ ๋ถ‰๊ฒŒ ๋ณ€ํ•ฉ๋‹ˆ๋‹ค.</translation>
+ </message>
+ <message>
+ <source>This label turns red if any recipient receives an amount smaller than %1.</source>
+ <translation>์ด ๋ผ๋ฒจ์€ ์ˆ˜๋ น์ธ์ด ๋ฐ›์€ ์•ก์ˆ˜๊ฐ€ ์ž”๊ณ ์˜ %1๋ณด๋‹ค ์ž‘์œผ๋ฉด ๋ถ‰๊ฒŒ ๋ณ€ํ•ฉ๋‹ˆ๋‹ค.</translation>
+ </message>
+ <message>
+ <source>Can vary +/- %1 satoshi(s) per input.</source>
+ <translation>์ž…๋ ฅ๋งˆ๋‹ค +/- %1 ์‚ฌํ† ์‹œ๊ฐ€ ๋ณ€ํ•  ์ˆ˜ ์žˆ์Šต๋‹ˆ๋‹ค.</translation>
+ </message>
+ <message>
<source>yes</source>
<translation>์˜ˆ</translation>
</message>
@@ -691,7 +751,11 @@
</message>
<message>
<source>This means a fee of at least %1 per kB is required.</source>
- <translation>์ด ์˜๋ฏธ๋Š” ์ˆ˜์ˆ˜๋ฃŒ๊ฐ€ ์ตœ์†Œํ•œ %1 per ํ‚ค๋กœ๋ฐ”์ดํŠธ ํ•„์š”ํ•ฉ๋‹ˆ๋‹ค</translation>
+ <translation>์ด ๋œป์€ ์ตœ์†Œํ•œ 1kB ๋‹น %1์˜ ์ˆ˜์ˆ˜๋ฃŒ๊ฐ€ ํ•„์š”ํ•˜๋‹ค๋Š” ์˜๋ฏธ์ž…๋‹ˆ๋‹ค.</translation>
+ </message>
+ <message>
+ <source>Can vary +/- 1 byte per input.</source>
+ <translation>์ž…๋ ฅ๋งˆ๋‹ค +/- 1 ๋ฐ”์ดํŠธ๊ฐ€ ๋ณ€ํ•  ์ˆ˜ ์žˆ์Šต๋‹ˆ๋‹ค.</translation>
</message>
<message>
<source>Transactions with higher priority are more likely to get included into a block.</source>
@@ -699,13 +763,17 @@
</message>
<message>
<source>(no label)</source>
- <translation>(ํ‘œ ์—†์Œ)</translation>
+ <translation>(๋ผ๋ฒจ ์—†์Œ)</translation>
</message>
<message>
<source>change from %1 (%2)</source>
<translation>~๋กœ๋ถ€ํ„ฐ ๋ณ€๊ฒฝ %1 (%2)</translation>
</message>
- </context>
+ <message>
+ <source>(change)</source>
+ <translation>(์ž”๋ˆ)</translation>
+ </message>
+</context>
<context>
<name>EditAddressDialog</name>
<message>
@@ -714,15 +782,19 @@
</message>
<message>
<source>&amp;Label</source>
- <translation>&amp;ํ‘œ</translation>
+ <translation>๋ผ๋ฒจ(&amp;L)</translation>
</message>
<message>
<source>The label associated with this address list entry</source>
<translation>ํ˜„์žฌ ์„ ํƒ๋œ ์ฃผ์†Œ ํ•„๋“œ์˜ ์ œ๋ชฉ์ž…๋‹ˆ๋‹ค. </translation>
</message>
<message>
+ <source>The address associated with this address list entry. This can only be modified for sending addresses.</source>
+ <translation>๋ณธ ์ฃผ์†Œ๋ก ์ž…๋ ฅ์€ ์ฃผ์†Œ์™€ ์—ฐ๊ณ„๋˜์—ˆ์Šต๋‹ˆ๋‹ค. ์ด๊ฒƒ์€ ๋ณด๋‚ด๋Š” ์ฃผ์†Œ๋“ค์—์„œ๋งŒ ๋ณ€๊ฒฝ๋ ์ˆ˜ ์žˆ์Šต๋‹ˆ๋‹ค.</translation>
+ </message>
+ <message>
<source>&amp;Address</source>
- <translation>&amp;์ฃผ์†Œ</translation>
+ <translation>์ฃผ์†Œ(&amp;A)</translation>
</message>
<message>
<source>New receiving address</source>
@@ -754,7 +826,7 @@
</message>
<message>
<source>New key generation failed.</source>
- <translation>์ƒˆ๋กœ์šด ํ‚ค ์ƒ์„ฑ์ด ์‹คํŒจํ•˜์˜€์Šต๋‹ˆ๋‹ค</translation>
+ <translation>์ƒˆ๋กœ์šด ํ‚ค ์ƒ์„ฑ์ด ์‹คํŒจํ•˜์˜€์Šต๋‹ˆ๋‹ค.</translation>
</message>
</context>
<context>
@@ -810,7 +882,35 @@
<source>command-line options</source>
<translation>๋ช…๋ น์ค„ ์˜ต์…˜</translation>
</message>
- </context>
+ <message>
+ <source>UI Options:</source>
+ <translation>UI ์˜ต์…˜:</translation>
+ </message>
+ <message>
+ <source>Choose data directory on startup (default: %u)</source>
+ <translation>์‹คํ–‰์‹œ ๋ฐ์ดํ„ฐ ํด๋” ์„ ํƒํ•˜๊ธฐ (๊ธฐ๋ณธ๊ฐ’: %u)</translation>
+ </message>
+ <message>
+ <source>Set language, for example "de_DE" (default: system locale)</source>
+ <translation>"ko_KR"์™€ ๊ฐ™์ด ์–ธ์–ด๋ฅผ ์„ค์ •ํ•˜์‹ญ์‹œ์˜ค (๊ธฐ๋ณธ๊ฐ’: ์‹œ์Šคํ…œ ๋กœ์บ˜)</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>
+ <message>
+ <source>Reset all settings changes made over the GUI</source>
+ <translation>GUI๋ฅผ ํ†ตํ•ด ์ˆ˜์ •๋œ ๋ชจ๋“  ์„ค์ •์„ ์ดˆ๊ธฐํ™”</translation>
+ </message>
+</context>
<context>
<name>Intro</name>
<message>
@@ -819,7 +919,7 @@
</message>
<message>
<source>Welcome to Bitcoin Core.</source>
- <translation>๋น„ํŠธ์ฝ”์ธ ์ฝ”์–ด์— ์˜ค์‹ ๊ฒƒ์„ ํ™˜์˜ํ•ฉ๋‹ˆ.</translation>
+ <translation>๋น„ํŠธ์ฝ”์ธ ์ฝ”์–ด์— ์˜ค์‹ ๊ฒƒ์„ ํ™˜์˜ํ•ฉ๋‹ˆ๋‹ค.</translation>
</message>
<message>
<source>As this is the first time the program is launched, you can choose where Bitcoin Core will store its data.</source>
@@ -842,10 +942,22 @@
<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>
+ <message numerus="yes">
+ <source>%n GB of free space available</source>
+ <translation><numerusform>%n GB ์‚ฌ์šฉ๊ฐ€๋Šฅ</numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <source>(of %n GB needed)</source>
+ <translation><numerusform>(%n GB๊ฐ€ ํ•„์š”)</numerusform></translation>
+ </message>
+</context>
<context>
<name>OpenURIDialog</name>
<message>
@@ -873,7 +985,7 @@
<name>OptionsDialog</name>
<message>
<source>Options</source>
- <translation>์„ ํƒ๋“ค</translation>
+ <translation>ํ™˜๊ฒฝ์„ค์ •</translation>
</message>
<message>
<source>&amp;Main</source>
@@ -881,7 +993,7 @@
</message>
<message>
<source>Size of &amp;database cache</source>
- <translation>๋ฐ์ดํ„ฐ๋ฒ ์ด์Šค ์บ์‹œ ํฌ๊ธฐ</translation>
+ <translation>๋ฐ์ดํ„ฐ๋ฒ ์ด์Šค ์บ์‹œ ํฌ๊ธฐ(&amp;D)</translation>
</message>
<message>
<source>MB</source>
@@ -889,7 +1001,7 @@
</message>
<message>
<source>Number of script &amp;verification threads</source>
- <translation>์Šคํฌ๋ฆฝํŠธ ์ธ์ฆ ์“ฐ๋ ˆ๋“œ์˜ ๊ฐœ์ˆ˜</translation>
+ <translation>์Šคํฌ๋ฆฝํŠธ ์ธ์ฆ ์“ฐ๋ ˆ๋“œ์˜ ๊ฐœ์ˆ˜(&amp;V)</translation>
</message>
<message>
<source>Accept connections from outside</source>
@@ -901,7 +1013,19 @@
</message>
<message>
<source>IP address of the proxy (e.g. IPv4: 127.0.0.1 / IPv6: ::1)</source>
- <translation>ํ”„๋ก์‹œ ์•„์ดํ”ผ ์ฃผ์†Œ(์˜ˆ. IPv4:127.0.0.1 / IPv6: ::1)</translation>
+ <translation>ํ”„๋ก์‹œ ์•„์ดํ”ผ ์ฃผ์†Œ (์˜ˆ. 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>์ฐฝ์„ ๋‹ซ์œผ๋ฉด ์ข…๋ฃŒ ๋Œ€์‹  ํŠธ๋ ˆ์ด๋กœ ๋ณด๋‚ด๊ธฐ. ์ด ์˜ต์…˜์„ ํ™œ์„ฑํ™”ํ•˜๋ฉด ๋ฉ”๋‰ด์—์„œ ์ข…๋ฃŒ๋ฅผ ์„ ํƒํ•œ ํ›„์—๋งŒ ์–ดํ”Œ๋ฆฌ์ผ€์ด์…˜์ด ์ข…๋ฃŒ๋ฉ๋‹ˆ๋‹ค.</translation>
+ </message>
+ <message>
+ <source>The user interface language can be set here. This setting will take effect after restarting Bitcoin Core.</source>
+ <translation>์‚ฌ์šฉ์ž ์ธํ„ฐํŽ˜์ด์Šค ์–ธ์–ด๋ฅผ ์—ฌ๊ธฐ์„œ ์„ค์ •ํ•  ์ˆ˜ ์žˆ์Šต๋‹ˆ๋‹ค. ์ด ์„ค์ •์€ Bitcoin Core๋ฅผ ๋‹ค์‹œ ์‹œ์ž‘ํ•  ๋•Œ ์ ์šฉ๋ฉ๋‹ˆ๋‹ค.</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>์„œ๋“œ-ํŒŒํ‹ฐ URLs (์˜ˆ. ๋ธ”๋ก ํƒ์ƒ‰๊ธฐ)๋Š” ๊ฑฐ๋ž˜ ํƒญ์˜ ์ปจํ…์ŠคํŠธ ๋ฉ”๋‰ด์— ๋‚˜ํƒ€๋‚ฉ๋‹ˆ๋‹ค. URL์˜ %s๋Š” ํŠธ๋žœ์žญ์…˜ ํ•ด์‹œ๊ฐ’์œผ๋กœ ๋Œ€์ฒด๋ฉ๋‹ˆ๋‹ค. ์—ฌ๋Ÿฌ URLs๋Š” ์ˆ˜์ง ๋ฐ” | ์—์„œ ๋‚˜๋ˆ„์–ด ์ง‘๋‹ˆ๋‹ค.</translation>
</message>
<message>
<source>Third party transaction URLs</source>
@@ -909,7 +1033,7 @@
</message>
<message>
<source>Active command-line options that override above options:</source>
- <translation>๋ช…๋ น์–ด ๋ผ์ธ ์˜ต์…˜์„ ํ™œ์„ฑํ™”ํ•ด์„œ ์˜ต์…˜์„ ์šฐํšŒํ•˜์‹œ์˜ค</translation>
+ <translation>๋ช…๋ น์ค„ ์˜ต์…˜ ํ™œ์„ฑํ™”๋Š” ์œ„์˜ ์˜ต์…˜๋“ค์„ ๋Œ€์ฒดํ•ฉ๋‹ˆ๋‹ค:</translation>
</message>
<message>
<source>Reset all client options to default.</source>
@@ -924,8 +1048,20 @@
<translation>๋„คํŠธ์›Œํฌ(&amp;N)</translation>
</message>
<message>
+ <source>Automatically start Bitcoin Core after logging in to the system.</source>
+ <translation>์‹œ์Šคํ…œ ๋กœ๊ทธ์ธ ํ›„ ์ž๋™์œผ๋กœ Bitcoin Core๋ฅผ ์‹คํ–‰ํ•ฉ๋‹ˆ๋‹ค.</translation>
+ </message>
+ <message>
+ <source>&amp;Start Bitcoin Core on system login</source>
+ <translation>์‹œ์Šคํ…œ ๋กœ๊ทธ์ธ ํ›„ Bitcoin Core ์‹œ์ž‘(&amp;S)</translation>
+ </message>
+ <message>
+ <source>(0 = auto, &lt;0 = leave that many cores free)</source>
+ <translation>(0 = ์ž๋™, &lt;0 = ์ง€์ •๋œ ์ฝ”์–ด ๊ฐœ์ˆ˜๋งŒํผ ์‚ฌ์šฉ ์•ˆํ•จ)</translation>
+ </message>
+ <message>
<source>W&amp;allet</source>
- <translation>์ง€๊ฐ‘</translation>
+ <translation>์ง€๊ฐ‘(&amp;A)</translation>
</message>
<message>
<source>Expert</source>
@@ -933,19 +1069,23 @@
</message>
<message>
<source>Enable coin &amp;control features</source>
- <translation>์ฝ”์ธ ์ƒ์„ธ ์ œ์–ด๊ธฐ๋Šฅ์„ ํ™œ์„ฑํ™”ํ•ฉ๋‹ˆ๋‹ค - &amp;C</translation>
+ <translation>์ฝ”์ธ ์ƒ์„ธ ์ œ์–ด๊ธฐ๋Šฅ์„ ํ™œ์„ฑํ™”ํ•ฉ๋‹ˆ๋‹ค (&amp;C)</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>๊ฒ€์ฆ๋˜์ง€ ์•Š์€ ์ž”๋ˆ ์“ฐ๊ธฐ๋ฅผ ๋น„ํ™œ์„ฑํ™”ํ•˜๋ฉด ํŠธ๋žœ์žญ์…˜์ด ์ ์–ด๋„ 1ํšŒ ์ด์ƒ ๊ฒ€์ฆ๋˜๊ธฐ ์ „๊นŒ์ง€ ๊ทธ ํŠธ๋žœ์žญ์…˜์˜ ๊ฑฐ์Šค๋ฆ„๋ˆ์€ ์‚ฌ์šฉํ•  ์ˆ˜ ์—†์Šต๋‹ˆ๋‹ค. ์ด๋Š” ์ž”์•ก ๊ณ„์‚ฐ ๋ฐฉ๋ฒ•์—๋„ ์˜ํ–ฅ์„ ๋ฏธ์นฉ๋‹ˆ๋‹ค.</translation>
</message>
<message>
<source>&amp;Spend unconfirmed change</source>
- <translation>&amp;ํ™•์ธ๋˜์ง€ ์•Š์€ ๋ˆ์„ ์“ฐ๋‹ค</translation>
+ <translation>๊ฒ€์ฆ๋˜์ง€ ์•Š์€ ์ž”๋ˆ ์“ฐ๊ธฐ (&amp;S)</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>๋ผ์šฐํ„ฐ์˜ ๋น„ํŠธ์ฝ”์ธ ํด๋ผ์ด์–ธํŠธ ํฌํŠธ๋ฅผ ์ž๋™์œผ๋กœ ์—ฝ๋‹ˆ๋‹ค. ๋ผ์šฐํ„ฐ์—์„œ UPnP๋ฅผ ์ง€์›ํ•˜๊ณ  ํ™œ์„ฑํ™” ํ–ˆ์„ ๊ฒฝ์šฐ์—๋งŒ ๋™์ž‘ํ•ฉ๋‹ˆ๋‹ค.</translation>
+ <translation>๋ผ์šฐํ„ฐ์—์„œ Bitcoin ํด๋ผ์ด์–ธํŠธ ํฌํŠธ๋ฅผ ์ž๋™์ ์œผ๋กœ ์—ฝ๋‹ˆ๋‹ค. ๋ผ์šฐํ„ฐ์—์„œ UPnP๋ฅผ ์ง€์›ํ•˜๊ณ  ํ™œ์„ฑํ™” ํ–ˆ์„ ๊ฒฝ์šฐ์—๋งŒ ๋™์ž‘ํ•ฉ๋‹ˆ๋‹ค.</translation>
</message>
<message>
<source>Map port using &amp;UPnP</source>
- <translation>์‚ฌ์šฉ์ค‘์ธ UPnP ํฌํŠธ ๋งคํ•‘(&amp;U)</translation>
+ <translation>์‚ฌ์šฉ์ค‘์ธ &amp;UPnP ํฌํŠธ ๋งคํ•‘</translation>
</message>
<message>
<source>Connect to the Bitcoin network through a SOCKS5 proxy.</source>
@@ -953,11 +1093,11 @@
</message>
<message>
<source>&amp;Connect through SOCKS5 proxy (default proxy):</source>
- <translation>SOCKS5 ํ”„๋ก์‹œ๋ฅผ ๊ฑฐ์ณ ์—ฐ๊ฒฐํ•ฉ๋‹ˆ๋‹ค (๊ธฐ๋ณธ๊ฐ’ ํ”„๋ก์‹œ):</translation>
+ <translation>SOCKS5 ํ”„๋ก์‹œ๋ฅผ ๊ฑฐ์ณ ์—ฐ๊ฒฐํ•ฉ๋‹ˆ๋‹ค(&amp;C) (๊ธฐ๋ณธ ํ”„๋ก์‹œ):</translation>
</message>
<message>
<source>Proxy &amp;IP:</source>
- <translation>ํ”„๋ก์‹œ IP(&amp;I):</translation>
+ <translation>ํ”„๋ก์‹œ &amp;IP:</translation>
</message>
<message>
<source>&amp;Port:</source>
@@ -968,6 +1108,14 @@
<translation>ํ”„๋ก์‹œ์˜ ํฌํŠธ๋ฒˆํ˜ธ์ž…๋‹ˆ๋‹ค(์˜ˆ: 9050)</translation>
</message>
<message>
+ <source>Used for reaching peers via:</source>
+ <translation>ํ”ผ์–ด์— ์—ฐ๊ฒฐํ•˜๊ธฐ ์œ„ํ•ด ์‚ฌ์šฉ๋œ ๋ฐฉ๋ฒ•:</translation>
+ </message>
+ <message>
+ <source>Shows, if the supplied default SOCKS5 proxy is used to reach peers via this network type.</source>
+ <translation>์ด SOCK5 ํ”„๋ก์‹œ๋ฅผ ํ†ต๊ณผํ•ด ํ”ผ์–ด์™€ ์ ‘์†ํ•œ ๋„คํŠธ์›Œํฌ ์œ ํ˜•์ด ํ‘œ์‹œ๋ฉ๋‹ˆ๋‹ค.</translation>
+ </message>
+ <message>
<source>IPv4</source>
<translation>IPv4</translation>
</message>
@@ -980,6 +1128,14 @@
<translation>Tor</translation>
</message>
<message>
+ <source>Connect to the Bitcoin network through a separate SOCKS5 proxy for Tor hidden services.</source>
+ <translation>Tor ์„œ๋น„์Šค๋ฅผ ๊ฒฝ์œ ํ•˜์—ฌ ๋น„ํŠธ์ฝ”์ธ ๋„คํŠธ์›Œํฌ์— ์—ฐ๊ฒฐํ•˜๊ธฐ ์œ„ํ•ด ๋ถ„๋ฆฌ๋œ SOCKS5 ํ”„๋ก์‹œ๋ฅผ ์‚ฌ์šฉ.</translation>
+ </message>
+ <message>
+ <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services:</source>
+ <translation>Tor ์„œ๋น„์Šค๋ฅผ ์ด์šฉํ•˜์—ฌ ํ”ผ์–ด์—๊ฒŒ ์—ฐ๊ฒฐํ•˜๊ธฐ ์œ„ํ•ด ๋ถ„๋ฆฌ๋œ SOCKS5 ํ”„๋ก์‹œ ์‚ฌ์šฉ</translation>
+ </message>
+ <message>
<source>&amp;Window</source>
<translation>์ฐฝ(&amp;W)</translation>
</message>
@@ -1040,6 +1196,10 @@
<translation>๋ณ€๊ฒฝ ์‚ฌํ•ญ์„ ์ ์šฉํ•˜๊ธฐ ์œ„ํ•ด์„œ๋Š” ํ”„๋กœ๊ทธ๋žจ์ด ์ข…๋ฃŒ ํ›„ ์žฌ์‹œ์ž‘๋˜์–ด์•ผ ํ•ฉ๋‹ˆ๋‹ค.</translation>
</message>
<message>
+ <source>Client will be shut down. Do you want to proceed?</source>
+ <translation>ํด๋ผ์ด์–ธํŠธ๊ฐ€ ์ข…๋ฃŒ๋ฉ๋‹ˆ๋‹ค, ๊ณ„์† ์ง„ํ–‰ํ•˜์‹œ๊ฒ ์Šต๋‹ˆ๊นŒ?</translation>
+ </message>
+ <message>
<source>This change would require a client restart.</source>
<translation>์ด ๋ณ€๊ฒฝ ์‚ฌํ•ญ ์ ์šฉ์„ ์œ„ํ•ด ํ”„๋กœ๊ทธ๋žจ ์žฌ์‹œ์ž‘์ด ํ•„์š”ํ•ฉ๋‹ˆ๋‹ค. </translation>
</message>
@@ -1056,7 +1216,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>
@@ -1103,10 +1263,26 @@
<translation>๋ชจ๋‹ˆํ„ฐ๋ง ์ง€๊ฐ‘์˜ ํ˜„์žฌ ์ž”์•ก</translation>
</message>
<message>
+ <source>Spendable:</source>
+ <translation>์‚ฌ์šฉ๊ฐ€๋Šฅ:</translation>
+ </message>
+ <message>
<source>Recent transactions</source>
<translation>์ตœ๊ทผ ๊ฑฐ๋ž˜</translation>
</message>
- </context>
+ <message>
+ <source>Unconfirmed transactions to watch-only addresses</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>
<message>
@@ -1118,12 +1294,24 @@
<translation>์ž˜๋ชป๋œ ์ง€๋ถˆ ์ฃผ์†Œ์ž…๋‹ˆ๋‹ค %1</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 is not initialized.</source>
+ <translation>์ง€๋ถˆ ์š”์ฒญ์ด ์ดˆ๊ธฐํ™” ๋˜์ง€ ์•Š์•˜์Šต๋‹ˆ๋‹ค.</translation>
+ </message>
+ <message>
<source>Requested payment amount of %1 is too small (considered dust).</source>
<translation>์š”์ฒญํ•œ ๊ธˆ์•ก %1์˜ ์–‘์ด ๋„ˆ๋ฌด ์ ์Šต๋‹ˆ๋‹ค. (์ŠคํŒธ์„ฑ ๊ฑฐ๋ž˜๋กœ ๊ฐ„์ฃผ)</translation>
</message>
<message>
<source>Payment request error</source>
- <translation>์ง€๋ถˆ ์š”์ฒญ ์• ๋Ÿฌ</translation>
+ <translation>์ง€๋ถˆ ์š”์ฒญ ์˜ค๋ฅ˜</translation>
</message>
<message>
<source>Cannot start bitcoin: click-to-pay handler</source>
@@ -1134,20 +1322,44 @@
<translation>๋Œ€๊ธˆ ์ฒญ๊ตฌ์„œ์˜ URL์ด ์˜ฌ๋ฐ”๋ฅด์ง€ ์•Š์Šต๋‹ˆ๋‹ค: %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 expired.</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>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>
+ <translation>%1๊ณผ ์†Œํ†ตํ•˜๋Š”๋ฐ ์˜ค๋ฅ˜: %2</translation>
+ </message>
+ <message>
+ <source>Payment request cannot be parsed!</source>
+ <translation>์ง€๋ถˆ์š”์ฒญ์„ ์ฒ˜๋ฆฌํ•  ์ˆ˜ ์—†์Šต๋‹ˆ๋‹ค.</translation>
</message>
<message>
<source>Bad response from server %1</source>
@@ -1159,23 +1371,39 @@
</message>
<message>
<source>Network request error</source>
- <translation>๋„คํŠธ์›Œํฌ ์š”์ฒญ ์• ๋Ÿฌ</translation>
+ <translation>๋„คํŠธ์›Œํฌ ์š”์ฒญ ์˜ค๋ฅ˜</translation>
</message>
</context>
<context>
<name>PeerTableModel</name>
- </context>
+ <message>
+ <source>User Agent</source>
+ <translation>์œ ์ € ์—์ด์ „ํŠธ</translation>
+ </message>
+ <message>
+ <source>Node/Service</source>
+ <translation>๋…ธ๋“œ/์„œ๋น„์Šค</translation>
+ </message>
+ <message>
+ <source>Ping Time</source>
+ <translation>Ping ์‹œ๊ฐ„</translation>
+ </message>
+</context>
<context>
<name>QObject</name>
<message>
<source>Amount</source>
- <translation>๊ฑฐ๋ž˜๋Ÿ‰</translation>
+ <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>
+ <message>
<source>%1 h</source>
<translation>%1 ์‹œ๊ฐ„</translation>
</message>
@@ -1188,6 +1416,10 @@
<translation>%1 ์ดˆ</translation>
</message>
<message>
+ <source>None</source>
+ <translation>์—†์Œ</translation>
+ </message>
+ <message>
<source>N/A</source>
<translation>์—†์Œ</translation>
</message>
@@ -1212,7 +1444,7 @@
</message>
<message>
<source>PNG Image (*.png)</source>
- <translation>PNG ์ด๋ฏธ์ง€(*.png)</translation>
+ <translation>PNG ์ด๋ฏธ์ง€ (*.png)</translation>
</message>
</context>
<context>
@@ -1231,7 +1463,7 @@
</message>
<message>
<source>&amp;Information</source>
- <translation>์ •๋ณด</translation>
+ <translation>์ •๋ณด(&amp;I)</translation>
</message>
<message>
<source>Debug window</source>
@@ -1242,12 +1474,8 @@
<translation>์ผ๋ฐ˜</translation>
</message>
<message>
- <source>Using OpenSSL version</source>
- <translation>์‚ฌ์šฉ์ค‘์ธ OpenSSL ๋ฒ„์ „</translation>
- </message>
- <message>
<source>Using BerkeleyDB version</source>
- <translation>์‚ฌ์šฉ์ค‘์ธ BerkeleyDB ๋ฒ„์ „</translation>
+ <translation>์‚ฌ์šฉ ์ค‘์ธ BerkeleyDB ๋ฒ„์ „</translation>
</message>
<message>
<source>Startup time</source>
@@ -1274,6 +1502,22 @@
<translation>ํ˜„์žฌ ๋ธ”๋Ÿญ ์ˆ˜</translation>
</message>
<message>
+ <source>Memory Pool</source>
+ <translation>๋ฉ”๋ชจ๋ฆฌ ํ’€</translation>
+ </message>
+ <message>
+ <source>Current number of transactions</source>
+ <translation>ํ˜„์žฌ ํŠธ๋žœ์žญ์…˜ ์ˆ˜</translation>
+ </message>
+ <message>
+ <source>Memory usage</source>
+ <translation>๋ฉ”๋ชจ๋ฆฌ ์‚ฌ์šฉ๋Ÿ‰</translation>
+ </message>
+ <message>
+ <source>Open the Bitcoin Core debug log file from the current data directory. This can take a few seconds for large log files.</source>
+ <translation>ํ˜„์žฌ์˜ ๋ฐ์ดํ„ฐํด๋”์—์„œ ๋น„ํŠธ์ฝ”์ธ ๋””๋ฒ„๊ทธ ํŒŒ์ผ์„ ์—ฝ๋‹ˆ๋‹ค. ์šฉ๋Ÿ‰์ด ํฐ ๋กœ๊ทธ ํŒŒ์ผ์€ ๋ช‡ ์ดˆ๊ฐ€ ๊ฑธ๋ฆด ์ˆ˜ ์žˆ์Šต๋‹ˆ๋‹ค.</translation>
+ </message>
+ <message>
<source>Received</source>
<translation>๋ฐ›์Œ</translation>
</message>
@@ -1283,13 +1527,81 @@
</message>
<message>
<source>&amp;Peers</source>
- <translation>&amp;ํ”ผ์–ด</translation>
+ <translation>ํ”ผ์–ด(&amp;P)</translation>
+ </message>
+ <message>
+ <source>Banned peers</source>
+ <translation>์ฐจ๋‹จ๋œ ํ”ผ์–ด</translation>
+ </message>
+ <message>
+ <source>Select a peer to view detailed information.</source>
+ <translation>์ž์„ธํ•œ ์ •๋ณด๋ฅผ ๋ณด๋ ค๋ฉด ํ”ผ์–ด๋ฅผ ์„ ํƒํ•˜์„ธ์š”.</translation>
+ </message>
+ <message>
+ <source>Whitelisted</source>
+ <translation>ํ™”์ดํŠธ๋ฆฌ์ŠคํŠธ์— ํฌํ•จ</translation>
+ </message>
+ <message>
+ <source>Direction</source>
+ <translation>๋ฐฉํ–ฅ</translation>
</message>
<message>
<source>Version</source>
<translation>๋ฒ„์ „</translation>
</message>
<message>
+ <source>Starting Block</source>
+ <translation>์‹œ์ž‘๋œ ๋ธ”๋ก</translation>
+ </message>
+ <message>
+ <source>Synced Headers</source>
+ <translation>๋™๊ธฐํ™”๋œ ํ—ค๋”</translation>
+ </message>
+ <message>
+ <source>Synced Blocks</source>
+ <translation>๋™๊ธฐํ™”๋œ ๋ธ”๋ก</translation>
+ </message>
+ <message>
+ <source>User Agent</source>
+ <translation>์œ ์ € ์—์ด์ „ํŠธ</translation>
+ </message>
+ <message>
+ <source>Services</source>
+ <translation>์„œ๋น„์Šค</translation>
+ </message>
+ <message>
+ <source>Ban Score</source>
+ <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>
+ <message>
+ <source>Ping Time</source>
+ <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>Time Offset</source>
+ <translation>์‹œ๊ฐ„ ์˜คํ”„์…‹</translation>
+ </message>
+ <message>
<source>Last block time</source>
<translation>์ตœ์ข… ๋ธ”๋Ÿญ ์‹œ๊ฐ</translation>
</message>
@@ -1303,11 +1615,11 @@
</message>
<message>
<source>&amp;Network Traffic</source>
- <translation>&amp;๋„คํŠธ์›Œํฌ ํŠธ๋ž˜ํ”ฝ</translation>
+ <translation>๋„คํŠธ์›Œํฌ ํŠธ๋ž˜ํ”ฝ(&amp;N)</translation>
</message>
<message>
<source>&amp;Clear</source>
- <translation>&amp;์ง€์šฐ๊ธฐ</translation>
+ <translation>์ง€์šฐ๊ธฐ(&amp;C)</translation>
</message>
<message>
<source>Totals</source>
@@ -1334,6 +1646,38 @@
<translation>์ฝ˜์†” ์ดˆ๊ธฐํ™”</translation>
</message>
<message>
+ <source>&amp;Disconnect Node</source>
+ <translation>๋Š๊ธด ๋…ธ๋“œ(&amp;D)</translation>
+ </message>
+ <message>
+ <source>Ban Node for</source>
+ <translation>์ถ”๋ฐฉ๋œ ๋…ธ๋“œ:</translation>
+ </message>
+ <message>
+ <source>1 &amp;hour</source>
+ <translation>1์‹œ๊ฐ„(&amp;H)</translation>
+ </message>
+ <message>
+ <source>1 &amp;day</source>
+ <translation>1์ผ(&amp;D)</translation>
+ </message>
+ <message>
+ <source>1 &amp;week</source>
+ <translation>1์ฃผ(&amp;W)</translation>
+ </message>
+ <message>
+ <source>1 &amp;year</source>
+ <translation>1๋…„(&amp;Y)</translation>
+ </message>
+ <message>
+ <source>&amp;Unban Node</source>
+ <translation>๋…ธ๋“œ ์ถ”๋ฐฉ ์ทจ์†Œ(&amp;U)</translation>
+ </message>
+ <message>
+ <source>Welcome to the Bitcoin Core RPC console.</source>
+ <translation>๋น„ํŠธ์ฝ”์ธ RPC ์ฝ˜์†”์— ์˜ค์‹ ๊ฑธ ํ™˜์˜ํ•ฉ๋‹ˆ๋‹ค</translation>
+ </message>
+ <message>
<source>Use up and down arrows to navigate history, and &lt;b&gt;Ctrl-L&lt;/b&gt; to clear screen.</source>
<translation>๊ธฐ๋ก์„ ์ฐพ์•„๋ณด๋ ค๋ฉด ์œ„ ์•„๋ž˜ ํ™”์‚ดํ‘œ ํ‚ค๋ฅผ, ํ™”๋ฉด์„ ์ง€์šฐ๋ ค๋ฉด &lt;b&gt;Ctrl-L&lt;/b&gt;ํ‚ค๋ฅผ ์‚ฌ์šฉํ•˜์‹ญ์‹œ์˜ค.</translation>
</message>
@@ -1357,20 +1701,52 @@
<source>%1 GB</source>
<translation>%1 ๊ธฐ๊ฐ€๋ฐ”์ดํŠธ</translation>
</message>
- </context>
+ <message>
+ <source>(node id: %1)</source>
+ <translation>(๋…ธ๋“œ ID: %1)</translation>
+ </message>
+ <message>
+ <source>via %1</source>
+ <translation>%1 ๊ฒฝ์œ </translation>
+ </message>
+ <message>
+ <source>never</source>
+ <translation>์—†์Œ</translation>
+ </message>
+ <message>
+ <source>Inbound</source>
+ <translation>์ธ๋ฐ”์šด๋“œ</translation>
+ </message>
+ <message>
+ <source>Outbound</source>
+ <translation>์•„์›ƒ๋ฐ”์šด๋“œ</translation>
+ </message>
+ <message>
+ <source>Yes</source>
+ <translation>์˜ˆ</translation>
+ </message>
+ <message>
+ <source>No</source>
+ <translation>์•„๋‹ˆ์˜ค</translation>
+ </message>
+ <message>
+ <source>Unknown</source>
+ <translation>์•Œ์ˆ˜์—†์Œ</translation>
+ </message>
+</context>
<context>
<name>ReceiveCoinsDialog</name>
<message>
<source>&amp;Amount:</source>
- <translation>&amp;๊ฑฐ๋ž˜๋Ÿ‰:</translation>
+ <translation>๊ฑฐ๋ž˜์•ก(&amp;A):</translation>
</message>
<message>
<source>&amp;Label:</source>
- <translation>๋ผ๋ฒจ:</translation>
+ <translation>๋ผ๋ฒจ(&amp;L):</translation>
</message>
<message>
<source>&amp;Message:</source>
- <translation>&amp;๋ฉ”์‹œ์ง€:</translation>
+ <translation>๋ฉ”์‹œ์ง€(&amp;M):</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>
@@ -1378,7 +1754,11 @@
</message>
<message>
<source>R&amp;euse an existing receiving address (not recommended)</source>
- <translation>ํ˜„์žฌ์˜ ์ˆ˜์ทจ์šฉ ์ฃผ์†Œ๋ฅผ ์žฌ์‚ฌ์šฉํ•ฉ๋‹ˆ๋‹ค๋งŒ ๊ถŒ์žฅํ•˜์ง€๋Š” ์•Š์Šต๋‹ˆ๋‹ค. (R&amp;)</translation>
+ <translation>ํ˜„์žฌ์˜ ์ˆ˜์ทจ์šฉ ์ฃผ์†Œ๋ฅผ ์žฌ์‚ฌ์šฉํ•˜๊ธฐ(&amp;E) (๊ถŒ์žฅํ•˜์ง€ ์•Š์Šต๋‹ˆ๋‹ค)</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>์ง€๋ถˆ ์š”์ฒญ์— ์ฒจ๋ถ€๋˜๋Š” ์„ ํƒ๊ฐ€๋Šฅํ•œ ๋ฉ”์‹œ์ง€ ์ž…๋‹ˆ๋‹ค. ์ด ๋ฉ”์„ธ์ง€๋Š” ์š”์ฒญ์ด ์—ด๋ฆด ๋•Œ ํ‘œ์‹œ๋  ๊ฒƒ ์ž…๋‹ˆ๋‹ค. ๋ฉ”๋ชจ: ์ด ๋ฉ”์‹œ์ง€๋Š” ๋น„ํŠธ์ฝ”์ธ ๋„คํŠธ์›Œํฌ๋กœ ์ „์†ก๋˜์ง€ ์•Š์Šต๋‹ˆ๋‹ค.</translation>
</message>
<message>
<source>An optional label to associate with the new receiving address.</source>
@@ -1409,6 +1789,10 @@
<translation>์ง€๋ถˆ ์š”์ฒญ(&amp;R)</translation>
</message>
<message>
+ <source>Show the selected request (does the same as double clicking an entry)</source>
+ <translation>์„ ํƒ๋œ ์š”์ฒญ์„ ํ‘œ์‹œํ•˜๊ธฐ (๋”๋ธ” ํด๋ฆญ์œผ๋กœ ํ•ญ๋ชฉ์„ ํ‘œ์‹œํ•  ์ˆ˜ ์žˆ์Šต๋‹ˆ๋‹ค)</translation>
+ </message>
+ <message>
<source>Show</source>
<translation>๋ณด๊ธฐ</translation>
</message>
@@ -1422,7 +1806,7 @@
</message>
<message>
<source>Copy label</source>
- <translation>ํ‘œ ๋ณต์‚ฌํ•˜๊ธฐ</translation>
+ <translation>๋ผ๋ฒจ ๋ณต์‚ฌํ•˜๊ธฐ</translation>
</message>
<message>
<source>Copy message</source>
@@ -1430,7 +1814,7 @@
</message>
<message>
<source>Copy amount</source>
- <translation>๊ฑฐ๋ž˜๋Ÿ‰ ๋ณต์‚ฌ</translation>
+ <translation>๊ฑฐ๋ž˜์•ก ๋ณต์‚ฌ</translation>
</message>
</context>
<context>
@@ -1469,11 +1853,11 @@
</message>
<message>
<source>Amount</source>
- <translation>๊ฑฐ๋ž˜๋Ÿ‰</translation>
+ <translation>๊ฑฐ๋ž˜์•ก</translation>
</message>
<message>
<source>Label</source>
- <translation>ํ‘œ</translation>
+ <translation>๋ผ๋ฒจ</translation>
</message>
<message>
<source>Message</source>
@@ -1481,7 +1865,7 @@
</message>
<message>
<source>Resulting URI too long, try to reduce the text for label / message.</source>
- <translation>URI ๊ฒฐ๊ณผ๊ฐ€ ๋„ˆ๋ฌด ๊ธธ์Œ, ํ‘œ/๋ฉ”์„ธ์ง€์˜ ๊ธ€์„ ์ค„์ด๋„๋ก ํ•˜์„ธ์š”.</translation>
+ <translation>URI ๊ฒฐ๊ณผ๊ฐ€ ๋„ˆ๋ฌด ๊ธธ์Œ, ๋ผ๋ฒจ/๋ฉ”์„ธ์ง€์˜ ๊ธ€์„ ์ค„์ด๋„๋ก ํ•˜์„ธ์š”.</translation>
</message>
<message>
<source>Error encoding URI into QR Code.</source>
@@ -1496,7 +1880,7 @@
</message>
<message>
<source>Label</source>
- <translation>ํ‘œ</translation>
+ <translation>๋ผ๋ฒจ</translation>
</message>
<message>
<source>Message</source>
@@ -1504,7 +1888,7 @@
</message>
<message>
<source>Amount</source>
- <translation>๊ฑฐ๋ž˜๋Ÿ‰</translation>
+ <translation>๊ฑฐ๋ž˜์•ก</translation>
</message>
<message>
<source>(no label)</source>
@@ -1516,7 +1900,7 @@
</message>
<message>
<source>(no amount)</source>
- <translation>(๊ฑฐ๋ž˜๋Ÿ‰ ์—†์Œ)</translation>
+ <translation>(๊ฑฐ๋ž˜์•ก ์—†์Œ)</translation>
</message>
</context>
<context>
@@ -1551,7 +1935,7 @@
</message>
<message>
<source>Amount:</source>
- <translation>๊ฑฐ๋ž˜๋Ÿ‰:</translation>
+ <translation>๊ฑฐ๋ž˜์•ก:</translation>
</message>
<message>
<source>Priority:</source>
@@ -1570,6 +1954,10 @@
<translation>์ฒด์ธ์ง€:</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>์ด ๊ธฐ๋Šฅ์ด ํ™œ์„ฑํ™”๋˜๋ฉด ๊ฑฐ์Šค๋ฆ„๋ˆ ์ฃผ์†Œ๊ฐ€ ๊ณต๋ž€์ด๊ฑฐ๋‚˜ ๋ฌดํšจ์ธ ๊ฒฝ์šฐ, ๊ฑฐ์Šค๋ฆ„๋ˆ์€ ์ƒˆ๋กญ๊ฒŒ ์ƒ์„ฑ๋œ ์ฃผ์†Œ๋กœ ์†ก๊ธˆ๋ฉ๋‹ˆ๋‹ค.</translation>
+ </message>
+ <message>
<source>Custom change address</source>
<translation>์ฃผ์†Œ๋ณ€๊ฒฝ</translation>
</message>
@@ -1578,16 +1966,76 @@
<translation>๊ฑฐ๋ž˜ ์ˆ˜์ˆ˜๋ฃŒ:</translation>
</message>
<message>
+ <source>Choose...</source>
+ <translation>์„ ํƒ ํ•˜๊ธฐ...</translation>
+ </message>
+ <message>
+ <source>collapse fee-settings</source>
+ <translation>์ˆ˜์ˆ˜๋ฃŒ ์„ค์ • ์ ‘๊ธฐ</translation>
+ </message>
+ <message>
+ <source>per kilobyte</source>
+ <translation>ํ‚ฌ๋กœ๋ฐ”์ดํŠธ ๋‹น</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>์‚ฌ์šฉ์ž ์ •์˜ ์ˆ˜์ˆ˜๋ฃŒ๊ฐ€ 1000์‚ฌํ† ์‹œ๋กœ ์ง€์ •๋œ ๊ฒฝ์šฐ ํŠธ๋žœ์žญ์…˜์˜ ํฌ๊ธฐ๊ฐ€ 250๋ฐ”์ดํŠธ ์ผ ๊ฒฝ์šฐ 1ํ‚ฌ๋กœ๋ฐ”์ดํŠธ๋‹น 250์‚ฌํ† ์‹œ๋งŒ ์ง€๋ถˆ๋˜์ง€๋งŒ "์ตœ์†Œ ์ˆ˜์ˆ˜๋ฃŒ"์—์„  1000์‚ฌํ† ์‹œ๊ฐ€ ์ง€๋ถˆ๋ฉ๋‹ˆ๋‹ค. 1ํ‚ฌ๋กœ๋ฐ”์ดํŠธ๊ฐ€ ๋„˜๋Š” ํŠธ๋žœ์žญ์…˜์ธ ๊ฒฝ์šฐ ์–ด๋– ํ•œ ๊ฒฝ์šฐ์—๋“  1ํ‚ฌ๋กœ๋ฐ”์ดํŠธ ๊ธฐ์ค€์œผ๋กœ ์ง€๋ถˆ๋ฉ๋‹ˆ๋‹ค.</translation>
+ </message>
+ <message>
+ <source>Hide</source>
+ <translation>์ˆจ๊ธฐ๊ธฐ</translation>
+ </message>
+ <message>
+ <source>total at least</source>
+ <translation>์ตœ์†Œ ์ˆ˜์ˆ˜๋ฃŒ</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>๋ธ”๋ก์˜ ์šฉ๋Ÿ‰๋ณด๋‹ค ํŠธ๋žœ์žญ์…˜์˜ ์šฉ๋Ÿ‰์ด ์ž‘์€ ๊ฒฝ์šฐ์—๋Š” ์ตœ์†Œํ•œ์˜ ์ˆ˜์ˆ˜๋ฃŒ๋งŒ์œผ๋กœ๋„ ์ถฉ๋ถ„ํ•ฉ๋‹ˆ๋‹ค. ๊ทธ๋Ÿฌ๋‚˜ ๋น„ํŠธ์ฝ”์ธ ๋„คํŠธ์›Œํฌ์˜ ์ฒ˜๋ฆฌ๋Ÿ‰๋ณด๋‹ค ๋” ๋งŽ์€ ํŠธ๋žœ์žญ์…˜ ์š”๊ตฌ๋Š” ์˜์›ํžˆ ๊ฒ€์ฆ์ด ์•ˆ ๋  ์ˆ˜๋„ ์žˆ์Šต๋‹ˆ๋‹ค.</translation>
+ </message>
+ <message>
+ <source>(read the tooltip)</source>
+ <translation>(ํˆดํŒ์„ ์ฝ์–ด๋ณด์„ธ์š”)</translation>
+ </message>
+ <message>
<source>Recommended:</source>
<translation>๊ถŒ์žฅ:</translation>
</message>
<message>
+ <source>Custom:</source>
+ <translation>์‚ฌ์šฉ์ž ์ •์˜:</translation>
+ </message>
+ <message>
+ <source>(Smart fee not initialized yet. This usually takes a few blocks...)</source>
+ <translation>(Smart fee๊ฐ€ ์•„์ง ์ดˆ๊ธฐํ™”๋˜์ง€ ์•Š์•˜์Šต๋‹ˆ๋‹ค. ๋ธ”๋ก ๋ถ„์„์ด ์™„๋ฃŒ๋  ๋•Œ ๊นŒ์ง€ ๊ธฐ๋‹ค๋ ค์ฃผ์‹ญ์‹œ์˜ค...)</translation>
+ </message>
+ <message>
+ <source>Confirmation time:</source>
+ <translation>์Šน์ธ ์‹œ๊ฐ„:</translation>
+ </message>
+ <message>
+ <source>normal</source>
+ <translation>์ผ๋ฐ˜</translation>
+ </message>
+ <message>
+ <source>fast</source>
+ <translation>๋น ๋ฆ„</translation>
+ </message>
+ <message>
+ <source>Send as zero-fee transaction if possible</source>
+ <translation>๊ฐ€๋Šฅํ•œ ๊ฒฝ์šฐ ์ˆ˜์ˆ˜๋ฃŒ ์—†์ด ๋ณด๋‚ด๊ธฐ</translation>
+ </message>
+ <message>
+ <source>(confirmation may take longer)</source>
+ <translation>(๊ฑฐ๋ž˜ ๊ฒ€์ฆ์ด ์˜ค๋ž˜ ๊ฑธ๋ฆด ์ˆ˜ ์žˆ์Šต๋‹ˆ๋‹ค)</translation>
+ </message>
+ <message>
<source>Send to multiple recipients at once</source>
<translation>๋‹ค์ˆ˜์˜ ์ˆ˜๋ น์ธ๋“ค์—๊ฒŒ ํ•œ๋ฒˆ์— ๋ณด๋‚ด๊ธฐ</translation>
</message>
<message>
<source>Add &amp;Recipient</source>
- <translation>์ˆ˜๋ น์ธ ์ถ”๊ฐ€ํ•˜๊ธฐ</translation>
+ <translation>์ˆ˜๋ น์ธ ์ถ”๊ฐ€ํ•˜๊ธฐ(&amp;R)</translation>
</message>
<message>
<source>Clear all fields of the form.</source>
@@ -1627,7 +2075,7 @@
</message>
<message>
<source>Copy amount</source>
- <translation>๊ฑฐ๋ž˜๋Ÿ‰ ๋ณต์‚ฌ</translation>
+ <translation>๊ฑฐ๋ž˜์•ก ๋ณต์‚ฌ</translation>
</message>
<message>
<source>Copy fee</source>
@@ -1646,6 +2094,14 @@
<translation>์šฐ์„ ๋„ ๋ณต์‚ฌ</translation>
</message>
<message>
+ <source>Copy change</source>
+ <translation>์ž”๋ˆ ๋ณต์‚ฌ</translation>
+ </message>
+ <message>
+ <source>Total Amount %1</source>
+ <translation>์ด ์•ก์ˆ˜ %1</translation>
+ </message>
+ <message>
<source>or</source>
<translation>๋˜๋Š”</translation>
</message>
@@ -1670,18 +2126,46 @@
<translation>๊ฑฐ๋ž˜๊ฐ€ ๊ฑฐ๋ถ€๋˜์—ˆ์Šต๋‹ˆ๋‹ค. ๋ช‡๋ช‡ ์ฝ”์ธ๋“ค์ด ์ง€๊ฐ‘์—์„œ ์ด๋ฏธ ์‚ฌ์šฉ๋œ ๊ฒฝ์šฐ, ์˜ˆ๋ฅผ ๋“ค์–ด ์ฝ”์ธ์„ ์ด๋ฏธ ์‚ฌ์šฉํ•œ wallet.dat๋ฅผ ๋ณต์‚ฌํ•ด์„œ ์‚ฌ์šฉํ•œ ๊ฒฝ์šฐ ์ง€๊ธˆ ์ง€๊ฐ‘์— ๊ธฐ๋ก์ด ์•ˆ๋˜์žˆ์–ด ์ด๋Ÿฐ ์ผ์ด ์ƒ๊ธธ ์ˆ˜ ์žˆ์Šต๋‹ˆ๋‹ค.</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>
+ <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>The recipient address is not valid. Please recheck.</source>
+ <translation>์ˆ˜๋ น์ธ ์ฃผ์†Œ๊ฐ€ ์ •ํ™•ํ•˜์ง€ ์•Š์Šต๋‹ˆ๋‹ค. ์žฌํ™•์ธ ๋ฐ”๋ž๋‹ˆ๋‹ค</translation>
+ </message>
+ <message>
+ <source>Duplicate address found: addresses should only be used once each.</source>
+ <translation>๋‘๊ฐœ ์ด์ƒ์˜ ์ฃผ์†Œ์ž…๋‹ˆ๋‹ค: ํ•œ๋ฒˆ์— ํ•˜๋‚˜์˜ ์ฃผ์†Œ์—๋งŒ ์ž‘์—…ํ•  ์ˆ˜ ์žˆ์Šต๋‹ˆ๋‹ค.</translation>
+ </message>
+ <message>
<source>Warning: Invalid Bitcoin address</source>
<translation>๊ฒฝ๊ณ : ์ž˜๋ชป๋œ ๋น„ํŠธ์ฝ”์ธ์ฃผ์†Œ์ž…๋‹ˆ๋‹ค</translation>
</message>
<message>
<source>(no label)</source>
- <translation>(ํ‘œ ์—†์Œ)</translation>
+ <translation>(๋ผ๋ฒจ ์—†์Œ)</translation>
</message>
<message>
<source>Warning: Unknown change address</source>
<translation>๊ฒฝ๊ณ : ์•Œ๋ ค์ง€์ง€ ์•Š์€ ์ฃผ์†Œ๋ณ€๊ฒฝ์ž…๋‹ˆ๋‹ค</translation>
</message>
<message>
+ <source>Copy dust</source>
+ <translation>๋”์ŠคํŠธ ๋ณต์‚ฌ</translation>
+ </message>
+ <message>
<source>Are you sure you want to send?</source>
<translation>์ •๋ง๋กœ ๋ณด๋‚ด์‹œ๊ฒ ์Šต๋‹ˆ๊นŒ?</translation>
</message>
@@ -1694,19 +2178,19 @@
<name>SendCoinsEntry</name>
<message>
<source>A&amp;mount:</source>
- <translation>๊ธˆ์•ก:</translation>
+ <translation>๊ธˆ์•ก(&amp;M):</translation>
</message>
<message>
<source>Pay &amp;To:</source>
- <translation>์ง€๊ธ‰&amp;์ˆ˜์‹ :</translation>
+ <translation>์†ก๊ธˆํ•  ๋Œ€์ƒ(&amp;T) : </translation>
</message>
<message>
<source>Enter a label for this address to add it to your address book</source>
- <translation>๋‹น์‹ ์˜ ์ฃผ์†Œ๋ก์— ์ด ์ฃผ์†Œ๋ฅผ ์ถ”๊ฐ€ํ•˜๊ธฐ ์œ„ํ•˜์—ฌ ํ‘œ๋ฅผ ์ž…์—ญํ•˜์„ธ์š” </translation>
+ <translation>์ฃผ์†Œ๋ก์— ์ถ”๊ฐ€ํ•˜๋ ค๋ฉด ๋ผ๋ฒจ์„ ์ž…๋ ฅํ•˜์„ธ์š”</translation>
</message>
<message>
<source>&amp;Label:</source>
- <translation>ํ‘œ:</translation>
+ <translation>๋ผ๋ฒจ(&amp;L)</translation>
</message>
<message>
<source>Choose previously used address</source>
@@ -1714,7 +2198,11 @@
</message>
<message>
<source>This is a normal payment.</source>
- <translation>ํ‰๊ท ์ง€๊ธ‰์ž…๋‹ˆ๋‹ค</translation>
+ <translation>์ด๊ฒƒ์€ ์ •์ƒ์ ์ธ ์ง€๋ถˆ์ž…๋‹ˆ๋‹ค.</translation>
+ </message>
+ <message>
+ <source>The Bitcoin address to send the payment to</source>
+ <translation>์ด ๋น„ํŠธ์ฝ”์ธ ์ฃผ์†Œ๋กœ ์†ก๊ธˆ๋ฉ๋‹ˆ๋‹ค</translation>
</message>
<message>
<source>Alt+A</source>
@@ -1722,7 +2210,7 @@
</message>
<message>
<source>Paste address from clipboard</source>
- <translation>ํด๋ฆฝ๋ณด๋“œ๋กœ ๋ถ€ํ„ฐ ์ฃผ์†Œ๋ฅผ ๋ถ™์ด์„ธ์š”</translation>
+ <translation>ํด๋ฆฝ๋ณด๋“œ๋กœ ๋ถ€ํ„ฐ ์ฃผ์†Œ ๋ถ™์—ฌ๋„ฃ๊ธฐ</translation>
</message>
<message>
<source>Alt+P</source>
@@ -1730,15 +2218,31 @@
</message>
<message>
<source>Remove this entry</source>
- <translation>ํ•ญ๋ชฉ์„ ์ง€์šฐ์‹œ์˜ค</translation>
+ <translation>ํ•ญ๋ชฉ์„ ์ง€์›๋‹ˆ๋‹ค</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>์ˆ˜์ˆ˜๋ฃŒ๊ฐ€ ์†ก๊ธˆ๋˜๋Š” ๊ธˆ์•ก์—์„œ ๊ณต์ œ๋ฉ๋‹ˆ๋‹ค. ์ˆ˜๋ น์ž๋Š” ๊ธˆ์•ก ํ•„๋“œ์—์„œ ์ž…๋ ฅํ•œ ๊ธˆ์•ก๋ณด๋‹ค ์ ์€ ๊ธˆ์•ก์„ ์ „์†ก๋ฐ›๊ฒŒ ๋ฉ๋‹ˆ๋‹ค. ๋ฐ›๋Š” ์‚ฌ๋žŒ์ด ์—ฌ๋Ÿฌ ๋ช…์ธ ๊ฒฝ์šฐ ์ˆ˜์ˆ˜๋ฃŒ๋Š” ๊ท ๋“ฑํ•˜๊ฒŒ ๋‚˜๋ˆ„์–ด์ง‘๋‹ˆ๋‹ค.</translation>
+ </message>
+ <message>
+ <source>S&amp;ubtract fee from amount</source>
+ <translation>์†ก๊ธˆ์•ก์—์„œ ์ˆ˜์ˆ˜๋ฃŒ ๊ณต์ œ(&amp;U)</translation>
</message>
<message>
<source>Message:</source>
<translation>๋ฉ”์‹œ์ง€:</translation>
</message>
<message>
+ <source>This is an unauthenticated payment request.</source>
+ <translation>์ธ์ฆ ๋˜์ง€ ์•Š์€ ์ง€๊ธ‰ ์š”์ฒญ์ž…๋‹ˆ๋‹ค.</translation>
+ </message>
+ <message>
+ <source>This is an authenticated payment request.</source>
+ <translation>์ธ์ฆ ๋œ ์ง€๊ธ‰ ์š”์ฒญ ์ž…๋‹ˆ๋‹ค.</translation>
+ </message>
+ <message>
<source>Enter a label for this address to add it to the list of used addresses</source>
- <translation>์‚ฌ์šฉ๋œ ์ฃผ์†Œ ๋ชฉ๋ก์— ์ƒˆ ์ฃผ์†Œ๋ฅผ ์ถ”๊ฐ€ํ•˜๊ธฐ ์œ„ํ•ด ์ œ๋ชฉ์„ ์ž…๋ ฅํ•ฉ๋‹ˆ๋‹ค. </translation>
+ <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>
@@ -1757,7 +2261,7 @@
<name>ShutdownWindow</name>
<message>
<source>Bitcoin Core is shutting down...</source>
- <translation>๋น„ํŠธ์ฝ”์ธ์ฝ”์–ด๊ฐ€ ๋‹ซ์•„์ง€๊ณ  ์žˆ์Šต๋‹ˆ๋‹ค</translation>
+ <translation>Bitcoin Core์ด ์ข…๋ฃŒ ์ค‘์ž…๋‹ˆ๋‹ค...</translation>
</message>
<message>
<source>Do not shut down the computer until this window disappears.</source>
@@ -1775,6 +2279,14 @@
<translation>๋ฉ”์‹œ์ง€ ์„œ๋ช…(&amp;S)</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>์—ฌ๋Ÿฌ๋ถ„ ์ž์‹ ์„ ์ฆ๋ช…ํ•˜๊ธฐ ์œ„ํ•ด ์ฃผ์†Œ๋ฅผ ์ฒจ๊ฐ€ํ•˜๊ณ  ์„œ๋ช…ํ•  ์ˆ˜ ์žˆ์Šต๋‹ˆ๋‹ค. ํ”ผ์‹ฑ ๊ณต๊ฒฉ์œผ๋กœ ๋ง๋ฏธ์•”์•„ ์—ฌ๋Ÿฌ๋ถ„์˜ ์„œ๋ช…์„ ํ†ตํ•ด ์†์•„ ๋„˜์–ด๊ฐ€๊ฒŒ ํ•  ์ˆ˜ ์žˆ์œผ๋ฏ€๋กœ, ์„œ๋ช…ํ•˜์ง€ ์•Š์€ ๋ชจ๋“  ๋ชจํ˜ธํ•œ ์š”์†Œ๋ฅผ ์ฃผ์˜ํ•˜์‹ญ์‹œ์˜ค. ์กฐํ•ญ๋“ค์ด ์™„์ „ ๋ฌด๊ฒฐํ•œ์ง€ ํ™•์ธ ํ›„ ๋™์˜ํ•˜๋Š” ๊ฒฝ์šฐ์—๋งŒ ์„œ๋ช…ํ•˜์‹ญ์‹œ์˜ค.</translation>
+ </message>
+ <message>
+ <source>The Bitcoin address to sign the message with</source>
+ <translation>๋ฉ”์„ธ์ง€๋ฅผ ์„œ๋ช…ํ•œ ๋น„ํŠธ์ฝ”์ธ ์ฃผ์†Œ</translation>
+ </message>
+ <message>
<source>Choose previously used address</source>
<translation>์ด์ „์— ์‚ฌ์šฉํ•œ ์ฃผ์†Œ๋ฅผ ์„ ํƒํ•˜์‹ญ์‹œ์˜ค</translation>
</message>
@@ -1784,7 +2296,7 @@
</message>
<message>
<source>Paste address from clipboard</source>
- <translation>ํด๋ฆฝ๋ณด๋“œ๋กœ ๋ถ€ํ„ฐ ์ฃผ์†Œ๋ฅผ ๋ถ™์ด์„ธ์š”</translation>
+ <translation>ํด๋ฆฝ๋ณด๋“œ๋กœ ๋ถ€ํ„ฐ ์ฃผ์†Œ๋ฅผ ๋ณต์‚ฌํ•˜๊ธฐ</translation>
</message>
<message>
<source>Alt+P</source>
@@ -1823,6 +2335,14 @@
<translation>๋ฉ”์‹œ์ง€ ๊ฒ€์ฆ(&amp;V)</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>๋ฉ”์‹œ์ง€๋ฅผ ๊ฒ€์ฆํ•˜๊ธฐ ์œ„ํ•ด ์•„๋ž˜ ์นธ์— ๊ฐ๊ฐ ์ง€๊ฐ‘ ์ฃผ์†Œ์™€ ๋ฉ”์‹œ์ง€, ์ „์ž์„œ๋ช…์„ ์ž…๋ ฅํ•˜์„ธ์š”. (๋ฉ”์‹œ์ง€ ์›๋ณธ์˜ ๋„์–ด์“ฐ๊ธฐ, ๋“ค์—ฌ์“ฐ๊ธฐ, ํ–‰ ๋‚˜๋ˆ” ๋“ฑ์ด ์ •ํ™•ํ•˜๊ฒŒ ์ž…๋ ฅ๋˜์–ด์•ผ ํ•˜๋ฏ€๋กœ ์›๋ณธ์„ ๋ณต์‚ฌํ•ด์„œ ์ž…๋ ฅํ•˜์„ธ์š”) ์ด ๊ธฐ๋Šฅ์€ ๋ฉ”์‹œ์ง€ ๊ฒ€์ฆ์ด ์ฃผ ๋ชฉ์ ์ด๋ฉฐ, ๋„คํŠธ์›Œํฌ ์นจ์ž…์ž์— ์˜ํ•ด ๋ณ€์กฐ๋˜์ง€ ์•Š๋„๋ก ์ „์ž์„œ๋ช… ํ•ด๋…์— ๋ถˆํ•„์š”ํ•œ ์‹œ๊ฐ„์„ ์†Œ๋ชจํ•˜์ง€ ๋งˆ์„ธ์š”. </translation>
+ </message>
+ <message>
+ <source>The Bitcoin address the message was signed with</source>
+ <translation>๋ฉ”์„ธ์ง€์˜ ์„œ๋ช…์— ์‚ฌ์šฉ๋œ ๋น„ํŠธ์ฝ”์ธ ์ฃผ์†Œ</translation>
+ </message>
+ <message>
<source>Verify the message to ensure it was signed with the specified Bitcoin address</source>
<translation>์ •ํ™•ํ•œ ๋น„ํŠธ์ฝ”์ธ์ฃผ์†Œ๊ฐ€ ์ž…๋ ฅ๋ฌ๋Š”์ง€ ๋ฉ”์‹œ์ง€๋ฅผ ํ™•์ธํ•˜์‹œ์˜ค</translation>
</message>
@@ -1935,6 +2455,10 @@
<source>Status</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>
@@ -1960,6 +2484,10 @@
<translation>์ž์‹ ์˜ ์ฃผ์†Œ</translation>
</message>
<message>
+ <source>watch-only</source>
+ <translation>๋ชจ๋‹ˆํ„ฐ๋ง ์ง€๊ฐ‘</translation>
+ </message>
+ <message>
<source>label</source>
<translation>๋ผ๋ฒจ</translation>
</message>
@@ -1967,6 +2495,10 @@
<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>
@@ -1976,12 +2508,20 @@
<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>
+ <translation>์ด ๊ฑฐ๋ž˜์•ก</translation>
</message>
<message>
<source>Message</source>
@@ -2017,7 +2557,7 @@
</message>
<message>
<source>Amount</source>
- <translation>๊ฑฐ๋ž˜๋Ÿ‰</translation>
+ <translation>๊ฑฐ๋ž˜์•ก</translation>
</message>
<message>
<source>true</source>
@@ -2031,6 +2571,10 @@
<source>, has not been successfully broadcast yet</source>
<translation>. ์•„์ง ์„ฑ๊ณต์ ์œผ๋กœ ํ†ต๋ณดํ•˜์ง€ ์•Š์Œ</translation>
</message>
+ <message numerus="yes">
+ <source>Open for %n more block(s)</source>
+ <translation><numerusform>%n ๊ฐœ์˜ ์ถ”๊ฐ€ ๋ธ”๋ก์„ ์ฝ์Šต๋‹ˆ๋‹ค.</numerusform></translation>
+ </message>
<message>
<source>unknown</source>
<translation>์•Œ์ˆ˜์—†์Œ</translation>
@@ -2061,13 +2605,17 @@
<source>Immature (%1 confirmations, will be available after %2)</source>
<translation>์ถฉ๋ถ„ํžˆ ์ˆ™์„ฑ๋˜์ง€ ์•Š์€ ์ƒํƒœ (%1 ์Šน์ธ, %2 ํ›„์— ์‚ฌ์šฉ ๊ฐ€๋Šฅํ•ฉ๋‹ˆ๋‹ค)</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>Confirmed (%1 confirmations)</source>
- <translation>ํ™•์ธ๋จ(%1 ํ™•์ธ๋จ)</translation>
+ <translation>ํ™•์ธ๋จ (%1 ํ™•์ธ๋จ)</translation>
</message>
<message>
<source>This block was not received by any other nodes and will probably not be accepted!</source>
@@ -2083,7 +2631,7 @@
</message>
<message>
<source>Label</source>
- <translation>ํ‘œ</translation>
+ <translation>๋ผ๋ฒจ</translation>
</message>
<message>
<source>Unconfirmed</source>
@@ -2118,12 +2666,16 @@
<translation>์ฑ„๊ตด</translation>
</message>
<message>
+ <source>watch-only</source>
+ <translation>๋ชจ๋‹ˆํ„ฐ๋ง ์ง€๊ฐ‘</translation>
+ </message>
+ <message>
<source>(n/a)</source>
<translation>(์—†์Œ)</translation>
</message>
<message>
<source>Transaction status. Hover over this field to show number of confirmations.</source>
- <translation>๊ฑฐ๋ž˜์ƒํ™ฉ. ๋งˆ์šฐ์Šค๋ฅผ ์˜ฌ๋ฆฌ๋ฉด ์Šน์ธํšŸ์ˆ˜๊ฐ€ ํ‘œ์‹œ๋ฉ๋‹ˆ๋‹ค.</translation>
+ <translation>๊ฑฐ๋ž˜์ƒํ™ฉ. ๋งˆ์šฐ์Šค๋ฅผ ์˜ฌ๋ฆฌ๋ฉด ๊ฒ€์ฆํšŸ์ˆ˜๊ฐ€ ํ‘œ์‹œ๋ฉ๋‹ˆ๋‹ค.</translation>
</message>
<message>
<source>Date and time that the transaction was received.</source>
@@ -2134,6 +2686,14 @@
<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>ํŠธ๋žœ์žญ์…˜์— ๋Œ€ํ•œ ์‚ฌ์šฉ์ž ์ •์˜ intent/purpose</translation>
+ </message>
+ <message>
<source>Amount removed from or added to balance.</source>
<translation>๋ณ€๊ฒฝ๋œ ์ž”๊ณ .</translation>
</message>
@@ -2194,7 +2754,7 @@
</message>
<message>
<source>Min amount</source>
- <translation>์ตœ์†Œ ๊ฑฐ๋ž˜๋Ÿ‰</translation>
+ <translation>์ตœ์†Œ ๊ฑฐ๋ž˜์•ก</translation>
</message>
<message>
<source>Copy address</source>
@@ -2202,19 +2762,23 @@
</message>
<message>
<source>Copy label</source>
- <translation>ํ‘œ ๋ณต์‚ฌํ•˜๊ธฐ</translation>
+ <translation>๋ผ๋ฒจ ๋ณต์‚ฌํ•˜๊ธฐ</translation>
</message>
<message>
<source>Copy amount</source>
- <translation>๊ฑฐ๋ž˜๋Ÿ‰ ๋ณต์‚ฌ</translation>
+ <translation>๊ฑฐ๋ž˜์•ก ๋ณต์‚ฌ</translation>
</message>
<message>
<source>Copy transaction ID</source>
<translation>๊ฑฐ๋ž˜ ์•„์ด๋”” ๋ณต์‚ฌ</translation>
</message>
<message>
+ <source>Copy raw transaction</source>
+ <translation>๋กœ์šฐ ํŠธ๋žœ์žญ์…˜ ๋ณต์‚ฌ</translation>
+ </message>
+ <message>
<source>Edit label</source>
- <translation>ํ‘œ ์ˆ˜์ •ํ•˜๊ธฐ</translation>
+ <translation>๋ผ๋ฒจ ์ˆ˜์ •ํ•˜๊ธฐ</translation>
</message>
<message>
<source>Show transaction details</source>
@@ -2234,7 +2798,7 @@
</message>
<message>
<source>There was an error trying to save the transaction history to %1.</source>
- <translation>%1์œผ๋กœ ๊ฑฐ๋ž˜ ๊ธฐ๋ก์„ ์ €์žฅํ•˜๋Š”๋ฐ ์• ๋Ÿฌ๊ฐ€ ์žˆ์—ˆ์Šต๋‹ˆ๋‹ค.</translation>
+ <translation>%1์œผ๋กœ ๊ฑฐ๋ž˜ ๊ธฐ๋ก์„ ์ €์žฅํ•˜๋Š”๋ฐ ์˜ค๋ฅ˜๊ฐ€ ์žˆ์—ˆ์Šต๋‹ˆ๋‹ค.</translation>
</message>
<message>
<source>Exporting Successful</source>
@@ -2262,7 +2826,7 @@
</message>
<message>
<source>Label</source>
- <translation>ํ‘œ</translation>
+ <translation>๋ผ๋ฒจ</translation>
</message>
<message>
<source>Address</source>
@@ -2283,7 +2847,11 @@
</context>
<context>
<name>UnitDisplayStatusBarControl</name>
- </context>
+ <message>
+ <source>Unit to show amounts in. Click to select another unit.</source>
+ <translation>๊ฑฐ๋ž˜์•ก์„ ํ‘œ์‹œํ•˜๋Š” ๋‹จ์œ„. ํด๋ฆญํ•ด์„œ ๋‹ค๋ฅธ ๋‹จ์œ„๋ฅผ ์„ ํƒํ•  ์ˆ˜ ์žˆ์Šต๋‹ˆ๋‹ค.</translation>
+ </message>
+</context>
<context>
<name>WalletFrame</name>
<message>
@@ -2302,7 +2870,7 @@
<name>WalletView</name>
<message>
<source>&amp;Export</source>
- <translation>&amp;๋‚ด๋ณด๋‚ด๊ธฐ</translation>
+ <translation>๋‚ด๋ณด๋‚ด๊ธฐ(&amp;E)</translation>
</message>
<message>
<source>Export the data in the current tab to a file</source>
@@ -2356,30 +2924,130 @@
<translation>๋ช…๋ น์ค„๊ณผ JSON-RPC ๋ช…๋ น ์ˆ˜๋ฝ</translation>
</message>
<message>
+ <source>If &lt;category&gt; is not supplied or if &lt;category&gt; = 1, output all debugging information.</source>
+ <translation>&lt;category&gt;๊ฐ€ ์ œ๊ณต๋˜์ง€ ์•Š๊ฑฐ๋‚˜ &lt;category&gt; = 1 ์ธ ๊ฒฝ์šฐ, ๋ชจ๋“  ๋””๋ฒ„๊น… ์ •๋ณด๋ฅผ ์ถœ๋ ฅ</translation>
+ </message>
+ <message>
+ <source>Maximum total fees (in %s) to use in a single wallet 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 Bitcoin Core will not work properly.</source>
+ <translation>์ปดํ“จํ„ฐ์˜ ๋‚ ์งœ์™€ ์‹œ๊ฐ„์ด ์˜ฌ๋ฐ”๋ฅธ์ง€ ํ™•์ธํ•˜์‹ญ์‹œ์˜ค! ์‹œ๊ฐ„์ด ์ž˜๋ชป๋˜๋ฉด ๋น„ํŠธ์ฝ”์ธ์€ ์ œ๋Œ€๋กœ ๋™์ž‘ํ•˜์ง€ ์•Š์Šต๋‹ˆ๋‹ค.</translation>
+ </message>
+ <message>
+ <source>Prune configured below the minimum of %d MiB. Please use a higher number.</source>
+ <translation>๋ธ”๋ก ์ถ•์†Œ๊ฐ€ ์ตœ์†Œ์น˜์˜ %d MiB ๋ฐ‘์œผ๋กœ ์„ค์ •๋˜์–ด ์žˆ์Šต๋‹ˆ๋‹ค. ๋” ๋†’์€ ๊ฐ’์„ ์‚ฌ์šฉํ•ด ๋ณด์„ธ์š”.</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>๋ธ”๋ก ์ถ•์†Œ: ๋งˆ์ง€๋ง‰ ์ง€๊ฐ‘ ๋™๊ธฐํ™” ์ง€์ ์ด ์ถ•์†Œ๋œ ๋ฐ์ดํ„ฐ๋ณด๋‹ค ๊ณผ๊ฑฐ์˜ ๊ฒƒ ์ž…๋‹ˆ๋‹ค. -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, &gt;%u = target size in MiB to use for block files)</source>
+ <translation>์˜ค๋ž˜๋œ ๋ธ”๋ก์„ ์ œ๊ฑฐ(์ถ•์†Œ)ํ•˜์—ฌ ๋””์Šคํฌ ์šฉ๋Ÿ‰์„ ์ค„์ž…๋‹ˆ๋‹ค. ์ด ๋ชจ๋“œ๋Š” -txindex ์™€ -rescan ๊ณผ ํ˜ธํ™˜๋˜์ง€ ์•Š์Šต๋‹ˆ๋‹ค. ๊ฒฝ๊ณ : ์ด ๋ชจ๋“œ๋ฅผ ์ทจ์†Œํ•˜๋ฉด ๋ชจ๋“  ๋ธ”๋ก์ฒด์ธ์„ ๋‹ค์‹œ ๋‹ค์šด๋กœ๋“œ ๋ฐ›์•„์•ผ ํ•ฉ๋‹ˆ๋‹ค. (๊ธฐ๋ณธ๊ฐ’:0 = ๋ธ”๋ก ์ถ•์†Œ ๋น„ํ™œ์„ฑํ™”, &gt;%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>
+ <message>
+ <source>Error: A fatal internal error occurred, see debug.log for details</source>
+ <translation>์—๋Ÿฌ: ์น˜๋ช…์ ์ธ ๋‚ด๋ถ€ ์˜ค๋ฅ˜๊ฐ€ ๋ฐœ์ƒํ–ˆ์Šต๋‹ˆ๋‹ค, ์ž์„ธํ•œ ๋‚ด์šฉ์€ debug.log ๋ฅผ ํ™•์ธํ•ด์ฃผ์„ธ์š”.</translation>
+ </message>
+ <message>
+ <source>Fee (in %s/kB) to add to transactions you send (default: %s)</source>
+ <translation>์†ก๊ธˆ ๊ฑฐ๋ž˜์‹œ ์ถ”๊ฐ€๋˜๋Š” ์ˆ˜์ˆ˜๋ฃŒ (%s/kB) (๊ธฐ๋ณธ๊ฐ’: %s)</translation>
+ </message>
+ <message>
+ <source>Pruning blockstore...</source>
+ <translation>๋ธ”๋ก ๋ฐ์ดํ„ฐ๋ฅผ ์ถ•์†Œ ์ค‘์ž…๋‹ˆ๋‹ค..</translation>
+ </message>
+ <message>
<source>Run in the background as a daemon and accept commands</source>
<translation>๋ฐ๋ชฌ์œผ๋กœ ๋ฐฑ๊ทธ๋ผ์šด๋“œ์—์„œ ์‹คํ–‰ํ•˜๊ณ  ๋ช…๋ น์„ ํ—ˆ์šฉ</translation>
</message>
<message>
+ <source>Unable to start HTTP server. See debug log for details.</source>
+ <translation>HTTP ์„œ๋ฒ„๋ฅผ ์‹œ์ž‘ํ•  ์ˆ˜ ์—†์Šต๋‹ˆ๋‹ค. ์ž์„ธํ•œ ์‚ฌํ•ญ์€ ๋””๋ฒ„๊ทธ ๋กœ๊ทธ๋ฅผ ํ™•์ธ ํ•˜์„ธ์š”.</translation>
+ </message>
+ <message>
<source>Accept connections from outside (default: 1 if no -proxy or -connect)</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>
+ </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>
+ <message>
+ <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>
<translation>์„ ํƒ๋œ ์ฃผ์†Œ๋กœ ๊ณ ์ •ํ•˜๋ฉฐ ํ•ญ์ƒ ๋ฆฌ์Šจ(Listen)ํ•ฉ๋‹ˆ๋‹ค. IPv6 ํ”„๋กœํ† ์ฝœ์ธ ๊ฒฝ์šฐ [host]:port ๋ฐฉ์‹์˜ ๋ช…๋ น์–ด ํ‘œ๊ธฐ๋ฒ•์„ ์‚ฌ์šฉํ•ฉ๋‹ˆ๋‹ค.</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 &lt;http://www.opensource.org/licenses/mit-license.php&gt;.</source>
+ <translation>MIT ์†Œํ”„ํŠธ์›จ์–ด ๋ผ์ด์„ผ์Šค์— ๋”ฐ๋ผ ๋ฐฐํฌ๋ฉ๋‹ˆ๋‹ค. ๋™๋ด‰๋œ ํŒŒ์ผ ํ˜น์€ &lt;http://www.opensource.org/licenses/mit-license.php&gt;๋ฅผ ์ฐธ์กฐํ•˜์„ธ์š”.</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>
+ </message>
+ <message>
+ <source>Set the number of script verification threads (%u to %d, 0 = auto, &lt;0 = leave that many cores free, default: %d)</source>
+ <translation>์Šคํฌ๋ฆฝํŠธ ์ธ์ฆ ์Šค๋ ˆ๋“œ์˜ ๊ฐฏ์ˆ˜ ์„ค์ • (%u-%d, 0 = ์ž๋™, &lt;0 = ์ง€์ •๋œ ์ฝ”์–ด ๊ฐœ์ˆ˜๋งŒํผ ์‚ฌ์šฉ ์•ˆํ•จ, ๊ธฐ๋ณธ๊ฐ’: %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>๋ธ”๋ก ๋ฐ์ดํ„ฐ๋ฒ ์ด์Šค์— ๋ฏธ๋ž˜์˜ ๋ธ”๋ก์ด ํฌํ•จ๋˜์–ด ์žˆ์Šต๋‹ˆ๋‹ค. ์ด๊ฒƒ์€ ์‚ฌ์šฉ์ž์˜ ์ปดํ“จํ„ฐ์˜ ๋‚ ์งœ์™€ ์‹œ๊ฐ„์ด ์˜ฌ๋ฐ”๋ฅด๊ฒŒ ์„ค์ •๋˜์–ด ์žˆ์ง€ ์•Š์„๋•Œ ๋‚˜ํƒ€๋‚  ์ˆ˜ ์žˆ์Šต๋‹ˆ๋‹ค. ๋งŒ์•ฝ ์‚ฌ์šฉ์ž์˜ ์ปดํ“จํ„ฐ์˜ ๋‚ ์งœ์™€ ์‹œ๊ฐ„์ด ์˜ฌ๋ฐ”๋ฅด๋‹ค๊ณ  ํ™•์‹ ํ•  ๋•Œ์—๋งŒ ๋ธ”๋ก ๋ฐ์ดํ„ฐ ๋ฒ ์ด์Šค์˜ ์žฌ๊ตฌ์„ฑ์„ ํ•˜์‹ญ์‹œ์˜ค</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>Unable to bind to %s on this computer. Bitcoin Core is probably already running.</source>
+ <translation>์ด ์ปดํ“จํ„ฐ์˜ %s์— ๋ฐ”์ธ๋”ฉ ํ•  ์ˆ˜ ์—†์Šต๋‹ˆ๋‹ค. ์•„๋งˆ๋„ ๋น„ํŠธ์ฝ”์ธ์ด ์‹คํ–‰์ค‘์ธ ๊ฒƒ ๊ฐ™์Šต๋‹ˆ๋‹ค.</translation>
+ </message>
+ <message>
+ <source>Unsupported argument -whitelistalwaysrelay ignored, use -whitelistrelay and/or -whitelistforcerelay.</source>
+ <translation>์ง€์›ํ•˜์ง€ ์•Š๋Š” ์ธ์ˆ˜ -whitelistalwaysrelay ๋Š” ๋ฌด์‹œ๋ฉ๋‹ˆ๋‹ค, -whitelistrelay ๋‚˜ -whitelistforcerelay ๋ฅผ ์‚ฌ์šฉํ•ด ์ฃผ์„ธ์š”.</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: abnormally high number of blocks generated, %d blocks received in the last %d hours (%d expected)</source>
+ <translation>๊ฒฝ๊ณ : ๋น„์ •์ƒ์ ์œผ๋กœ ๋งŽ์€ ๋ธ”๋ก์ด ์ƒ์„ฑ๋˜๊ณ  ์žˆ์Šต๋‹ˆ๋‹ค. %d ๋ธ”๋ก์€ ๋งˆ์ง€๋ง‰ %d์— ์ˆ˜์‹ ๋˜์—ˆ์Šต๋‹ˆ๋‹ค (%d ์˜ˆ์ธก๋จ)</translation>
+ </message>
+ <message>
+ <source>WARNING: check your network connection, %d blocks received in the last %d hours (%d expected)</source>
+ <translation>๊ฒฝ๊ณ : ๋„คํŠธ์›Œํฌ ์—ฐ๊ฒฐ์„ ํ™•์ธํ•ด ์ฃผ์„ธ์š”. %d ๋ธ”๋ก์€ ๋งˆ์ง€๋ง‰ %d์— ์ˆ˜์‹ ๋˜์—ˆ์Šต๋‹ˆ๋‹ค (%d ์˜ˆ์ธก๋จ)</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: Unknown block versions being mined! It's possible unknown rules are in effect</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>
@@ -2388,6 +3056,22 @@
<translation>๊ฒฝ๊ณ  : wallet.dat๊ฐ€ ์†์ƒ๋˜์–ด ๋ฐ์ดํ„ฐ๊ฐ€ ๋ณต๊ตฌ๋˜์—ˆ์Šต๋‹ˆ๋‹ค. ์›๋ž˜์˜ wallet.dat ํŒŒ์ผ์€ %s ํ›„์— wallet.{timestamp}.bak ์ด๋ฆ„์œผ๋กœ ์ €์žฅ๋ฉ๋‹ˆ๋‹ค. ์ž”์•ก๊ณผ ๊ฑฐ๋ž˜ ๋‚ด์—ญ์ด ์ •ํ™•ํ•˜์ง€ ์•Š๋‹ค๋ฉด ๋ฐฑ์—… ํŒŒ์ผ๋กœ ๋ถ€ํ„ฐ ๋ณต์›ํ•ด์•ผ ํ•ฉ๋‹ˆ๋‹ค. </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>
+ <message>
+ <source>&lt;category&gt; can be:</source>
+ <translation>&lt;category&gt; ์ง€์ • ๊ฐ€๋Šฅ:</translation>
+ </message>
+ <message>
+ <source>Append comment to the user agent string</source>
+ <translation>์‚ฌ์šฉ์ž ์—์ด์ „ํŠธ ๋ฌธ์ž์—ด์— ์ฝ”๋ฉ˜ํŠธ ์ฒจ๋ถ€</translation>
+ </message>
+ <message>
<source>Block creation options:</source>
<translation>๋ธ”๋ก ์ƒ์„ฑ ์˜ต์…˜:</translation>
</message>
@@ -2416,6 +3100,26 @@
<translation>๋ธ”๋ฝ ๋ฐ์ดํ„ฐ๋ฒ ์ด์Šค๋ฅผ ๋‹ค์‹œ ์ƒ์„ฑํ•˜์‹œ๊ฒ ์Šต๋‹ˆ๊นŒ?</translation>
</message>
<message>
+ <source>Enable publish hash block in &lt;address&gt;</source>
+ <translation>&lt;address&gt;์— ๋Œ€ํ•œ ํ•ด์‹œ ๋ธ”๋ก ๊ณต๊ฐœ ํ™œ์„ฑํ™”</translation>
+ </message>
+ <message>
+ <source>Enable publish hash transaction in &lt;address&gt;</source>
+ <translation>&lt;address&gt;์— ๋Œ€ํ•œ ํ•ด์‹œ ํŠธ๋ž™์žญ์…˜ ๊ณต๊ฐœ ํ™œ์„ฑํ™”</translation>
+ </message>
+ <message>
+ <source>Enable publish raw block in &lt;address&gt;</source>
+ <translation>&lt;address&gt;์— ๋Œ€ํ•œ ๋กœ์šฐ ๋ธ”๋ก ๊ณต๊ฐœ ํ™œ์„ฑํ™”</translation>
+ </message>
+ <message>
+ <source>Enable publish raw transaction in &lt;address&gt;</source>
+ <translation>&lt;address&gt;์— ๋Œ€ํ•œ ๋กœ์šฐ ํŠธ๋žœ์žญ์…˜ ๊ณต๊ฐœ ํ™œ์„ฑํ™”</translation>
+ </message>
+ <message>
+ <source>Enable transaction replacement in the memory pool (default: %u)</source>
+ <translation>๋ฉ”๋ชจ๋ฆฌ ํ’€(pool) ๋‚ด์˜ ํŠธ๋žœ์žญ์…˜ ์น˜ํ™˜(replacement) ํ™œ์„ฑํ™” (๊ธฐ๋ณธ๊ฐ’: %u)</translation>
+ </message>
+ <message>
<source>Error initializing block database</source>
<translation>๋ธ”๋ก ๋ฐ์ดํ„ฐ๋ฒ ์ด์Šค๋ฅผ ์ดˆ๊ธฐํ™”ํ•˜๋Š”๋ฐ ์˜ค๋ฅ˜</translation>
</message>
@@ -2452,10 +3156,42 @@
<translation>์ž˜๋ชป๋œ -onion ์ฃผ์†Œ์ž…๋‹ˆ๋‹ค: '%s'</translation>
</message>
<message>
+ <source>Invalid amount for -fallbackfee=&lt;amount&gt;: '%s'</source>
+ <translation>์œ ํšจํ•˜์ง€ ์•Š์€ ๊ธˆ์•ก -fallbackfee=&lt;amount&gt;: '%s'</translation>
+ </message>
+ <message>
+ <source>Keep the transaction memory pool below &lt;n&gt; megabytes (default: %u)</source>
+ <translation>ํŠธ๋žœ์žญ์…˜ ๋ฉ”๋ชจ๋ฆฌ ํ’€์˜ ์šฉ๋Ÿ‰์„ &lt;n&gt;๋ฉ”๊ฐ€๋ฐ”์ดํŠธ ์•„๋ž˜๋กœ ์œ ์ง€ํ•˜๊ธฐ (๊ธฐ๋ณธ๊ฐ’: %u)</translation>
+ </message>
+ <message>
+ <source>Location of the auth cookie (default: data dir)</source>
+ <translation>์ธ์ฆ ์ฟ ํ‚ค์˜ ์œ„์น˜ (๊ธฐ๋ณธ๊ฐ’: data dir)</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>์‚ฌ์šฉ ๊ฐ€๋Šฅํ•œ ํŒŒ์ผ ๋””์Šคํฌ๋ฆฝํ„ฐ-File Descriptor-๊ฐ€ ๋ถ€์กฑํ•ฉ๋‹ˆ๋‹ค. </translation>
</message>
<message>
+ <source>Only connect to nodes in network &lt;net&gt; (ipv4, ipv6 or onion)</source>
+ <translation>์˜ค์ง &lt;net&gt; ๋„คํŠธ์›Œํฌ๋กœ ๋กœ๋งŒ ์ ‘์† (IPv4, IPv6 ํ˜น์€ onion)</translation>
+ </message>
+ <message>
+ <source>Print version and exit</source>
+ <translation>๋ฒ„์ „ ์ถœ๋ ฅํ›„ ์ข…๋ฃŒ</translation>
+ </message>
+ <message>
+ <source>Prune cannot be configured with a negative value.</source>
+ <translation>๋ธ”๋ก ์ถ•์†Œ๋Š” ์Œ์ˆ˜๋กœ ์„ค์ •ํ•  ์ˆ˜ ์—†์Šต๋‹ˆ๋‹ค.</translation>
+ </message>
+ <message>
+ <source>Prune mode is incompatible with -txindex.</source>
+ <translation>๋ธ”๋ก ์ถ•์†Œ ๋ชจ๋“œ๋Š” -txindex์™€ ํ˜ธํ™˜๋˜์ง€ ์•Š์Šต๋‹ˆ๋‹ค.</translation>
+ </message>
+ <message>
<source>Set database cache size in megabytes (%d to %d, default: %d)</source>
<translation>๋ฐ์ดํ„ฐ๋ฒ ์ด์Šค ์ผ€์‹œ ํฌ๊ธฐ๋ฅผ ๋ฉ”๊ฐ€๋ฐ”์ดํŠธ๋กœ ์„ค์ •(%d ๋ถ€ํ„ฐ %d, ๊ธฐ๋ณธ๊ฐ’: %d)</translation>
</message>
@@ -2468,6 +3204,26 @@
<translation>๋ฐ์ดํ„ฐ ํด๋” ์•ˆ์— ์ง€๊ฐ‘ ํŒŒ์ผ์„ ์„ ํƒํ•˜์„ธ์š”.</translation>
</message>
<message>
+ <source>Unsupported argument -benchmark ignored, use -debug=bench.</source>
+ <translation>์ง€์›ํ•˜์ง€ ์•Š๋Š” ์ธ์ˆ˜ -benchmark ์€ ๋ฌด์‹œ๋ฉ๋‹ˆ๋‹ค, -debug=bench ํ˜•ํƒœ๋กœ ์‚ฌ์šฉํ•˜์„ธ์š”.</translation>
+ </message>
+ <message>
+ <source>Unsupported argument -debugnet ignored, use -debug=net.</source>
+ <translation>์ง€์›ํ•˜์ง€ ์•Š๋Š” ์ธ์ˆ˜ -debugnet ์€ ๋ฌด์‹œ๋ฉ๋‹ˆ๋‹ค, -debug=net ํ˜•ํƒœ๋กœ ์‚ฌ์šฉํ•˜์„ธ์š”.</translation>
+ </message>
+ <message>
+ <source>Unsupported argument -tor found, use -onion.</source>
+ <translation>์ง€์›ํ•˜์ง€ ์•Š๋Š” ์ธ์ˆ˜ -tor๋ฅผ ์ฐพ์•˜์Šต๋‹ˆ๋‹ค. -onion๋ฅผ ์‚ฌ์šฉํ•ด์ฃผ์„ธ์š”.</translation>
+ </message>
+ <message>
+ <source>Use UPnP to map the listening port (default: %u)</source>
+ <translation>๋ฆฌ์Šจ(Listen) ํฌํŠธ๋ฅผ ํ• ๋‹นํ•˜๊ธฐ ์œ„ํ•ด UPnP ์‚ฌ์šฉ (๊ธฐ๋ณธ๊ฐ’: %u)</translation>
+ </message>
+ <message>
+ <source>User Agent comment (%s) contains unsafe characters.</source>
+ <translation>์‚ฌ์šฉ์ž ์ •์˜ ์ฝ”๋ฉ˜ํŠธ (%s)์— ์•ˆ์ „ํ•˜์ง€ ๋ชปํ•œ ๊ธ€์ž๊ฐ€ ํฌํ•จ๋˜์–ด ์žˆ์Šต๋‹ˆ๋‹ค.</translation>
+ </message>
+ <message>
<source>Verifying blocks...</source>
<translation>๋ธ”๋ก ๊ฒ€์ฆ์ค‘...</translation>
</message>
@@ -2488,26 +3244,138 @@
<translation>-txindex๋ฅผ ๋ฐ”๊พธ๊ธฐ ์œ„ํ•ด์„œ๋Š” -reindex๋ฅผ ์‚ฌ์šฉํ•ด์„œ ๋ฐ์ดํ„ฐ๋ฒ ์ด์Šค๋ฅผ ์žฌ๊ตฌ์„ฑํ•ด์•ผ ํ•ฉ๋‹ˆ๋‹ค. </translation>
</message>
<message>
+ <source>Allow JSON-RPC connections from specified source. Valid for &lt;ip&gt; 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 ์—ฐ๊ฒฐ ํ—ˆ๊ฐ€. ์œ ํšจํ•œ &lt;ip&gt; ๊ฐ™์€ ํ•˜๋‚˜์˜ IP์ฃผ์†Œ (์˜ˆ 1.2.3.4), ๋„คํŠธ์›Œํฌ/๋„ท๋งˆ์Šคํฌ (์˜ˆ 1.2.3.4/255.255.255.0) ํ˜น์€ ๋„คํŠธ์›Œํฌ/CIDR (์˜ˆ 1.2.3.4/24). ์ด ์˜ต์…˜์€ ๋ณต์ˆ˜๋กœ ์„ค์ • ํ•  ์ˆ˜ ์žˆ์Šต๋‹ˆ๋‹ค.</translation>
+ </message>
+ <message>
+ <source>Bind to given address and whitelist peers connecting to it. Use [host]:port notation for IPv6</source>
+ <translation>์„ ํƒ๋œ ์ฃผ์†Œ๋กœ ๊ณ ์ •ํ•˜์—ฌ ํ™”์ดํŠธ๋ฆฌ์ŠคํŠธ์— ํฌํ•จ๋œ ํ”ผ์–ด์— ์ ‘์†ํ•ฉ๋‹ˆ๋‹ค. IPv6 ํ”„๋กœํ† ์ฝœ์ธ ๊ฒฝ์šฐ [host]:port ๋ฐฉ์‹์˜ ๋ช…๋ น์–ด ํ‘œ๊ธฐ๋ฒ•์„ ์‚ฌ์šฉํ•ฉ๋‹ˆ๋‹ค.</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 ์—ฐ๊ฒฐ์„ ๋ฆฌ์Šจ(Listen)ํ•ฉ๋‹ˆ๋‹ค. IPv6 ํ”„๋กœํ† ์ฝœ์ธ ๊ฒฝ์šฐ [host]:port ๋ฐฉ์‹์˜ ๋ช…๋ น์–ด ํ‘œ๊ธฐ๋ฒ•์„ ์‚ฌ์šฉํ•ฉ๋‹ˆ๋‹ค. ์ด ์˜ต์…˜์€ ๋ณต์ˆ˜๋กœ ์ง€์ • ํ• ์ˆ˜ ์žˆ์Šต๋‹ˆ๋‹ค. (๊ธฐ๋ณธ๊ฐ’: ๋ชจ๋“  ์ธํ„ฐํŽ˜์ด์Šค์— ๊ณ ์ •)</translation>
+ </message>
+ <message>
<source>Cannot obtain a lock on data directory %s. Bitcoin Core is probably already running.</source>
<translation>๋ฐ์ดํ„ฐ ๋””๋ ‰ํ† ๋ฆฌ %s์— ๋ฝ์„ ๊ฑธ ์ˆ˜ ์—†์—ˆ์Šต๋‹ˆ๋‹ค. ๋น„ํŠธ์ฝ”์ธ ์ฝ”์–ด๊ฐ€ ์ด๋ฏธ ์‹คํ–‰ ์ค‘์ธ ๊ฒƒ์œผ๋กœ ๋ณด์ž…๋‹ˆ๋‹ค.</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>์ž์‹ ์˜ ์ฃผ์†Œ๋ฅผ ํƒ์ƒ‰ (๊ธฐ๋ณธ๊ฐ’: ์—ด๋ ค์žˆ๊ฑฐ๋‚˜ -externalip ๋‚˜ -proxy ์˜ต์…˜์ด ์—†์œผ๋ฉด 1)</translation>
+ </message>
+ <message>
+ <source>Error: Listening for incoming connections failed (listen returned error %s)</source>
+ <translation>์˜ค๋ฅ˜: ๋“ค์–ด์˜ค๋Š” ์—ฐ๊ฒฐ์„ ๋ฆฌ์Šจ(Listen)ํ•˜๋Š”๋ฐ ์‹คํŒจํ–ˆ์Šต๋‹ˆ๋‹ค (์˜ค๋ฅ˜ ๋ฆฌํ„ด %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=&lt;amount&gt;: '%s' (must be at least the minrelay fee of %s to prevent stuck transactions)</source>
+ <translation>์œ ํšจํ•˜์ง€ ์•Š์€ ๊ธˆ์•ก -maxtxfee=&lt;amount&gt;: '%s' (ํŠธ๋žœ์žญ์…˜์ด ๋ง‰ํžˆ๋Š” ์ƒํ™ฉ์„ ๋ฐฉ์ง€ํ•˜๊ฒŒ ์œ„ํ•ด ์ ์–ด๋„ %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>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>
+ <message>
<source>Set maximum size of high-priority/low-fee transactions in bytes (default: %d)</source>
<translation>์ตœ๋Œ€ ํฌ๊ธฐ๋ฅผ ์ตœ์šฐ์„ ์œผ๋กœ ์„ค์ • / ๋ฐ”์ดํŠธ๋‹น ์ตœ์†Œ ์ˆ˜์ˆ˜๋ฃŒ๋กœ ๊ฑฐ๋ž˜(๊ธฐ๋ณธ๊ฐ’: %d)</translation>
</message>
<message>
+ <source>Set the number of threads for coin generation if enabled (-1 = all cores, default: %d)</source>
+ <translation>์ฝ”์ธ ์ƒ์„ฑ์— ๋Œ€ํ•œ ์Šค๋ ˆ๋“œ ๊ฐฏ์ˆ˜ ์„ค์ • (-1 = ๋ชจ๋“  ์ฝ”์–ด, ๊ธฐ๋ณธ๊ฐ’: %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>This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit &lt;https://www.openssl.org/&gt; and cryptographic software written by Eric Young and UPnP software written by Thomas Bernard.</source>
+ <translation>์ด ํ”„๋กœ๊ทธ๋žจ์—๋Š” OpenSSL ํˆดํ‚ท&lt;https://www.openssl.org/&gt; ์‚ฌ์šฉ ๋ชฉ์ ์œผ๋กœ ๊ฐœ๋ฐœํ•œ 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>
+ <message>
+ <source>You need to rebuild the database using -reindex to go back to unpruned mode. This will redownload the entire blockchain</source>
+ <translation>์ถ•์†Œ ๋ชจ๋“œ๋ฅผ ํ•ด์ œํ•˜๊ณ  ๋ฐ์ดํ„ฐ๋ฒ ์ด์Šค๋ฅผ ์žฌ๊ตฌ์„ฑ ํ•˜๊ธฐ ์œ„ํ•ด -reindex๋ฅผ ์‚ฌ์šฉํ•ด์•ผ ํ•ฉ๋‹ˆ๋‹ค. ์ด ๋ช…๋ น์€ ๋ชจ๋“  ๋ธ”๋ก์ฒด์ธ์„ ๋‹ค์‹œ ๋‹ค์šด๋กœ๋“œ ํ•  ๊ฒƒ ์ž…๋‹ˆ๋‹ค.</translation>
+ </message>
+ <message>
+ <source>(default: %u)</source>
+ <translation>(๊ธฐ๋ณธ๊ฐ’: %u)</translation>
+ </message>
+ <message>
+ <source>Accept public REST requests (default: %u)</source>
+ <translation>๊ณต๊ฐœ REST ์š”์ฒญ์„ ํ—ˆ๊ฐ€ (๊ธฐ๋ณธ๊ฐ’: %u)</translation>
+ </message>
+ <message>
+ <source>Activating best chain...</source>
+ <translation>์ตœ์  ๋ธ”๋ก ์ฒด์ธ์„ ํ™œ์„ฑํ™”ํ•˜๋Š”์ค‘...</translation>
+ </message>
+ <message>
+ <source>Attempt to recover private keys from a corrupt wallet.dat on startup</source>
+ <translation>์‹œ์ž‘์‹œ ๋ง๊ฐ€์ง„ wallet.dat์—์„œ ๊ฐœ์ธํ‚ค ๋ณต์›์„ ์‹œ๋„</translation>
+ </message>
+ <message>
+ <source>Automatically create Tor hidden service (default: %d)</source>
+ <translation>Tor์„œ๋น„์Šค๋ฅผ ์ž๋™์ ์œผ๋กœ ์ƒ์„ฑ (๊ธฐ๋ณธ๊ฐ’: %d)</translation>
+ </message>
+ <message>
<source>Cannot resolve -whitebind address: '%s'</source>
<translation>-whitebind ์ฃผ์†Œ๋ฅผ ํ™•์ธํ•  ์ˆ˜ ์—†์Šต๋‹ˆ๋‹ค: '%s'</translation>
</message>
<message>
+ <source>Connect through SOCKS5 proxy</source>
+ <translation>SOCK5 ํ”„๋ก์‹œ๋ฅผ ํ†ตํ•ด ์—ฐ๊ฒฐ</translation>
+ </message>
+ <message>
+ <source>Copyright (C) 2009-%i The Bitcoin Core Developers</source>
+ <translation>Copyright (C) 2009-%i The Bitcoin Core Developers</translation>
+ </message>
+ <message>
+ <source>Error loading wallet.dat: Wallet requires newer version of Bitcoin Core</source>
+ <translation>wallet.dat ๋ถˆ๋Ÿฌ์˜ค๊ธฐ ์˜ค๋ฅ˜: ์ตœ์‹  ๋ฒ„์ „์˜ Bitcoin Core์ด ํ•„์š”ํ•ฉ๋‹ˆ๋‹ค.</translation>
+ </message>
+ <message>
+ <source>Error reading from database, shutting down.</source>
+ <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>
<message>
+ <source>Initialization sanity check failed. Bitcoin Core is shutting down.</source>
+ <translation>๋ฌด๊ฒฐ์„ฑ ํ™•์ธ ์ดˆ๊ธฐํ™”๊ฐ€ ์‹คํŒจํ–ˆ์Šต๋‹ˆ๋‹ค. Bitcoin Core๊ฐ€ ์ข…๋ฃŒ๋ฉ๋‹ˆ๋‹ค.</translation>
+ </message>
+ <message>
<source>Invalid amount for -maxtxfee=&lt;amount&gt;: '%s'</source>
<translation>-maxtxfee=&lt;amount&gt;์— ๋Œ€ํ•œ ์–‘์ด ์ž˜๋ชป๋˜์—ˆ์Šต๋‹ˆ๋‹ค: '%s'</translation>
</message>
@@ -2520,14 +3388,54 @@
<translation>์ตœ์ € ๊ฑฐ๋ž˜ ์ˆ˜์ˆ˜๋ฃŒ๊ฐ€ ๋ถ€์กฑํ•ฉ๋‹ˆ๋‹ค. -mintxfee=&lt;amount&gt;: '%s'</translation>
</message>
<message>
+ <source>Invalid amount for -paytxfee=&lt;amount&gt;: '%s' (must be at least %s)</source>
+ <translation>์œ ํšจํ•˜์ง€ ์•Š์€ ๊ธˆ์•ก -paytxfee=&lt;amount&gt;: "%s" (์ตœ์†Œ %s ์ด์ƒ์ด์–ด์•ผ ๋จ)</translation>
+ </message>
+ <message>
+ <source>Invalid netmask specified in -whitelist: '%s'</source>
+ <translation>์œ ํšจํ•˜์ง€ ์•Š์€ ๋„ท๋งˆ์Šคํฌ๊ฐ€ -whitelist: '%s" ๋ฅผ ํ†ตํ•ด ์ง€์ •๋จ</translation>
+ </message>
+ <message>
+ <source>Keep at most &lt;n&gt; unconnectable transactions in memory (default: %u)</source>
+ <translation>์ตœ๋Œ€ &lt;n&gt;๊ฐœ์˜ ์—ฐ๊ฒฐํ•  ์ˆ˜ ์—†๋Š” ํŠธ๋žœ์žญ์…˜์„ ๋ฉ”๋ชจ๋ฆฌ์— ์ €์žฅ (๊ธฐ๋ณธ๊ฐ’: %u)</translation>
+ </message>
+ <message>
+ <source>Need to specify a port with -whitebind: '%s'</source>
+ <translation>-whitebind๋ฅผ ์ด์šฉํ•˜์—ฌ ํฌํŠธ๋ฅผ ์ง€์ •ํ•ด์•ผ ํ•ฉ๋‹ˆ๋‹ค: '%s"</translation>
+ </message>
+ <message>
+ <source>Node relay options:</source>
+ <translation>Node ์ค‘๊ณ„ ์˜ต์…˜:</translation>
+ </message>
+ <message>
<source>RPC server options:</source>
<translation>RPC ์„œ๋ฒ„ ์„ค์ •</translation>
</message>
<message>
+ <source>Rebuild block chain index from current blk000??.dat files on startup</source>
+ <translation>ํ˜„์žฌ์˜ blk000??.dat ํŒŒ์ผ๋“ค๋กœ๋ถ€ํ„ฐ ๋ธ”๋ก์ฒด์ธ ์ƒ‰์ธ์„ ์žฌ๊ตฌ์„ฑํ•ฉ๋‹ˆ๋‹ค.</translation>
+ </message>
+ <message>
+ <source>Receive and display P2P network alerts (default: %u)</source>
+ <translation>P2P ๋„คํŠธ์›Œํฌ ์•Œ๋ฆผ์„ ์ˆ˜์‹ ํ›„ ํ‘œ์‹œํ•ฉ๋‹ˆ๋‹ค (๊ธฐ๋ณธ๊ฐ’: %u)</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>
+ <message>
<source>Send trace/debug info to console instead of debug.log file</source>
<translation>์ถ”์ ์˜ค๋ฅ˜ ์ •๋ณด๋ฅผ degug.log ์ž๋ฃŒ๋กœ ๋ณด๋‚ด๋Š” ๋Œ€์‹  ์ฝ˜์†”๋กœ ๋ณด๋‚ด๊ธฐ</translation>
</message>
<message>
+ <source>Send transactions as zero-fee transactions if possible (default: %u)</source>
+ <translation>๊ฐ€๋Šฅํ•œ ๊ฒฝ์šฐ ์ˆ˜์ˆ˜๋ฃŒ ์—†์ด ํŠธ๋žœ์žญ์…˜ ๋ณด๋‚ด๊ธฐ (๊ธฐ๋ณธ๊ฐ’: %u)</translation>
+ </message>
+ <message>
<source>Show all debugging options (usage: --help -help-debug)</source>
<translation>๋ชจ๋“  ๋””๋ฒ„๊ทธ ์„ค์ • ๋ณด๊ธฐ(์„ค์ •: --help -help-debug)</translation>
</message>
@@ -2540,30 +3448,70 @@
<translation>๊ฑฐ๋ž˜๋ฅผ ์„œ๋ช…ํ•˜๋Š”๊ฒƒ์„ ์‹คํŒจํ•˜์˜€์Šต๋‹ˆ๋‹ค.</translation>
</message>
<message>
+ <source>The transaction amount is too small to pay the fee</source>
+ <translation>๊ฑฐ๋ž˜์•ก์ด ์ˆ˜์ˆ˜๋ฃŒ๋ฅผ ์ง€๋ถˆํ•˜๊ธฐ์—” ๋„ˆ๋ฌด ์ž‘์Šต๋‹ˆ๋‹ค</translation>
+ </message>
+ <message>
+ <source>This is experimental software.</source>
+ <translation>์ด ์†Œํ”„ํŠธ์›จ์–ด๋Š” ์‹œํ—˜์ ์ž…๋‹ˆ๋‹ค.</translation>
+ </message>
+ <message>
+ <source>Tor control port password (default: empty)</source>
+ <translation>Tor ๊ด€๋ฆฌ ํฌํŠธ ์•”ํ˜ธ (๊ธฐ๋ณธ๊ฐ’: ๊ณต๋ž€)</translation>
+ </message>
+ <message>
+ <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>
+ <translation>๊ฑฐ๋ž˜์•ก์ด ๋„ˆ๋ฌด ์ ์Šต๋‹ˆ๋‹ค</translation>
</message>
<message>
<source>Transaction amounts must be positive</source>
- <translation>๊ฑฐ๋ž˜๋Ÿ‰์€ ๋ฐ˜๋“œ์‹œ ์ •์ˆ˜์—ฌ์•ผํ•ฉ๋‹ˆ๋‹ค.</translation>
+ <translation>๊ฑฐ๋ž˜์•ก์€ ๋ฐ˜๋“œ์‹œ ์ •์ˆ˜์—ฌ์•ผํ•ฉ๋‹ˆ๋‹ค.</translation>
+ </message>
+ <message>
+ <source>Transaction too large for fee policy</source>
+ <translation>์ˆ˜์ˆ˜๋ฃŒ ์ •์ฑ…์— ๋น„ํ•ด ํŠธ๋žœ์žญ์…˜์ด ๋„ˆ๋ฌด ํฝ๋‹ˆ๋‹ค</translation>
</message>
<message>
<source>Transaction too large</source>
<translation>๋„ˆ๋ฌด ํฐ ๊ฑฐ๋ž˜</translation>
</message>
<message>
+ <source>Upgrade wallet to latest format on startup</source>
+ <translation>์‹œ์ž‘์‹œ ์ง€๊ฐ‘ ํฌ๋ฉง์„ ์ตœ์‹ ์œผ๋กœ ์—…๊ทธ๋ ˆ์ด๋“œ ํ•ฉ๋‹ˆ๋‹ค</translation>
+ </message>
+ <message>
<source>Username for JSON-RPC connections</source>
<translation>JSON-RPC ์—ฐ๊ฒฐ์— ์‚ฌ์šฉํ•  ์‚ฌ์šฉ์ž ์ด๋ฆ„</translation>
</message>
<message>
+ <source>Wallet needed to be rewritten: restart Bitcoin Core to complete</source>
+ <translation>์ง€๊ฐ‘์„ ์ƒˆ๋กœ ์จ์•ผ ํ•ฉ๋‹ˆ๋‹ค: ์™„๋ฃŒํ•˜๊ธฐ ์œ„ํ•˜์—ฌ Bitcoin Core์„ ๋‹ค์‹œ ์‹œ์ž‘ํ•˜์‹ญ์‹œ์˜ค.</translation>
+ </message>
+ <message>
<source>Warning</source>
<translation>๊ฒฝ๊ณ </translation>
</message>
<message>
+ <source>Warning: unknown new rules activated (versionbit %i)</source>
+ <translation>๊ฒฝ๊ณ : ์•Œ๋ ค์ง€์ง€ ์•Š์€ ์ƒˆ๋กœ์šด ๊ทœ์น™์ด ํ™œ์„ฑํ™”๋˜์—ˆ์Šต๋‹ˆ๋‹ค. (๋ฒ„์ „๋น„ํŠธ %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>์ง€๊ฐ‘์˜ ๋ชจ๋“ ๊ฑฐ๋ž˜๋‚ด์—ญ ๊ฑด๋„ˆ๋›ฐ๊ธฐ...</translation>
</message>
<message>
+ <source>ZeroMQ notification options:</source>
+ <translation>ZeroMQ ์•Œ๋ฆผ ์˜ต์…˜:</translation>
+ </message>
+ <message>
<source>wallet.dat corrupt, salvage failed</source>
<translation>wallet.dat ํŒŒ์ผ์ด ์†์ƒ๋˜์—ˆ๊ณ  ๋ณต๊ตฌ๊ฐ€ ์‹คํŒจํ•˜์˜€์Šต๋‹ˆ๋‹ค.</translation>
</message>
@@ -2589,17 +3537,161 @@
</message>
<message>
<source>Error loading wallet.dat: Wallet corrupted</source>
- <translation>wallet.dat ๋ถˆ๋Ÿฌ์˜ค๊ธฐ ์—๋Ÿฌ: ์ง€๊ฐ‘ ์˜ค๋ฅ˜</translation>
+ <translation>wallet.dat ๋ถˆ๋Ÿฌ์˜ค๊ธฐ ์˜ค๋ฅ˜: ์ง€๊ฐ‘ ์˜ค๋ฅ˜</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 = ํŠธ๋žœ์žญ์…˜์˜ ๋ฉ”ํƒ€ ๋ฐ์ดํ„ฐ๋ฅผ ์œ ์ง€ํ•จ ์˜ˆ. ๊ณ„์ขŒ์ •๋ณด ์™€ ์ง€๋ถˆ ์š”๊ตฌ ์ •๋ณด, 2 = ํŠธ๋žœ์žญ์…˜ ๋ฉ”ํƒ€ ๋ฐ์ดํ„ฐ ํŒŒ๊ธฐ)</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>-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 &lt;n&gt; hours (default: %u)</source>
+ <translation>๋ฉ”๋ชจ๋ฆฌ ํ’€์— ์žˆ๋Š” ํŠธ๋žœ์žญ์…˜ ๊ธฐ๋ก์„ &lt;n&gt;์‹œ๊ฐ„ ํ›„ ๋ถ€ํ„ฐ๋Š” ์œ ์ง€ํ•˜์ง€ ์•Š๊ธฐ (๊ธฐ๋ณธ๊ฐ’: %u)</translation>
+ </message>
+ <message>
+ <source>Error reading wallet.dat! All keys read correctly, but transaction data or address book entries might be missing or incorrect.</source>
+ <translation>๊ฒฝ๊ณ  : wallet.dat ํŒŒ์ผ์„ ์ฝ๋Š” ์ค‘ ์˜ค๋ฅ˜๊ฐ€ ๋ฐœ์ƒํ–ˆ์Šต๋‹ˆ๋‹ค. ์ฃผ์†Œ ํ‚ค๋Š” ๋ชจ๋‘ ์ •ํ™•ํ•˜๊ฒŒ ๋กœ๋”ฉ๋˜์—ˆ์œผ๋‚˜ ๊ฑฐ๋ž˜ ๋ฐ์ดํ„ฐ์™€ ์ฃผ์†Œ๋ก ํ•„๋“œ์—์„œ ๋ˆ„๋ฝ์ด๋‚˜ ์˜ค๋ฅ˜๊ฐ€ ์กด์žฌํ•  ์ˆ˜ ์žˆ์Šต๋‹ˆ๋‹ค. </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>How thorough the block verification of -checkblocks is (0-4, default: %u)</source>
+ <translation>-checkblocks์„ ํ†ตํ•œ ๋ธ”๋ก ์ ๊ฒ€ (0-4, ๊ธฐ๋ณธ๊ฐ’: %u)</translation>
+ </message>
+ <message>
+ <source>Maintain a full transaction index, used by the getrawtransaction rpc call (default: %u)</source>
+ <translation>getrawtransaction๋ฅผ RPC CALL๋ฅผ ํ†ตํ•ด ์™„์ „ํ•œ ํŠธ๋žœ์žญ์…˜ ์ธ๋ฑ์Šค ์œ ์ง€ (๊ธฐ๋ณธ๊ฐ’: %u)</translation>
+ </message>
+ <message>
+ <source>Number of seconds to keep misbehaving peers from reconnecting (default: %u)</source>
+ <translation>์ด์ƒํ–‰๋™์„ ํ•˜๋Š” ๋„คํŠธ์›Œํฌ ์ฐธ์—ฌ์ž๋“ค์„ ๋‹ค์‹œ ์—ฐ๊ฒฐ์‹œํ‚ค๋Š”๋ฐ ๊ฑธ๋ฆฌ๋Š” ์‹œ๊ฐ„ (๊ธฐ๋ณธ๊ฐ’: %u)</translation>
+ </message>
+ <message>
+ <source>Output debugging information (default: %u, supplying &lt;category&gt; is optional)</source>
+ <translation>๋””๋ฒ„๊ทธ ์ •๋ณด ์ถœ๋ ฅ (๊ธฐ๋ณธ๊ฐ’: %u, &lt;category&gt; ์ œ๊ณต์€ ์„ ํƒ์ž…๋‹ˆ๋‹ค)</translation>
+ </message>
+ <message>
+ <source>Support filtering of blocks and transaction with bloom filters (default: %u)</source>
+ <translation>๋ธ”๋ฃธํ•„ํ„ฐ๋ฅผ ํ†ตํ•ด ๋ธ”๋ก๊ณผ ํŠธ๋žœ์žญ์…˜ ํ•„ํ„ฐ๋ง ์ง€์› (๊ธฐ๋ณธ๊ฐ’: %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)๋ฅผ ์ดˆ๊ณผํ•ฉ๋‹ˆ๋‹ค. UA์ฝ”๋ฉ˜ํŠธ์˜ ๊ฐฏ์ˆ˜๋‚˜ ๊ธธ์ด๋ฅผ ์ค„์ด์„ธ์š”.</translation>
+ </message>
+ <message>
+ <source>Tries to keep outbound traffic under the given target (in MiB per 24h), 0 = no limit (default: %d)</source>
+ <translation>์•„์›ƒ๋ฐ”์šด๋“œ ํŠธ๋ž˜ํ”ฝ์„ ์„ค์ •๋œ ๋ชฉํ‘œ์น˜ ์ดํ•˜๋กœ ์œ ์ง€ํ•˜๊ธฐ (24์‹œ๊ฐ„๋‹น MiB๊ธฐ์ค€), 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๋ฅผ ์ฐพ์•˜์Šต๋‹ˆ๋‹ค. ์„ค์ •๋œ SOCKS์˜ ๋ฒ„์ „์€ ๋”์ด์ƒ ์‚ฌ์šฉํ•  ์ˆ˜ ์—†์œผ๋ฉฐ, SOCK5 ํ”„๋ก์‹œ๋งŒ์„ ์ง€์›ํ•ฉ๋‹ˆ๋‹ค.</translation>
+ </message>
+ <message>
+ <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: %s)</source>
+ <translation>Tor ์„œ๋น„์Šค๋ฅผ ์ด์šฉํ•˜์—ฌ ํ”ผ์–ด์—๊ฒŒ ์—ฐ๊ฒฐํ•˜๊ธฐ ์œ„ํ•ด ๋ถ„๋ฆฌ๋œ SOCKS5 ํ”„๋ก์‹œ๋ฅผ ์‚ฌ์šฉ (๊ธฐ๋ณธ๊ฐ’: %s)</translation>
+ </message>
+ <message>
+ <source>Username and hashed password for JSON-RPC connections. The field &lt;userpw&gt; comes in the format: &lt;USERNAME&gt;:&lt;SALT&gt;$&lt;HASH&gt;. A canonical python script is included in share/rpcuser. This option can be specified multiple times</source>
+ <translation>JSON-RPC ์—ฐ๊ฒฐ์‹œ ์‚ฌ์šฉ์ž ์ด๋ฆ„๊ณผ ํ•ด์‹œํ™”๋œ ์•”ํ˜ธ๋ฌธ. &lt;userpw&gt; ํ•„๋“œ๋Š” &lt;USERNAME&gt;:&lt;SALT&gt;$&lt;HASH&gt; ํฌ๋ฉง์œผ๋กœ ๊ตฌ์„ฑ๋˜์–ด ์žˆ์Šต๋‹ˆ๋‹ค. ์ „ํ˜•์  ํŒŒ์ด์ฌ ์Šคํฌ๋ฆฝํŠธ์—์„  share/rpcuser๊ฐ€ ํฌํ•จ๋˜์–ด ์žˆ์Šต๋‹ˆ๋‹ค. ์ด ์˜ต์…˜์€ ์—ฌ๋Ÿฌ๋ฒˆ ์ง€์ •ํ•  ์ˆ˜ ์žˆ์Šต๋‹ˆ๋‹ค.</translation>
+ </message>
+ <message>
+ <source>Always query for peer addresses via DNS lookup (default: %u)</source>
+ <translation>DNS lookup์„ ํ†ตํ•ด ํ•ญ์ƒ ํ”ผ์–ด์ฃผ์†Œ์— ๋Œ€ํ•œ ์ฟผ๋ฆฌ ๋ณด๋‚ด๊ธฐ (๊ธฐ๋ณธ๊ฐ’: %u)</translation>
</message>
<message>
<source>Error loading wallet.dat</source>
- <translation>wallet.dat ๋ถˆ๋Ÿฌ์˜ค๊ธฐ ์—๋Ÿฌ</translation>
+ <translation>wallet.dat ๋ถˆ๋Ÿฌ์˜ค๊ธฐ ์˜ค๋ฅ˜</translation>
+ </message>
+ <message>
+ <source>Generate coins (default: %u)</source>
+ <translation>์ฝ”์ธ ์ƒ์„ฑ (๊ธฐ๋ณธ๊ฐ’: %u)</translation>
+ </message>
+ <message>
+ <source>How many blocks to check at startup (default: %u, 0 = all)</source>
+ <translation>์‹œ์ž‘์‹œ ์ ๊ฒ€ํ•  ๋ธ”๋ก ๊ฐฏ์ˆ˜ (๊ธฐ๋ณธ๊ฐ’: %u, 0 = ๋ชจ๋‘)</translation>
+ </message>
+ <message>
+ <source>Include IP addresses in debug output (default: %u)</source>
+ <translation>๋””๋ฒ„๊ทธ ์ถœ๋ ฅ์— IP์ฃผ์†Œ ํฌํ•จํ•˜๊ธฐ (๊ธฐ๋ณธ๊ฐ’: %u)</translation>
</message>
<message>
<source>Invalid -proxy address: '%s'</source>
<translation>์ž˜๋ชป๋œ -proxy ์ฃผ์†Œ์ž…๋‹ˆ๋‹ค: '%s'</translation>
</message>
<message>
+ <source>Listen for JSON-RPC connections on &lt;port&gt; (default: %u or testnet: %u)</source>
+ <translation>JSON-RPC ์—ฐ๊ฒฐ์„ &lt;port&gt;ํฌํŠธ๋กœ ๋ฐ›๊ธฐ (๊ธฐ๋ณธ๊ฐ’: %u ํ˜น์€ ํ…Œ์ŠคํŠธ๋„ท: %u)</translation>
+ </message>
+ <message>
+ <source>Listen for connections on &lt;port&gt; (default: %u or testnet: %u)</source>
+ <translation>&lt;port&gt;ํฌํŠธ๋กœ ์—ฐ๊ฒฐ ๋ฐ›๊ธฐ (๊ธฐ๋ณธ๊ฐ’: %u ํ˜น์€ ํ…Œ์ŠคํŠธ๋„ท: %u)</translation>
+ </message>
+ <message>
+ <source>Maintain at most &lt;n&gt; connections to peers (default: %u)</source>
+ <translation>ํ”ผ์–ด ์—ฐ๊ฒฐ์ˆ˜๋ฅผ &lt;n&gt;๊ฐœ๋กœ ์œ ์ง€ (๊ธฐ๋ณธ๊ฐ’: %u)</translation>
+ </message>
+ <message>
+ <source>Make the wallet broadcast transactions</source>
+ <translation>์ง€๊ฐ‘ ๋ธŒ๋กœ๋“œ์บ์ŠคํŠธ ํŠธ๋žœ์žญ์…˜์„ ๋งŒ๋“ค๊ธฐ</translation>
+ </message>
+ <message>
+ <source>Maximum per-connection receive buffer, &lt;n&gt;*1000 bytes (default: %u)</source>
+ <translation>์ ‘์†๋ณ„ ์ตœ๋Œ€ ์ˆ˜์‹  ๋ฒ„ํผ. &lt;n&gt; ร— 1000๋ฐ”์ดํŠธ (๊ธฐ๋ณธ๊ฐ’: %u)</translation>
+ </message>
+ <message>
+ <source>Maximum per-connection send buffer, &lt;n&gt;*1000 bytes (default: %u)</source>
+ <translation>์ ‘์†๋ณ„ ์ตœ๋Œ€ ์ „์†ก ๋ฒ„ํผ. &lt;n&gt; ร— 1000๋ฐ”์ดํŠธ (๊ธฐ๋ณธ๊ฐ’: %u)</translation>
+ </message>
+ <message>
+ <source>Prepend debug output with timestamp (default: %u)</source>
+ <translation>๋””๋ฒ„๊ทธ ์ถœ๋ ฅ์— ํƒ€์ž„ ์Šคํƒฌํ”„ ํฌํ•จํ•˜๊ธฐ (๊ธฐ๋ณธ๊ฐ’: %u)</translation>
+ </message>
+ <message>
+ <source>Relay and mine data carrier transactions (default: %u)</source>
+ <translation>๋ฐ์ดํ„ฐ ์šด์†ก ํŠธ๋žœ์žญ์…˜์„ ์ค‘๊ณ„ ๋ฐ ์ฑ„๊ตด (๊ธฐ๋ณธ๊ฐ’: %u)</translation>
+ </message>
+ <message>
+ <source>Relay non-P2SH multisig (default: %u)</source>
+ <translation>๋น„ P2SH ๋‹ค์ค‘์„œ๋ช…์„ ์ค‘๊ณ„ (๊ธฐ๋ณธ๊ฐ’: %u)</translation>
+ </message>
+ <message>
+ <source>Set key pool size to &lt;n&gt; (default: %u)</source>
+ <translation>ํ‚ค ํ’€ ์‚ฌ์ด์ฆˆ๋ฅผ &lt;n&gt; ๋กœ ์„ค์ • (๊ธฐ๋ณธ๊ฐ’: %u)</translation>
+ </message>
+ <message>
+ <source>Set the number of threads to service RPC calls (default: %d)</source>
+ <translation>์›๊ฒฉ ํ”„๋กœ์‹œ์ ธ ํ˜ธ์ถœ ์„œ๋น„์Šค๋ฅผ ์œ„ํ•œ ์“ฐ๋ ˆ๋“œ ๊ฐœ์ˆ˜๋ฅผ ์„ค์ • (๊ธฐ๋ณธ๊ฐ’ : %d)</translation>
+ </message>
+ <message>
+ <source>Specify configuration file (default: %s)</source>
+ <translation>์„ค์ •ํŒŒ์ผ ์ง€์ • (๊ธฐ๋ณธ๊ฐ’: %s)</translation>
+ </message>
+ <message>
+ <source>Specify connection timeout in milliseconds (minimum: 1, default: %d)</source>
+ <translation>๋ฐ€๋ฆฌ์ดˆ ๋‹จ์œ„๋กœ ์—ฐ๊ฒฐ ์ œํ•œ์‹œ๊ฐ„์„ ์„ค์ • (์ตœ์†Œ๊ฐ’: 1, ๊ธฐ๋ณธ๊ฐ’: %d)</translation>
+ </message>
+ <message>
+ <source>Specify pid file (default: %s)</source>
+ <translation>pid ํŒŒ์ผ ์ง€์ • (๊ธฐ๋ณธ๊ฐ’: %s)</translation>
+ </message>
+ <message>
+ <source>Spend unconfirmed change when sending transactions (default: %u)</source>
+ <translation>ํŠธ๋žœ์žญ์…˜์„ ๋ณด๋‚ผ ๋•Œ ๊ฒ€์ฆ๋˜์ง€ ์•Š์€ ์ž”๋ˆ ์“ฐ๊ธฐ (๊ธฐ๋ณธ๊ฐ’: %u)</translation>
+ </message>
+ <message>
+ <source>Threshold for disconnecting misbehaving peers (default: %u)</source>
+ <translation>์ด์ƒํ–‰๋™ ๋„คํŠธ์›Œํฌ ์ฐธ์—ฌ์ž์˜ ์—ฐ๊ฒฐ์„ ์ฐจ๋‹จ์‹œํ‚ค๊ธฐ ์œ„ํ•œ ํ•œ๊ณ„์น˜ (๊ธฐ๋ณธ๊ฐ’: %u)</translation>
+ </message>
+ <message>
<source>Unknown network specified in -onlynet: '%s'</source>
<translation>-onlynet์— ์ง€์ •ํ•œ ๋„คํŠธ์›Œํฌ๋ฅผ ์•Œ ์ˆ˜ ์—†์Šต๋‹ˆ๋‹ค: '%s'</translation>
</message>
diff --git a/src/qt/locale/bitcoin_la.ts b/src/qt/locale/bitcoin_la.ts
index e3dcd505fe..b11027d1ee 100644
--- a/src/qt/locale/bitcoin_la.ts
+++ b/src/qt/locale/bitcoin_la.ts
@@ -668,10 +668,6 @@
<translation>Fenestra Debug</translation>
</message>
<message>
- <source>Using OpenSSL version</source>
- <translation>Utens OpenSSL versione</translation>
- </message>
- <message>
<source>Startup time</source>
<translation>Tempus initiandi</translation>
</message>
diff --git a/src/qt/locale/bitcoin_lt.ts b/src/qt/locale/bitcoin_lt.ts
index b98976dfea..873a6939b7 100644
--- a/src/qt/locale/bitcoin_lt.ts
+++ b/src/qt/locale/bitcoin_lt.ts
@@ -34,6 +34,10 @@
<translation>Iลกtrinti pasirinktฤ… adresฤ… iลก sฤ…raลกo</translation>
</message>
<message>
+ <source>Export the data in the current tab to a file</source>
+ <translation>Eksportuoti informacijฤ… iลก dabartinฤ—s lentelฤ—s ฤฏ failฤ…</translation>
+ </message>
+ <message>
<source>&amp;Export</source>
<translation>&amp;Eksportuoti</translation>
</message>
@@ -46,6 +50,10 @@
<translation>Pasirinkite adresฤ… kuriam siลซsite monetas</translation>
</message>
<message>
+ <source>Choose the address to receive coins with</source>
+ <translation>Pasirinkite adresฤ… su kuriuo gauti monetas</translation>
+ </message>
+ <message>
<source>C&amp;hoose</source>
<translation>P&amp;asirinkti</translation>
</message>
@@ -58,6 +66,14 @@
<translation>Gaunami adresai</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>Tai yra jลซsลณ Bitcoin adresai mokฤ—jimลณ siuntimui. Visada patikrinkite siunฤiamฤ… sumฤ… ir gavฤ—jo adresฤ… prieลก siลณsdami monetas.</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>Tai yra jลซsลณ Bitcoin adresai mokฤ—jimลณ gavimui. Rekomenduojame naudoti naujus gavimo adresus kiekvienai tranzakcijai.</translation>
+ </message>
+ <message>
<source>Copy &amp;Label</source>
<translation>Kopijuoti ลพ&amp;ymฤ™</translation>
</message>
@@ -908,10 +924,6 @@
<translation>Derinimo langas</translation>
</message>
<message>
- <source>Using OpenSSL version</source>
- <translation>Naudojama OpenSSL versija</translation>
- </message>
- <message>
<source>Startup time</source>
<translation>Paleidimo laikas</translation>
</message>
@@ -1691,6 +1703,10 @@
<translation>&amp;Eksportuoti</translation>
</message>
<message>
+ <source>Export the data in the current tab to a file</source>
+ <translation>Eksportuoti informacijฤ… iลก dabartinฤ—s lentelฤ—s ฤฏ failฤ…</translation>
+ </message>
+ <message>
<source>Backup Wallet</source>
<translation>Backup piniginฤ™</translation>
</message>
diff --git a/src/qt/locale/bitcoin_lv_LV.ts b/src/qt/locale/bitcoin_lv_LV.ts
index e01d4c812c..5a59184b0c 100644
--- a/src/qt/locale/bitcoin_lv_LV.ts
+++ b/src/qt/locale/bitcoin_lv_LV.ts
@@ -1080,10 +1080,6 @@
<translation>Vispฤrฤ“js</translation>
</message>
<message>
- <source>Using OpenSSL version</source>
- <translation>Izmantotฤ OpenSSL versija</translation>
- </message>
- <message>
<source>Startup time</source>
<translation>Sฤkuma laiks</translation>
</message>
diff --git a/src/qt/locale/bitcoin_nb.ts b/src/qt/locale/bitcoin_nb.ts
index 9236ac86fe..94e02f8900 100644
--- a/src/qt/locale/bitcoin_nb.ts
+++ b/src/qt/locale/bitcoin_nb.ts
@@ -1474,10 +1474,6 @@
<translation>Generelt</translation>
</message>
<message>
- <source>Using OpenSSL version</source>
- <translation>Bruker OpenSSL versjon</translation>
- </message>
- <message>
<source>Using BerkeleyDB version</source>
<translation>Bruker BerkeleyDB versjon</translation>
</message>
@@ -3196,10 +3192,6 @@
<translation>Valg for lommebok:</translation>
</message>
<message>
- <source>Warning: This version is obsolete; upgrade required!</source>
- <translation>Advarsel: Denne versjonen er utdatert; oppgradering er pรฅkrevd!</translation>
- </message>
- <message>
<source>You need to rebuild the database using -reindex to change -txindex</source>
<translation>Du mรฅ gjenoppbygge databasen med รฅ bruke -reindex for รฅ endre -txindex</translation>
</message>
@@ -3296,10 +3288,6 @@
<translation>Aktiverer beste kjede...</translation>
</message>
<message>
- <source>Always relay transactions received from whitelisted peers (default: %d)</source>
- <translation>Alltid videresend transaksjoner mottatt fra hvitlistede noder (standardverdi: %d)</translation>
- </message>
- <message>
<source>Attempt to recover private keys from a corrupt wallet.dat on startup</source>
<translation>Forsรธk รฅ berge private nรธkler fra en korrupt wallet.dat ved oppstart</translation>
</message>
diff --git a/src/qt/locale/bitcoin_nl.ts b/src/qt/locale/bitcoin_nl.ts
index 8457a9ab50..fe29959abf 100644
--- a/src/qt/locale/bitcoin_nl.ts
+++ b/src/qt/locale/bitcoin_nl.ts
@@ -7,7 +7,7 @@
</message>
<message>
<source>Create a new address</source>
- <translation>Maak een nieuw adres</translation>
+ <translation>Maak een nieuw adres aan</translation>
</message>
<message>
<source>&amp;New</source>
@@ -169,7 +169,7 @@
</message>
<message>
<source>Bitcoin Core 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>Bitcoin Core zal nu afsluiten om het versleutelingsproces te voltooien. Hou er rekening mee dat versleuteling van je portemonnee je niet volledig beschermt tegen diefstal van jouw bitcoins door malware op je computer.</translation>
+ <translation>Bitcoin Core zal nu afsluiten om het versleutelingsproces te voltooien. Hou er rekening mee dat versleuteling van uw portemonnee u niet volledig beschermt tegen diefstal van jouw bitcoins door malware op je 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>
@@ -1474,10 +1474,6 @@
<translation>Algemeen</translation>
</message>
<message>
- <source>Using OpenSSL version</source>
- <translation>Gebruikt OpenSSL versie</translation>
- </message>
- <message>
<source>Using BerkeleyDB version</source>
<translation>Gebruikt BerkeleyDB versie</translation>
</message>
@@ -2980,6 +2976,18 @@
<translation>Accepteer verbindingen van buitenaf (standaard: 1 als geen -proxy of -connect is opgegeven)</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>
+ </message>
+ <message>
+ <source>A fee rate (in %s/kB) that will be used when fee estimation has insufficient data (default: %s)</source>
+ <translation>Een transactietarief (in %s/kB) dat gebruikt wordt als de transactiekosten schatting niet genoeg data heeft. (normaal: %s)</translation>
+ </message>
+ <message>
+ <source>Accept relayed transactions received from whitelisted peers even when not relaying transactions (default: %d)</source>
+ <translation>Accepteer doorgestuurde transacties ontvangen van goedgekeurde peers, ook wanneer je zelf geen transacties doorstuurt (standaard: %d)</translation>
+ </message>
+ <message>
<source>Bind to given address and always listen on it. Use [host]:port notation for IPv6</source>
<translation>Bind aan opgegeven adres en luister er altijd op. Gebruik [host]:port notatie voor IPv6</translation>
</message>
@@ -2996,6 +3004,10 @@
<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>Set the number of script verification threads (%u to %d, 0 = auto, &lt;0 = leave that many cores free, default: %d)</source>
<translation>Kies het aantal scriptverificatie processen (%u tot %d, 0 = auto, &lt;0 = laat dit aantal kernen vrij, standaard: %d)</translation>
</message>
@@ -3012,6 +3024,10 @@
<translation>Niet in staat om %s te verbinden op deze computer. Bitcoin Core draait waarschijnlijk al.</translation>
</message>
<message>
+ <source>Unsupported argument -whitelistalwaysrelay ignored, use -whitelistrelay and/or -whitelistforcerelay.</source>
+ <translation>Niet ondersteund argument -whitelistalwaysrelay genegeerd, gebruik -whitelistrelay en/of -whitelistforcerelay.</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>
@@ -3028,6 +3044,10 @@
<translation>Waarschuwing: Het lijkt erop dat het netwerk geen consensus kan vinden! Sommige delvers lijken problemen te ondervinden.</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>
+ <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>
@@ -3048,6 +3068,10 @@
<translation>&lt;categorie&gt; kan zijn:</translation>
</message>
<message>
+ <source>Append comment to the user agent string</source>
+ <translation>Voeg commentaar toe aan de user agent string</translation>
+ </message>
+ <message>
<source>Block creation options:</source>
<translation>Blokcreatie-opties:</translation>
</message>
@@ -3092,6 +3116,10 @@
<translation>Sta toe ruwe transacties te publiceren in &lt;adres&gt;</translation>
</message>
<message>
+ <source>Enable transaction replacement in the memory pool (default: %u)</source>
+ <translation>Transactie vervanging inschakelen in het geheugen (standaard: %u)</translation>
+ </message>
+ <message>
<source>Error initializing block database</source>
<translation>Fout bij intialisatie blokkendatabase</translation>
</message>
@@ -3128,10 +3156,22 @@
<translation>Ongeldig -onion adres '%s'</translation>
</message>
<message>
+ <source>Invalid amount for -fallbackfee=&lt;amount&gt;: '%s'</source>
+ <translation>Ongeldig bedrag voor -fallbackfee=&lt;bedrag&gt;: '%s'</translation>
+ </message>
+ <message>
<source>Keep the transaction memory pool below &lt;n&gt; megabytes (default: %u)</source>
<translation>De transactiegeheugenpool moet onder de &lt;n&gt; megabytes blijven (standaard: %u)</translation>
</message>
<message>
+ <source>Location of the auth cookie (default: data dir)</source>
+ <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>
@@ -3140,6 +3180,10 @@
<translation>Verbind alleen met nodes in netwerk &lt;net&gt; (ipv4, ipv6 of onion)</translation>
</message>
<message>
+ <source>Print version and exit</source>
+ <translation>Laat versie zien en sluit af</translation>
+ </message>
+ <message>
<source>Prune cannot be configured with a negative value.</source>
<translation>Snoeien kan niet worden geconfigureerd met een negatieve waarde.</translation>
</message>
@@ -3196,10 +3240,6 @@
<translation>Portemonnee instellingen:</translation>
</message>
<message>
- <source>Warning: This version is obsolete; upgrade required!</source>
- <translation>Waarschuwing: Deze versie is verouderd; upgraden verplicht!</translation>
- </message>
- <message>
<source>You need to rebuild the database using -reindex to change -txindex</source>
<translation>Om -txindex te kunnen veranderen dient u de database herbouwen met gebruik van -reindex.</translation>
</message>
@@ -3296,10 +3336,6 @@
<translation>Beste reeks activeren...</translation>
</message>
<message>
- <source>Always relay transactions received from whitelisted peers (default: %d)</source>
- <translation>Geef transacties altijd door aan goedgekeurde peers (standaard: %d)</translation>
- </message>
- <message>
<source>Attempt to recover private keys from a corrupt wallet.dat on startup</source>
<translation>Probeer privรฉsleutels te herstellen van een corrupte wallet.dat bij opstarten</translation>
</message>
@@ -3464,6 +3500,10 @@
<translation>Waarschuwing</translation>
</message>
<message>
+ <source>Warning: unknown new rules activated (versionbit %i)</source>
+ <translation>Waarschuwing: onbekende nieuwe regels geactiveerd (versionbit %i)</translation>
+ </message>
+ <message>
<source>Whether to operate in a blocks only mode (default: %u)</source>
<translation>Om in alleen een blokmodus te opereren (standaard: %u)</translation>
</message>
diff --git a/src/qt/locale/bitcoin_pam.ts b/src/qt/locale/bitcoin_pam.ts
index 233918ff2b..c5a0b17e80 100644
--- a/src/qt/locale/bitcoin_pam.ts
+++ b/src/qt/locale/bitcoin_pam.ts
@@ -656,10 +656,6 @@
<translation>I-Debug ing awang</translation>
</message>
<message>
- <source>Using OpenSSL version</source>
- <translation>Gagamit bersion na ning OpenSSL</translation>
- </message>
- <message>
<source>Startup time</source>
<translation>Oras ning umpisa</translation>
</message>
diff --git a/src/qt/locale/bitcoin_pl.ts b/src/qt/locale/bitcoin_pl.ts
index 8a8c377480..ffbacfd492 100644
--- a/src/qt/locale/bitcoin_pl.ts
+++ b/src/qt/locale/bitcoin_pl.ts
@@ -87,11 +87,11 @@
</message>
<message>
<source>Comma separated file (*.csv)</source>
- <translation>CSV (rozdzielany przecinkami)</translation>
+ <translation>Pliki (*.csv) rozdzielone przecinkami</translation>
</message>
<message>
<source>Exporting Failed</source>
- <translation>Bล‚ฤ…d przy prรณbie eksportu</translation>
+ <translation>Bล‚ฤ…d przy prรณbie eksportowania</translation>
</message>
<message>
<source>There was an error trying to save the address list to %1. Please try again.</source>
@@ -137,7 +137,7 @@
</message>
<message>
<source>This operation needs your wallet passphrase to unlock the wallet.</source>
- <translation>Ta operacja wymaga hasล‚a do portfela aลผeby odblokowaฤ‡ portfel.</translation>
+ <translation>Operacja wymaga hasล‚a portfela, aby go odblokowaฤ‡.</translation>
</message>
<message>
<source>Unlock wallet</source>
@@ -145,7 +145,7 @@
</message>
<message>
<source>This operation needs your wallet passphrase to decrypt the wallet.</source>
- <translation>Ta operacja wymaga hasล‚a do portfela aลผeby odszyfrowaฤ‡ portfel.</translation>
+ <translation>Operacja wymaga hasล‚a portfela, aby go odszyfrowaฤ‡.</translation>
</message>
<message>
<source>Decrypt wallet</source>
@@ -161,7 +161,7 @@
</message>
<message>
<source>Warning: If you encrypt your wallet and lose your passphrase, you will &lt;b&gt;LOSE ALL OF YOUR BITCOINS&lt;/b&gt;!</source>
- <translation>Uwaga: Jeล›li zaszyfrujesz swรณj portfel i zgubisz hasล‚o to &lt;b&gt;STRACISZ WSZYSTKIE SWOJE BITCOIN'Y&lt;/b&gt;!</translation>
+ <translation>Uwaga: jeล›li zaszyfrujesz swรณj portfel i zgubisz hasล‚o &lt;b&gt;STRACISZ WSZYSTKIE SWOJE BITCOINY&lt;/b&gt;!</translation>
</message>
<message>
<source>Are you sure you wish to encrypt your wallet?</source>
@@ -169,15 +169,15 @@
</message>
<message>
<source>Bitcoin Core 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>Program Bitcoin Core 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>
+ <translation>Program Bitcoin Core zamknie siฤ™, aby dokoล„czyฤ‡ proces szyfrowania. Pamiฤ™taj, ลผe szyfrowanie portfela nie zabezpiecza w peล‚ni twoich bitcoinรณw przed kradzieลผฤ… przez zล‚oล›liwe oprogramowanie 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>
+ <translation>WAลปNE: Wszystkie wczeล›niejsze 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>Warning: The Caps Lock key is on!</source>
- <translation>Uwaga: Klawisz Caps Lock jest wล‚ฤ…czony!</translation>
+ <translation>Uwaga: klawisz Caps Lock jest wล‚ฤ…czony!</translation>
</message>
<message>
<source>Wallet encrypted</source>
@@ -185,7 +185,7 @@
</message>
<message>
<source>Enter the new passphrase to the wallet.&lt;br/&gt;Please use a passphrase of &lt;b&gt;ten or more random characters&lt;/b&gt;, or &lt;b&gt;eight or more words&lt;/b&gt;.</source>
- <translation>Wprowadลบ nowe hasล‚o do portfela.&lt;br/&gt;Proszฤ™ uลผywaฤ‡ hasล‚a zล‚oลผonego z &lt;b&gt;10 lub wiฤ™cej losowych znakรณw&lt;/b&gt; lub &lt;b&gt;oล›miu lub wiฤ™cej sล‚รณw.&lt;/b&gt;</translation>
+ <translation>Wprowadลบ nowe hasล‚o do portfela.&lt;br/&gt;Proszฤ™ uลผywaฤ‡ hasล‚a zล‚oลผonego z &lt;b&gt;10 lub wiฤ™cej losowych znakรณw&lt;/b&gt; albo &lt;b&gt;8 lub wiฤ™cej sล‚รณw.&lt;/b&gt;</translation>
</message>
<message>
<source>Enter the old passphrase and new passphrase to the wallet.</source>
@@ -224,7 +224,7 @@
<name>BanTableModel</name>
<message>
<source>IP/Netmask</source>
- <translation>IP/Maska Sieci</translation>
+ <translation>IP / maska podsieci</translation>
</message>
<message>
<source>Banned Until</source>
@@ -307,7 +307,7 @@
</message>
<message>
<source>Bitcoin Core client</source>
- <translation>Rdzeล„ klienta Bitcoin</translation>
+ <translation>Klient Rdzenia Bitcoina</translation>
</message>
<message>
<source>Importing blocks from disk...</source>
@@ -319,7 +319,7 @@
</message>
<message>
<source>Send coins to a Bitcoin address</source>
- <translation>Wyล›lij monety na adres Bitcoin</translation>
+ <translation>Wyล›lij monety na adres bitcoinowy</translation>
</message>
<message>
<source>Backup wallet to another location</source>
@@ -359,7 +359,7 @@
</message>
<message>
<source>Show information about Bitcoin Core</source>
- <translation>Pokaลผ informacje o Rdzeniu Bitcoin</translation>
+ <translation>Pokaลผ informacje o Rdzeniu Bitcoina</translation>
</message>
<message>
<source>&amp;Show / Hide</source>
@@ -371,7 +371,7 @@
</message>
<message>
<source>Encrypt the private keys that belong to your wallet</source>
- <translation>Szyfruj klucze prywatne, ktรณre sฤ… w Twoim portfelu</translation>
+ <translation>Szyfruj klucze prywatne, ktรณre sฤ… w twoim portfelu</translation>
</message>
<message>
<source>Sign messages with your Bitcoin addresses to prove you own them</source>
@@ -379,7 +379,7 @@
</message>
<message>
<source>Verify messages to ensure they were signed with specified Bitcoin addresses</source>
- <translation>Zweryfikuj wiadomoล›ฤ‡, aby upewniฤ‡ siฤ™, ลผe zostaล‚a podpisana podanym adresem Bitcoin.</translation>
+ <translation>Zweryfikuj wiadomoล›ฤ‡, aby upewniฤ‡ siฤ™, ลผe zostaล‚a podpisana podanym adresem bitcoinowym.</translation>
</message>
<message>
<source>&amp;File</source>
@@ -399,11 +399,11 @@
</message>
<message>
<source>Bitcoin Core</source>
- <translation>Rdzeล„ Bitcoin</translation>
+ <translation>Rdzeล„ Bitcoina</translation>
</message>
<message>
<source>Request payments (generates QR codes and bitcoin: URIs)</source>
- <translation>ลปฤ…daj pล‚atnoล›ci (generuje kod QR oraz bitcoin URI)</translation>
+ <translation>ลปฤ…daj pล‚atnoล›ci (generuje kod QR oraz bitcoinowe URI)</translation>
</message>
<message>
<source>&amp;About Bitcoin Core</source>
@@ -450,6 +450,10 @@
<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>
@@ -491,7 +495,7 @@
</message>
<message>
<source>Catching up...</source>
- <translation>Synchronizujฤ™ siฤ™...</translation>
+ <translation>Trwa synchronizacjaโ€ฆ</translation>
</message>
<message>
<source>Date: %1
@@ -810,11 +814,11 @@
</message>
<message>
<source>The entered address "%1" is already in the address book.</source>
- <translation>Wprowadzony adres "%1" juลผ istnieje w ksiฤ…ลผce adresowej.</translation>
+ <translation>Wprowadzony adres ยซ%1ยป juลผ istnieje w ksiฤ…ลผce adresowej.</translation>
</message>
<message>
<source>The entered address "%1" is not a valid Bitcoin address.</source>
- <translation>Wprowadzony adres "%1" nie jest poprawnym adresem Bitcoin.</translation>
+ <translation>Wprowadzony adres ยซ%1"ยป nie jest poprawnym adresem bitcoinowym.</translation>
</message>
<message>
<source>Could not unlock wallet.</source>
@@ -852,7 +856,7 @@
<name>HelpMessageDialog</name>
<message>
<source>Bitcoin Core</source>
- <translation>Rdzeล„ Bitcoin</translation>
+ <translation>Rdzeล„ Bitcoina</translation>
</message>
<message>
<source>version</source>
@@ -888,7 +892,7 @@
</message>
<message>
<source>Set language, for example "de_DE" (default: system locale)</source>
- <translation>Wybierz jฤ™zyk, na przykล‚ad "de_DE" (domyล›lnie: jฤ™zyk systemowy)</translation>
+ <translation>Wybierz jฤ™zyk, na przykล‚ad ยซde_DEยป (domyล›lnie: jฤ™zyk systemowy)</translation>
</message>
<message>
<source>Start minimized</source>
@@ -915,7 +919,7 @@
</message>
<message>
<source>Welcome to Bitcoin Core.</source>
- <translation>Witam w Bitcoin Core</translation>
+ <translation>Witaj w Bitcoin Core</translation>
</message>
<message>
<source>As this is the first time the program is launched, you can choose where Bitcoin Core will store its data.</source>
@@ -923,7 +927,7 @@
</message>
<message>
<source>Bitcoin Core will download and store a copy of the Bitcoin block chain. At least %1GB 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>Program pobierze i bฤ™dzie przechowywaล‚ kopiฤ™ ล‚aล„cucha blokรณw Bitcoin. W wybranym katalogu musi byฤ‡ przynajmniej %1GB miejsca, a z czasem iloล›ฤ‡ danych bฤ™dzie rosล‚a. Portfel bฤ™dzie przechowywany w tym samym katalogu.</translation>
+ <translation>Program pobierze i bฤ™dzie przechowywaล‚ kopiฤ™ ล‚aล„cucha blokรณw bitcoinowych. W wybranym katalogu musi byฤ‡ przynajmniej %1ย GB miejsca, a z czasem iloล›ฤ‡ danych bฤ™dzie rosล‚a. Portfel bฤ™dzie przechowywany w tym samym katalogu.</translation>
</message>
<message>
<source>Use the default data directory</source>
@@ -935,11 +939,11 @@
</message>
<message>
<source>Bitcoin Core</source>
- <translation>Rdzeล„ Bitcoin</translation>
+ <translation>Rdzeล„ Bitcoina</translation>
</message>
<message>
<source>Error: Specified data directory "%1" cannot be created.</source>
- <translation>Bล‚ฤ…d: Okreล›lony folder danych "%1" nie mรณgล‚ zostaฤ‡ utworzony.</translation>
+ <translation>Bล‚ฤ…d: podany folder danych ยซ%1ยป nie mรณgล‚ zostaฤ‡ utworzony.</translation>
</message>
<message>
<source>Error</source>
@@ -1037,7 +1041,7 @@
</message>
<message>
<source>&amp;Reset Options</source>
- <translation>Z&amp;resetuj Ustawienia</translation>
+ <translation>Z&amp;resetuj ustawienia</translation>
</message>
<message>
<source>&amp;Network</source>
@@ -1049,7 +1053,7 @@
</message>
<message>
<source>&amp;Start Bitcoin Core on system login</source>
- <translation>Uruchamiaj Bitcoin wraz z zalogowaniem do &amp;systemu</translation>
+ <translation>Uruchamiaj Bitcoin Core wraz z zalogowaniem do &amp;systemu</translation>
</message>
<message>
<source>(0 = auto, &lt;0 = leave that many cores free)</source>
@@ -1093,7 +1097,7 @@
</message>
<message>
<source>Proxy &amp;IP:</source>
- <translation>Proxy &amp;IP: </translation>
+ <translation>&amp;IP proxy: </translation>
</message>
<message>
<source>&amp;Port:</source>
@@ -1104,6 +1108,10 @@
<translation>Port proxy (np. 9050)</translation>
</message>
<message>
+ <source>Used for reaching peers via:</source>
+ <translation>Uลผyto do poล‚ฤ…czenia z peerami przy pomocy:</translation>
+ </message>
+ <message>
<source>Shows, if the supplied default SOCKS5 proxy is used to reach peers via this network type.</source>
<translation>Pokazuje, czy wspierane domyล›lnie proxy SOCKS5 jest uลผywane do ล‚ฤ…czenia siฤ™ z peerami w tej sieci</translation>
</message>
@@ -1120,8 +1128,12 @@
<translation>Tor</translation>
</message>
<message>
+ <source>Connect to the Bitcoin network through a separate SOCKS5 proxy for Tor hidden services.</source>
+ <translation>Poล‚ฤ…cz siฤ™ z sieciฤ… Bitcoin przy pomocy oddzielnego SOCKS5 proxy dla sieci TOR</translation>
+ </message>
+ <message>
<source>Use separate SOCKS5 proxy to reach peers via Tor hidden services:</source>
- <translation>Uลผyj oddzielnego prozy SOCKS5 aby osiฤ…gnฤ…ฤ‡ wฤ™zล‚y w ukrytych usล‚ugach Tor:</translation>
+ <translation>Uลผyj oddzielnego proxy SOCKS5 aby osiฤ…gnฤ…ฤ‡ wฤ™zล‚y w ukrytych usล‚ugach Tor:</translation>
</message>
<message>
<source>&amp;Window</source>
@@ -1133,7 +1145,7 @@
</message>
<message>
<source>&amp;Minimize to the tray instead of the taskbar</source>
- <translation>&amp;Minimalizuj do paska przy zegarku zamiast do paska zadaล„</translation>
+ <translation>&amp;Minimalizuj do zasobnika systemowego zamiast do paska zadaล„</translation>
</message>
<message>
<source>M&amp;inimize on close</source>
@@ -1145,7 +1157,7 @@
</message>
<message>
<source>User Interface &amp;language:</source>
- <translation>Jฤ™zyk &amp;Uลผytkownika:</translation>
+ <translation>Jฤ™zyk &amp;uลผytkownika:</translation>
</message>
<message>
<source>&amp;Unit to show amounts in:</source>
@@ -1240,7 +1252,7 @@
</message>
<message>
<source>Total:</source>
- <translation>Wynosi ogรณล‚em:</translation>
+ <translation>Ogรณล‚em:</translation>
</message>
<message>
<source>Your current total balance</source>
@@ -1385,7 +1397,7 @@
</message>
<message>
<source>Enter a Bitcoin address (e.g. %1)</source>
- <translation>Wprowadลบ adres Bitcoin (np. %1)</translation>
+ <translation>Wprowadลบ adres bitcoinowy (np. %1)</translation>
</message>
<message>
<source>%1 d</source>
@@ -1428,7 +1440,7 @@
</message>
<message>
<source>Save QR Code</source>
- <translation>Zapisz Kod QR</translation>
+ <translation>Zapisz kod QR</translation>
</message>
<message>
<source>PNG Image (*.png)</source>
@@ -1462,10 +1474,6 @@
<translation>Ogรณlne</translation>
</message>
<message>
- <source>Using OpenSSL version</source>
- <translation>Uลผywana wersja OpenSSL</translation>
- </message>
- <message>
<source>Using BerkeleyDB version</source>
<translation>Uลผywana wersja BerkeleyDB </translation>
</message>
@@ -1494,6 +1502,10 @@
<translation>Aktualna liczba blokรณw</translation>
</message>
<message>
+ <source>Memory Pool</source>
+ <translation>Memory Pool (obszar pamiฤ™ci)</translation>
+ </message>
+ <message>
<source>Current number of transactions</source>
<translation>Obecna liczba transakcji</translation>
</message>
@@ -1630,10 +1642,30 @@
<translation>Wyczyล›ฤ‡ konsolฤ™</translation>
</message>
<message>
+ <source>&amp;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 &amp;hour</source>
+ <translation>1 &amp;godzina</translation>
+ </message>
+ <message>
+ <source>1 &amp;day</source>
+ <translation>1 &amp;dzieล„</translation>
+ </message>
+ <message>
+ <source>1 &amp;week</source>
+ <translation>1 &amp;tydzieล„</translation>
+ </message>
+ <message>
+ <source>1 &amp;year</source>
+ <translation>1 &amp;rok</translation>
+ </message>
+ <message>
<source>&amp;Unban Node</source>
<translation>Odblokuj wฤ™zeล‚</translation>
</message>
@@ -2299,6 +2331,11 @@
<translation>&amp;Zweryfikuj wiadomoล›ฤ‡</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>Wpisz adres, wiadomoล›ฤ‡ oraz sygnaturฤ™ (podpis) odbiorcy (upewnij siฤ™, ลผe dokล‚adnie skopiujesz wszystkie zakoล„czenia linii, spacje, tabulacje itp.). Uwaลผaj by nie dodaฤ‡ wiฤ™cej do podpisu niลผ do samej podpisywanej wiadomoล›ci by uniknฤ…ฤ‡ ataku man-in-the-middle.
+Zwrรณฤ‡ uwagฤ™, ลผe poprawnie zweryfikowana wiadomoล›ฤ‡ potwierdza to, ลผe nadawca posiada klucz do adresu, natomiast nie potwierdza to, ลผe poprawne wysล‚anie jakiejkolwiek transakcji! </translation>
+ </message>
+ <message>
<source>The Bitcoin address the message was signed with</source>
<translation>Adres Bitcoin, ktรณrym zostaล‚a podpisana wiadomoล›ฤ‡</translation>
</message>
@@ -2371,7 +2408,7 @@
<name>SplashScreen</name>
<message>
<source>Bitcoin Core</source>
- <translation>Rdzeล„ Bitcoin</translation>
+ <translation>Rdzeล„ Bitcoina</translation>
</message>
<message>
<source>The Bitcoin Core developers</source>
@@ -2838,11 +2875,11 @@
</message>
<message>
<source>Backup Wallet</source>
- <translation>Kopia Zapasowa Portfela</translation>
+ <translation>Kopia zapasowa portfela</translation>
</message>
<message>
<source>Wallet Data (*.dat)</source>
- <translation>Dane Portfela (*.dat)</translation>
+ <translation>Dane portfela (*.dat)</translation>
</message>
<message>
<source>Backup Failed</source>
@@ -2858,7 +2895,7 @@
</message>
<message>
<source>Backup Successful</source>
- <translation>Wykonano Kopiฤ™ Zapasowฤ…</translation>
+ <translation>Wykonano kopiฤ™ zapasowฤ…</translation>
</message>
</context>
<context>
@@ -2884,6 +2921,18 @@
<translation>Akceptuj liniฤ™ poleceล„ oraz polecenia JSON-RPC</translation>
</message>
<message>
+ <source>If &lt;category&gt; is not supplied or if &lt;category&gt; = 1, output all debugging information.</source>
+ <translation>Jeลผeli &lt;category&gt; nie zostanie okreล›lona lub &lt;category&gt; = 1, wyล›wietl wszystkie informacje debugowania.</translation>
+ </message>
+ <message>
+ <source>Please check that your computer's date and time are correct! If your clock is wrong Bitcoin Core 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, Bitcoin Core nie bฤ™dzie dziaล‚aล‚ prawidล‚owo.</translation>
+ </message>
+ <message>
+ <source>Prune configured below the minimum of %d MiB. Please use a higher number.</source>
+ <translation>Przycinanie skonfigurowano poniลผej minimalnych %d MiB. Proszฤ™ uลผyฤ‡ wyลผszej liczby.</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>
@@ -2908,6 +2957,10 @@
<translation>Akceptuj poล‚ฤ…czenia z zewnฤ…trz (domyล›lnie: 1 jeล›li nie ustawiono -proxy lub -connect)</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>
+ </message>
+ <message>
<source>Bind to given address and always listen on it. Use [host]:port notation for IPv6</source>
<translation>Skojarz z podanym adresem i nasล‚uchuj na nim. Uลผyj formatu [host]:port dla IPv6</translation>
</message>
@@ -2924,6 +2977,10 @@
<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>Set the number of script verification threads (%u to %d, 0 = auto, &lt;0 = leave that many cores free, default: %d)</source>
<translation>Ustaw liczbฤ™ wฤ…tkรณw skryptu weryfikacyjnego (%u do %d, 0 = auto, &lt;0 = zostaw tyle rdzeni wolnych, domyล›lnie: %d)</translation>
</message>
@@ -2936,6 +2993,14 @@
<translation>Nie moลผna przywiฤ…zaฤ‡ z portem %s na tym komputerze. Bitcoin Core prawdopodobnie juลผ dziaล‚a.</translation>
</message>
<message>
+ <source>Unsupported argument -whitelistalwaysrelay ignored, use -whitelistrelay and/or -whitelistforcerelay.</source>
+ <translation>Niewspierany argument -whitelistalwaysrelay zignorowany, uลผyj -whitelistrelay i/lub -whitelistforcerelay.</translation>
+ </message>
+ <message>
+ <source>Use UPnP to map the listening port (default: 1 when listening and no -proxy)</source>
+ <translation>Uลผywaj UPnP do mapowania portu nasล‚uchu (domyล›lnie: 1 gdy nasล‚uchuje i brak -proxy)</translation>
+ </message>
+ <message>
<source>WARNING: abnormally high number of blocks generated, %d blocks received in the last %d hours (%d expected)</source>
<translation>UWAGA: nienaturalnie duลผa liczba wygenerowanych blokรณw, %d blokรณw otrzymano w ostatnich %d godzinach (%d oczekiwanych)</translation>
</message>
@@ -2960,6 +3025,10 @@
<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>-maxmempool must be at least %d MB</source>
+ <translation>-maxmempool musi byฤ‡ przynajmniej %d MB</translation>
+ </message>
+ <message>
<source>&lt;category&gt; can be:</source>
<translation>&lt;category&gt; mogฤ… byฤ‡:</translation>
</message>
@@ -2992,6 +3061,10 @@
<translation>Czy chcesz teraz przebudowaฤ‡ bazฤ™ blokรณw?</translation>
</message>
<message>
+ <source>Enable publish hash block in &lt;address&gt;</source>
+ <translation>Wล‚ฤ…cz wyล›wietlanie hasha bloku w &lt;address&gt;</translation>
+ </message>
+ <message>
<source>Error initializing block database</source>
<translation>Bล‚ฤ…d inicjowania bazy danych blokรณw</translation>
</message>
@@ -3028,6 +3101,14 @@
<translation>Nieprawidล‚owy adres -onion: '%s'</translation>
</message>
<message>
+ <source>Invalid amount for -fallbackfee=&lt;amount&gt;: '%s'</source>
+ <translation>Nieprawidล‚owa kwota dla -fallbackfee=&lt;amount&gt;: '%s'</translation>
+ </message>
+ <message>
+ <source>Keep the transaction memory pool below &lt;n&gt; megabytes (default: %u)</source>
+ <translation>Utrzymuj obszar pamiฤ™ci dla transakcji poniลผej &lt;n&gt; MB (default: %u)</translation>
+ </message>
+ <message>
<source>Not enough file descriptors available.</source>
<translation>Brak wystarczajฤ…cej liczby deskryptorรณw plikรณw. </translation>
</message>
@@ -3036,6 +3117,10 @@
<translation>ลฤ…cz z wฤ™zล‚ami tylko w sieci &lt;net&gt; (ipv4, piv6 lub onion)</translation>
</message>
<message>
+ <source>Print version and exit</source>
+ <translation>Wyล›wietl wersjฤ™ i wyjdลบ</translation>
+ </message>
+ <message>
<source>Prune cannot be configured with a negative value.</source>
<translation>Przycinanie nie moลผe byฤ‡ skonfigurowane z negatywnฤ… wartoล›ciฤ….</translation>
</message>
@@ -3064,10 +3149,18 @@
<translation>Niewspierany argument -debugnet zignorowany, uลผyj -debug=net.</translation>
</message>
<message>
+ <source>Unsupported argument -tor found, use -onion.</source>
+ <translation>Znaleziono nieprawidล‚owy argument -tor, uลผyj -onion.</translation>
+ </message>
+ <message>
<source>Use UPnP to map the listening port (default: %u)</source>
<translation>Uลผyj UPnP do przekazania portu nasล‚uchu (domyล›lnie : %u)</translation>
</message>
<message>
+ <source>User Agent comment (%s) contains unsafe characters.</source>
+ <translation>Komentarz User Agent (%s) zawiera niebezpieczne znaki.</translation>
+ </message>
+ <message>
<source>Verifying blocks...</source>
<translation>Weryfikacja blokรณw...</translation>
</message>
@@ -3084,10 +3177,6 @@
<translation>Opcje portfela:</translation>
</message>
<message>
- <source>Warning: This version is obsolete; upgrade required!</source>
- <translation>Uwaga: Ta wersja jest przestarzaล‚a, wymagana jest aktualizacja!</translation>
- </message>
- <message>
<source>You need to rebuild the database using -reindex to change -txindex</source>
<translation>Musisz przebudowaฤ‡ bazฤ™ uลผywajฤ…c parametru -reindex aby zmieniฤ‡ -txindex</translation>
</message>
@@ -3172,10 +3261,6 @@
<translation>Aktywuje najlepszy ล‚aล„cuch</translation>
</message>
<message>
- <source>Always relay transactions received from whitelisted peers (default: %d)</source>
- <translation>Zawsze przekazuj informacje o transakcjach otrzymanych od osรณb z biaล‚ej listy (domyล›lnie: %d)</translation>
- </message>
- <message>
<source>Attempt to recover private keys from a corrupt wallet.dat on startup</source>
<translation>Prรณbuj podczas uruchamiania programu odzyskaฤ‡ klucze prywatne z uszkodzonego pliku wallet.dat</translation>
</message>
@@ -3260,6 +3345,10 @@
<translation>Odbieranie i wyล›wietlanie alertรณw sieci P2P (domyล›lnie: %u)</translation>
</message>
<message>
+ <source>Reducing -maxconnections from %d to %d, because of system limitations.</source>
+ <translation>Zmniejszanie -maxconnections z %d do %d z powodu ograniczeล„ systemu.</translation>
+ </message>
+ <message>
<source>Rescan the block chain for missing wallet transactions on startup</source>
<translation>Przeskanuj podczas ล‚adowania programu ล‚aล„cuch blokรณw w poszukiwaniu zaginionych transakcji portfela</translation>
</message>
@@ -3336,6 +3425,10 @@
<translation>Usuwam wszystkie transakcje z portfela...</translation>
</message>
<message>
+ <source>ZeroMQ notification options:</source>
+ <translation>Opcje powiadomieล„ ZeroMQ:</translation>
+ </message>
+ <message>
<source>wallet.dat corrupt, salvage failed</source>
<translation>wallet.dat uszkodzony, odtworzenie siฤ™ nie powiodล‚o</translation>
</message>
@@ -3368,14 +3461,26 @@
<translation>(1 = zachowaj wysล‚ane metadane np. wล‚aล›ciciel konta i informacje o ลผฤ…daniach pล‚atnoล›ci, 2 = porzuฤ‡ wysล‚ane metadane)</translation>
</message>
<message>
+ <source>-maxtxfee is set very high! Fees this large could be paid on a single transaction.</source>
+ <translation>-matxfee jest ustawione bardzo wysokie! 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 &lt;n&gt; hours (default: %u)</source>
- <translation>Nie trzymaj w pamiฤ™ci transakcji starszych niลผ &lt;n&gt; godzin (domyล›lnie: %u)</translation>
+ <translation>Nie trzymaj w pamiฤ™ci transakcji starszych niลผ &lt;n&gt; godz. (domyล›lnie: %u)</translation>
</message>
<message>
<source>Error reading wallet.dat! All keys read correctly, but transaction data or address book entries might be missing or incorrect.</source>
<translation>Ostrzeลผenie: bล‚ฤ…d odczytu wallet.dat! Wszystkie klucze zostaล‚y odczytane, ale moลผe brakowaฤ‡ pewnych danych transakcji lub wpisรณw w ksiฤ…ลผce adresowej lub mogฤ… one byฤ‡ nieprawidล‚owe.</translation>
</message>
<message>
+ <source>Fees (in %s/kB) smaller than this are considered zero fee for transaction creation (default: %s)</source>
+ <translation>Opล‚aty (w %s/Kb) mniejsze niลผ ta bฤ™dฤ… traktowane jako bez opล‚aty przy tworzeniu transakcji (domyล›lnie: %s)</translation>
+ </message>
+ <message>
<source>How thorough the block verification of -checkblocks is (0-4, default: %u)</source>
<translation>Jak dokล‚adna jest weryfikacja blokรณw przy -checkblocks (0-4, domyล›lnie: %u)</translation>
</message>
@@ -3392,6 +3497,18 @@
<translation>Wypuล›ฤ‡ informacje debugowania (domyล›lnie: %u, podanie &lt;category&gt; jest opcjonalne)</translation>
</message>
<message>
+ <source>Support filtering of blocks and transaction with bloom filters (default: %u)</source>
+ <translation>Wspieraj filtrowanie blokรณw i transakcji uลผywajฤ…c Filtrรณw Blooma (domyล›lnie: %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>Caล‚kowita dล‚ugoล›ฤ‡ ล‚aล„cucha wersji (%i) przekracza maksymalnฤ… dopuszczalnฤ… dล‚ugoล›ฤ‡ (%i). Zmniejsz iloล›ฤ‡ lub rozmiar parametru 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>Prรณbuje utrzymaฤ‡ ruch wychodzฤ…cy poniลผej zadanego (w MiB na dobฤ™), 0 = bez limitu (domyล›lnie: %d)</translation>
+ </message>
+ <message>
<source>Unsupported argument -socks found. Setting SOCKS version isn't possible anymore, only SOCKS5 proxies are supported.</source>
<translation>Znaleziono niewspierany argument -socks. Wybieranie wersji SOCKS nie jest juลผ moลผliwe, wsparcie programu obejmuje tylko proxy SOCKS5</translation>
</message>
diff --git a/src/qt/locale/bitcoin_pt_BR.ts b/src/qt/locale/bitcoin_pt_BR.ts
index 5cea349fbc..1b92395c79 100644
--- a/src/qt/locale/bitcoin_pt_BR.ts
+++ b/src/qt/locale/bitcoin_pt_BR.ts
@@ -387,7 +387,7 @@
</message>
<message>
<source>&amp;Settings</source>
- <translation>&amp;definiรงรตes</translation>
+ <translation>&amp;Definiรงรตes</translation>
</message>
<message>
<source>&amp;Help</source>
@@ -723,7 +723,7 @@
</message>
<message>
<source>none</source>
- <translation>nenhum</translation>
+ <translation>Nenhum</translation>
</message>
<message>
<source>This label turns red if the transaction size is greater than 1000 bytes.</source>
@@ -1033,7 +1033,7 @@
</message>
<message>
<source>Active command-line options that override above options:</source>
- <translation>Ativa as opรงรตes de linha de comando que sobrescreve as opรงรตes acima:</translation>
+ <translation>Opรงรตes de linha de comando ativas que sobrescreve as opรงรตes acima:</translation>
</message>
<message>
<source>Reset all client options to default.</source>
@@ -1185,7 +1185,7 @@
</message>
<message>
<source>none</source>
- <translation>nenhum</translation>
+ <translation>Nenhum</translation>
</message>
<message>
<source>Confirm options reset</source>
@@ -1474,10 +1474,6 @@
<translation>Geral</translation>
</message>
<message>
- <source>Using OpenSSL version</source>
- <translation>Versรฃo do OpenSSL</translation>
- </message>
- <message>
<source>Using BerkeleyDB version</source>
<translation>Versรฃo do BerkeleyDB</translation>
</message>
@@ -1975,7 +1971,7 @@
</message>
<message>
<source>collapse fee-settings</source>
- <translation>colapso Taxa de definiรงรตes</translation>
+ <translation>Ocultar painel</translation>
</message>
<message>
<source>per kilobyte</source>
@@ -2340,7 +2336,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>Coloque o endereรงo do destinatรกrio, a mensagem (certifique-se de copiar toda a mensagem, incluindo quebras de linha, espaรงos, tabulaรงรตes, etc.) e a assinatura embaixo para verificar a mensagem. Cuidado para nรฃo ler mais da assinatura do que estรก assinado na mensagem, para evitar ser enganado pelo ataque man-in-the-middle. Note que isso somente prova a propriedade de um endereรงo, e nรฃo o remetende de qualquer transaรงรฃo.</translation>
+ <translation>Coloque o endereรงo do autor, a mensagem (certifique-se de copiar toda a mensagem, incluindo quebras de linha, espaรงos, tabulaรงรตes, etc.) e a assinatura embaixo para verificar a mensagem. Cuidado para nรฃo ler mais da assinatura do que estรก assinado na mensagem, para evitar ser enganado pelo ataque man-in-the-middle. Note que isso somente prova a propriedade de um endereรงo, e nรฃo o remetende de qualquer transaรงรฃo.</translation>
</message>
<message>
<source>The Bitcoin address the message was signed with</source>
@@ -2980,6 +2976,18 @@
<translation>Aceitar conexรตes externas (padrรฃo: 1 se opรงรตes -proxy ou -connect nรฃo estiverem presentes)</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>
+ </message>
+ <message>
+ <source>A fee rate (in %s/kB) that will be used when fee estimation has insufficient data (default: %s)</source>
+ <translation>A variaรงรฃo da taxa (em %s/kB) que serรก usada quando nรฃo houver dados suficientes para se estimar a taxa (default: %s)</translation>
+ </message>
+ <message>
+ <source>Accept relayed transactions received from whitelisted peers even when not relaying transactions (default: %d)</source>
+ <translation>Aceita transaรงรตes retransmitidas advindas de pares em lista branca, mesmo quando nรฃo estiver retransmitindo transaรงรตes (padrรฃo: %d)</translation>
+ </message>
+ <message>
<source>Bind to given address and always listen on it. Use [host]:port notation for IPv6</source>
<translation>Vincular ao endereรงo fornecido e sempre escutar nele. Use a notaรงรฃo [host]:port para IPv6</translation>
</message>
@@ -2996,6 +3004,10 @@
<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>
+ </message>
+ <message>
<source>Set the number of script verification threads (%u to %d, 0 = auto, &lt;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, &lt;0 = nรบmero de cores deixados livres, padrรฃo: %d)</translation>
</message>
@@ -3012,6 +3024,10 @@
<translation>Impossรญvel ouvir em %s neste computador. Provavelmente o Bitcoin jรก estรก sendo executado.</translation>
</message>
<message>
+ <source>Unsupported argument -whitelistalwaysrelay ignored, use -whitelistrelay and/or -whitelistforcerelay.</source>
+ <translation>Argumento nรฃo suportado -whitelistalwaysrelay foi ignorado, utilize -whitelistrelay e/ou -whitelistforcerelay.</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>
@@ -3028,6 +3044,10 @@
<translation>Atenรงรฃo: A rede nรฃo parecem concordar plenamente! Alguns mineiros parecem estar enfrentando problemas.</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: 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>
</message>
@@ -3048,6 +3068,10 @@
<translation>&lt;category&gt; pode ser:</translation>
</message>
<message>
+ <source>Append comment to the user agent string</source>
+ <translation>Adiciona comentรกrio ao user-agent do navegador</translation>
+ </message>
+ <message>
<source>Block creation options:</source>
<translation>Opรงรตes de criaรงรฃo de blocos:</translation>
</message>
@@ -3092,6 +3116,10 @@
<translation>Abilitar a publicaรงรฃo dos dados brutos da transaรงรฃo em &lt;endereรงo&gt;</translation>
</message>
<message>
+ <source>Enable transaction replacement in the memory pool (default: %u)</source>
+ <translation>Habilita substituiรงรฃo de transaรงรฃo em memรณria (padrรฃo: %u)</translation>
+ </message>
+ <message>
<source>Error initializing block database</source>
<translation>Erro ao inicializar banco de dados de blocos</translation>
</message>
@@ -3128,10 +3156,22 @@
<translation>Endereรงo -onion invรกlido: '%s'</translation>
</message>
<message>
+ <source>Invalid amount for -fallbackfee=&lt;amount&gt;: '%s'</source>
+ <translation>Valor invรกlido para -fallbackfee=&lt;amount&gt;: '%s'</translation>
+ </message>
+ <message>
<source>Keep the transaction memory pool below &lt;n&gt; megabytes (default: %u)</source>
<translation>Mantenha a mempool de transaรงรตes abaixo de &lt;n&gt; 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>
+ </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>
+ </message>
+ <message>
<source>Not enough file descriptors available.</source>
<translation>Decriptadores de arquivos disponรญveis insuficientes.</translation>
</message>
@@ -3140,6 +3180,10 @@
<translation>Somente conectar a clientes na rede &lt;net&gt; (ipv4, ipv6 ou onion)</translation>
</message>
<message>
+ <source>Print version and exit</source>
+ <translation>Mostra a versรฃo e sai</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>
</message>
@@ -3196,10 +3240,6 @@
<translation>Opรงรตes da carteira:</translation>
</message>
<message>
- <source>Warning: This version is obsolete; upgrade required!</source>
- <translation>Atenรงรฃo: Essa versรฃo estรก obsoleta, atualizaรงรฃo necessรกria!</translation>
- </message>
- <message>
<source>You need to rebuild the database using -reindex to change -txindex</source>
<translation>Vocรช precisa reconstruir o banco de dados utilizando -reindex</translation>
</message>
@@ -3273,7 +3313,7 @@
</message>
<message>
<source>This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit &lt;https://www.openssl.org/&gt; 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&lt;https://www.openssl.org/&gt; e software criptogrรกfico escrito por Eric Young e software UPnP escrito por Thomas Bernard. </translation>
+ <translation>Esse produto inclui software desenvolvido pelo Open SSL Project para uso na OpenSSL Toolkit &lt;https://www.openssl.org&gt; 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>
@@ -3296,10 +3336,6 @@
<translation>Ativando a melhor sequรชncia...</translation>
</message>
<message>
- <source>Always relay transactions received from whitelisted peers (default: %d)</source>
- <translation>Sempre transmitir transaรงรตes recebidas de peers confiรกveis (padrรฃo: %d)</translation>
- </message>
- <message>
<source>Attempt to recover private keys from a corrupt wallet.dat on startup</source>
<translation>Tentar recuperar na inicializaรงรฃo chaves privadas de um arquivo wallet.dat corrompido</translation>
</message>
@@ -3384,6 +3420,14 @@
<translation>Receba e mostre P2P alerta de rede (padrรฃo: %u)</translation>
</message>
<message>
+ <source>Reducing -maxconnections from %d to %d, because of system limitations.</source>
+ <translation>Reduzindo -maxconnections de %d para %d, devido a limitaรงรตes do sistema</translation>
+ </message>
+ <message>
+ <source>Rescan the block chain for missing wallet transactions on startup</source>
+ <translation>Re-escanear a block-chain por transaรงรตes faltantes na carteira durante a inicializaรงรฃo</translation>
+ </message>
+ <message>
<source>Send trace/debug info to console instead of debug.log file</source>
<translation>Mandar informaรงรฃo de trace/debug para o console em vez de para o arquivo debug.log</translation>
</message>
@@ -3412,6 +3456,14 @@
<translation>Este รฉ um software experimental.</translation>
</message>
<message>
+ <source>Tor control port password (default: empty)</source>
+ <translation>Senha da porta de controle do Tor (padrรฃo: vazio)</translation>
+ </message>
+ <message>
+ <source>Tor control port to use if onion listening enabled (default: %s)</source>
+ <translation>Porta de controle a ser usada se o monitoramento onion estiver habilitado (padrรฃo: %s)</translation>
+ </message>
+ <message>
<source>Transaction amount too small</source>
<translation>Quantidade da transaรงรฃo muito pequena.</translation>
</message>
@@ -3432,6 +3484,10 @@
<translation>Impossรญvel se ligar a %s neste computador (bind retornou erro %s)</translation>
</message>
<message>
+ <source>Upgrade wallet to latest format on startup</source>
+ <translation>Atualizar a carteira para o รบltimo formato na inicializaรงรฃo</translation>
+ </message>
+ <message>
<source>Username for JSON-RPC connections</source>
<translation>Nome de usuรกrio para conexรตes JSON-RPC</translation>
</message>
@@ -3444,10 +3500,22 @@
<translation>Atenรงรฃo</translation>
</message>
<message>
+ <source>Warning: unknown new rules activated (versionbit %i)</source>
+ <translation>Aviso: Novas regras estranhas foram ativadas (versionbit %i)</translation>
+ </message>
+ <message>
+ <source>Whether to operate in a blocks only mode (default: %u)</source>
+ <translation>Quando operar em modo de blocos somente (padrรฃp: %u)</translation>
+ </message>
+ <message>
<source>Zapping all transactions from wallet...</source>
<translation>Aniquilando todas as transaรงรตes da carteira...</translation>
</message>
<message>
+ <source>ZeroMQ notification options:</source>
+ <translation>Opรงรตes de notificaรงรฃo ZeroMQ:</translation>
+ </message>
+ <message>
<source>wallet.dat corrupt, salvage failed</source>
<translation>wallet.dat corrompido, recuperaรงรฃo falhou</translation>
</message>
@@ -3476,14 +3544,70 @@
<translation>Erro ao carregar wallet.dat: Carteira corrompida</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 = manter metadados tx e.g. informaรงรฃo do dono da conta e requisiรงรฃo de pagamente, 2 = descartar metadados tx)</translation>
+ </message>
+ <message>
+ <source>-maxtxfee is set very high! Fees this large could be paid on a single transaction.</source>
+ <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 &lt;n&gt; hours (default: %u)</source>
+ <translation>Nรฃo manter transaรงรตes na mempool por mais que &lt;n&gt; horas (padrรฃo: %u)</translation>
+ </message>
+ <message>
+ <source>Error reading wallet.dat! All keys read correctly, but transaction data or address book entries might be missing or incorrect.</source>
+ <translation>Erro ao ler o arquivo wallet.dat! Todas as chaves foram lidas corretamente, mas os dados de transaรงรตes ou o livro de endereรงos podem estar faltando ou ser incorretos.</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>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>
+ <message>
+ <source>Maintain a full transaction index, used by the getrawtransaction rpc call (default: %u)</source>
+ <translation>Mantรฉm um รญndice completo de transaรงรตes, usado pela chamada rpc getrawtransaction (padrรฃo: %u)</translation>
+ </message>
+ <message>
+ <source>Number of seconds to keep misbehaving peers from reconnecting (default: %u)</source>
+ <translation>Nรบmero de segundos para impedir que peers mal comportados reconectem (padrรฃo %u)</translation>
+ </message>
+ <message>
+ <source>Output debugging information (default: %u, supplying &lt;category&gt; is optional)</source>
+ <translation>Informaรงรฃo de saรญda de debug (padrรฃo: %u, definir &lt;category&gt; รฉ opcional)</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>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>
+ <message>
+ <source>Tries to keep outbound traffic under the given target (in MiB per 24h), 0 = no limit (default: %d)</source>
+ <translation>Tenta manter trรกfego fora dos limites dentro do alvo especificado (em MiB por 24h), 0 = sem limite (padrรฃo: %d)</translation>
+ </message>
+ <message>
+ <source>Unsupported argument -socks found. Setting SOCKS version isn't possible anymore, only SOCKS5 proxies are supported.</source>
+ <translation>Argumento invรกlido -socks encontrado. Definir a versรฃo do SOCKS nรฃo รฉ mais possรญvel, somente proxys SOCK5 sรฃo suportados.</translation>
+ </message>
+ <message>
<source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: %s)</source>
<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 &lt;userpw&gt; comes in the format: &lt;USERNAME&gt;:&lt;SALT&gt;$&lt;HASH&gt;. 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 &lt;userpw&gt; vem com o formato: &lt;USERNAME&gt;:&lt;SALT&gt;$&lt;HASH&gt;. Um script python canรดnico รฉ incluรญdo em share/rpcuser. Essa opรงรฃo pode ser especificada mรบltiplas vezes.</translation>
+ </message>
+ <message>
<source>(default: %s)</source>
<translation>(padrรฃo: %s)</translation>
</message>
@@ -3532,10 +3656,18 @@
<translation>Buffer mรกximo de recebimento por conexรฃo, &lt;n&gt;*1000 bytes (padrรฃo: %u)</translation>
</message>
<message>
+ <source>Maximum per-connection send buffer, &lt;n&gt;*1000 bytes (default: %u)</source>
+ <translation>Buffer mรกximo de envio por conexรฃo, &lt;n&gt;*1000 bytes (padrรฃo: %u)</translation>
+ </message>
+ <message>
<source>Prepend debug output with timestamp (default: %u)</source>
<translation>Adiciona timestamp como prefixo no debug (padrรฃo: %u)</translation>
</message>
<message>
+ <source>Relay and mine data carrier transactions (default: %u)</source>
+ <translation>Transaรงรตes de dados de operadora (padrรฃo: %u)</translation>
+ </message>
+ <message>
<source>Relay non-P2SH multisig (default: %u)</source>
<translation>Retransmitir P2SH nรฃo multisig (padrรฃo: %u)</translation>
</message>
@@ -3568,6 +3700,10 @@
<translation>Gastar troco nรฃo confirmado quando enviar transaรงรตes (padrรฃo: %u)</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>Unknown network specified in -onlynet: '%s'</source>
<translation>Rede desconhecida especificada em -onlynet: '%s'</translation>
</message>
diff --git a/src/qt/locale/bitcoin_pt_PT.ts b/src/qt/locale/bitcoin_pt_PT.ts
index ffed44a61c..362769138a 100644
--- a/src/qt/locale/bitcoin_pt_PT.ts
+++ b/src/qt/locale/bitcoin_pt_PT.ts
@@ -3,7 +3,7 @@
<name>AddressBookPage</name>
<message>
<source>Right-click to edit address or label</source>
- <translation>Clique รก direita para editar endereรงo ou rรณtulo</translation>
+ <translation>Clique com o botรฃo direito para editar o endereรงo ou rรณtulo</translation>
</message>
<message>
<source>Create a new address</source>
@@ -31,11 +31,11 @@
</message>
<message>
<source>Delete the currently selected address from the list</source>
- <translation>Apagar o endereรงo selecionado da lista</translation>
+ <translation>Eliminar o endereรงo selecionado da lista</translation>
</message>
<message>
<source>Export the data in the current tab to a file</source>
- <translation>Exportar os dados no separador actual para um ficheiro</translation>
+ <translation>Exportar os dados no separador atual para um ficheiro</translation>
</message>
<message>
<source>&amp;Export</source>
@@ -43,15 +43,15 @@
</message>
<message>
<source>&amp;Delete</source>
- <translation>&amp;Eliminar\</translation>
+ <translation>&amp;Eliminar</translation>
</message>
<message>
<source>Choose the address to send coins to</source>
- <translation>Escolha o endereรงo para o qual pretende enviar moedas</translation>
+ <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 com o qual pretende receber moedas</translation>
+ <translation>Escolha o endereรงo para receber as moedas com</translation>
</message>
<message>
<source>C&amp;hoose</source>
@@ -63,7 +63,7 @@
</message>
<message>
<source>Receiving addresses</source>
- <translation>Endereรงos de depรณsito</translation>
+ <translation>Endereรงos de a receber</translation>
</message>
<message>
<source>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source>
@@ -71,7 +71,7 @@
</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 Bitcoin para receber pagamentos. ร‰ recomendado que utilize um endereรงo novo para cada transacรงรฃo.</translation>
+ <translation>Estes sรฃo os seus endereรงos do Bitcoin para receber pagamentos. ร‰ recomendado que utilize um novo endereรงo para cada transaรงรฃo.</translation>
</message>
<message>
<source>Copy &amp;Label</source>
@@ -91,7 +91,7 @@
</message>
<message>
<source>Exporting Failed</source>
- <translation>A Exportaรงรฃo Falhou</translation>
+ <translation>Exportaรงรฃo Falhou</translation>
</message>
<message>
<source>There was an error trying to save the address list to %1. Please try again.</source>
@@ -102,7 +102,7 @@
<name>AddressTableModel</name>
<message>
<source>Label</source>
- <translation>Rรณtulo</translation>
+ <translation>Etiqueta</translation>
</message>
<message>
<source>Address</source>
@@ -110,26 +110,26 @@
</message>
<message>
<source>(no label)</source>
- <translation>(sem rรณtulo)</translation>
+ <translation>(sem etiqueta)</translation>
</message>
</context>
<context>
<name>AskPassphraseDialog</name>
<message>
<source>Passphrase Dialog</source>
- <translation>Diรกlogo de frase de seguranรงa</translation>
+ <translation>Janela da frase de palavra-passe</translation>
</message>
<message>
<source>Enter passphrase</source>
- <translation>Insira a frase de seguranรงa</translation>
+ <translation>Insira a frase de palavra-passe</translation>
</message>
<message>
<source>New passphrase</source>
- <translation>Nova frase de seguranรงa</translation>
+ <translation>Nova frase de palavra-passe</translation>
</message>
<message>
<source>Repeat new passphrase</source>
- <translation>Repita a nova frase de seguranรงa</translation>
+ <translation>Repita a nova frase de palavra-passe</translation>
</message>
<message>
<source>Encrypt wallet</source>
@@ -137,7 +137,7 @@
</message>
<message>
<source>This operation needs your wallet passphrase to unlock the wallet.</source>
- <translation>A sua frase de seguranรงa รฉ necessรกria para desbloquear a carteira.</translation>
+ <translation>Esta operaรงรฃo precisa da sua frase de palavra-passe da carteira para desbloquear a mesma.</translation>
</message>
<message>
<source>Unlock wallet</source>
@@ -145,7 +145,7 @@
</message>
<message>
<source>This operation needs your wallet passphrase to decrypt the wallet.</source>
- <translation>A sua frase de seguranรงa รฉ necessรกria para desencriptar a carteira.</translation>
+ <translation>Esta operaรงรฃo precisa da sua frase de palavra-passe da carteira para desencriptar a mesma.</translation>
</message>
<message>
<source>Decrypt wallet</source>
@@ -153,7 +153,7 @@
</message>
<message>
<source>Change passphrase</source>
- <translation>Alterar frase de seguranรงa</translation>
+ <translation>Alterar frase de palavra-passe</translation>
</message>
<message>
<source>Confirm wallet encryption</source>
@@ -161,7 +161,7 @@
</message>
<message>
<source>Warning: If you encrypt your wallet and lose your passphrase, you will &lt;b&gt;LOSE ALL OF YOUR BITCOINS&lt;/b&gt;!</source>
- <translation>Atenรงรฃo: Se encriptar a carteira e perder a sua senha irรก &lt;b&gt;PERDER TODOS OS SEUS BITCOINS&lt;/b&gt;!</translation>
+ <translation>Aviso: se encriptar a sua carteira e perder a sua frase de de palavra-passe, irรก &lt;b&gt;PERDER TODOS OS SEUS BITCOINS&lt;/b&gt;!</translation>
</message>
<message>
<source>Are you sure you wish to encrypt your wallet?</source>
@@ -177,7 +177,7 @@
</message>
<message>
<source>Warning: The Caps Lock key is on!</source>
- <translation>Atenรงรฃo: A tecla Caps Lock estรก activa!</translation>
+ <translation>Atenรงรฃo: a tecla Caps Lock estรก ativada!</translation>
</message>
<message>
<source>Wallet encrypted</source>
@@ -185,11 +185,11 @@
</message>
<message>
<source>Enter the new passphrase to the wallet.&lt;br/&gt;Please use a passphrase of &lt;b&gt;ten or more random characters&lt;/b&gt;, or &lt;b&gt;eight or more words&lt;/b&gt;.</source>
- <translation>Escreva a nova frase de seguraรงa da sua carteira. &lt;br/&gt; Por favor, use uma frase de &lt;b&gt;10 ou mais caracteres aleatรณrios,&lt;/b&gt; ou &lt;b&gt;oito ou mais palavras&lt;/b&gt;.</translation>
+ <translation>Insira a nova frase de palavra-passe da sua carteira. &lt;br/&gt; Por favor, utilize uma frase de palavra-passe com &lt;b&gt;mais de 10 ou mais carateres aleatรณrios,&lt;/b&gt; ou &lt;b&gt;oito ou mais palavras&lt;/b&gt;.</translation>
</message>
<message>
<source>Enter the old passphrase and new passphrase to the wallet.</source>
- <translation>Escreva a antiga frase de seguranรงa da carteira, seguida da nova.</translation>
+ <translation>Insira a frase de palavra-passe antiga e a nova frase de palavra-passe para carteira.</translation>
</message>
<message>
<source>Wallet encryption failed</source>
@@ -201,7 +201,7 @@
</message>
<message>
<source>The supplied passphrases do not match.</source>
- <translation>As frases de seguranรงa fornecidas nรฃo coincidem.</translation>
+ <translation>As frases de palavra-passe inseridas nรฃo coincidem.</translation>
</message>
<message>
<source>Wallet unlock failed</source>
@@ -209,7 +209,7 @@
</message>
<message>
<source>The passphrase entered for the wallet decryption was incorrect.</source>
- <translation>A frase de seguranรงa introduzida para a desencriptaรงรฃo da carteira estava incorreta.</translation>
+ <translation>A frase de palavra-passe inserida para a desencriptaรงรฃo da carteira estava incorreta.</translation>
</message>
<message>
<source>Wallet decryption failed</source>
@@ -217,12 +217,20 @@
</message>
<message>
<source>Wallet passphrase was successfully changed.</source>
- <translation>A frase de seguranรงa da carteira foi alterada com รชxito.</translation>
+ <translation>A frase de palavra-passe da carteira foi alterada com sucesso.</translation>
</message>
</context>
<context>
<name>BanTableModel</name>
- </context>
+ <message>
+ <source>IP/Netmask</source>
+ <translation>IP/Mรกscara de Rede</translation>
+ </message>
+ <message>
+ <source>Banned Until</source>
+ <translation>Banido Atรฉ</translation>
+ </message>
+</context>
<context>
<name>BitcoinGUI</name>
<message>
@@ -235,7 +243,7 @@
</message>
<message>
<source>&amp;Overview</source>
- <translation>Visรฃ&amp;o geral</translation>
+ <translation>&amp;Sinopse</translation>
</message>
<message>
<source>Node</source>
@@ -243,7 +251,7 @@
</message>
<message>
<source>Show general overview of wallet</source>
- <translation>Mostrar visรฃo geral da carteira</translation>
+ <translation>Mostrar sinopse geral da carteira</translation>
</message>
<message>
<source>&amp;Transactions</source>
@@ -251,7 +259,7 @@
</message>
<message>
<source>Browse transaction history</source>
- <translation>Navegar pelo histรณrico de transaรงรตes</translation>
+ <translation>Explorar histรณrico das transaรงรตes</translation>
</message>
<message>
<source>E&amp;xit</source>
@@ -283,15 +291,15 @@
</message>
<message>
<source>&amp;Change Passphrase...</source>
- <translation>Mudar &amp;Palavra-passe...</translation>
+ <translation>Alterar &amp;Frase de Palavra-passe...</translation>
</message>
<message>
<source>&amp;Sending addresses...</source>
- <translation>A &amp;enviar endereรงos...</translation>
+ <translation>A &amp;enviar os endereรงos...</translation>
</message>
<message>
<source>&amp;Receiving addresses...</source>
- <translation>A &amp;receber endereรงos...</translation>
+ <translation>A &amp;receber os endereรงos...</translation>
</message>
<message>
<source>Open &amp;URI...</source>
@@ -299,15 +307,15 @@
</message>
<message>
<source>Bitcoin Core client</source>
- <translation>Cliente Bitcoin Core</translation>
+ <translation>Cliente do Bitcoin Core</translation>
</message>
<message>
<source>Importing blocks from disk...</source>
- <translation>A importar blocos do disco...</translation>
+ <translation>A importar os blocos do disco...</translation>
</message>
<message>
<source>Reindexing blocks on disk...</source>
- <translation>A reindexar blocos no disco...</translation>
+ <translation>A reindexar os blocos no disco...</translation>
</message>
<message>
<source>Send coins to a Bitcoin address</source>
@@ -315,11 +323,11 @@
</message>
<message>
<source>Backup wallet to another location</source>
- <translation>Faรงa uma cรณpia de seguranรงa da carteira para outra localizaรงรฃo</translation>
+ <translation>Efetue uma cรณpia de seguranรงa da carteira para outra localizaรงรฃo</translation>
</message>
<message>
<source>Change the passphrase used for wallet encryption</source>
- <translation>Mudar a frase de seguranรงa utilizada na encriptaรงรฃo da carteira</translation>
+ <translation>Alterar a frase de palavra-passe utilizada na encriptaรงรฃo da carteira</translation>
</message>
<message>
<source>&amp;Debug window</source>
@@ -351,7 +359,7 @@
</message>
<message>
<source>Show information about Bitcoin Core</source>
- <translation>Mostrar informaรงรฃo sobre Bitcoin Core</translation>
+ <translation>Mostrar informaรงรฃo sobre o Bitcoin Core</translation>
</message>
<message>
<source>&amp;Show / Hide</source>
@@ -359,7 +367,7 @@
</message>
<message>
<source>Show or hide the main Window</source>
- <translation>Mostrar ou esconder a janela principal</translation>
+ <translation>Mostrar ou ocultar a janela principal</translation>
</message>
<message>
<source>Encrypt the private keys that belong to your wallet</source>
@@ -387,7 +395,7 @@
</message>
<message>
<source>Tabs toolbar</source>
- <translation>Barra de separadores</translation>
+ <translation>Barra de ferramentas dos separadores</translation>
</message>
<message>
<source>Bitcoin Core</source>
@@ -395,7 +403,7 @@
</message>
<message>
<source>Request payments (generates QR codes and bitcoin: URIs)</source>
- <translation>Solicitar pagamentos (gera cรณdigos QR e URIs bitcoin:)</translation>
+ <translation>Solicitar pagamentos (gera cรณdigos QR e bitcoin: URIs)</translation>
</message>
<message>
<source>&amp;About Bitcoin Core</source>
@@ -403,7 +411,7 @@
</message>
<message>
<source>Modify configuration options for Bitcoin Core</source>
- <translation>Modificar opรงรตes de configuraรงรฃo de Bitcoin Core</translation>
+ <translation>Modificar as opรงรตes de configuraรงรฃo do Bitcoin Core</translation>
</message>
<message>
<source>Show the list of used sending addresses and labels</source>
@@ -419,11 +427,11 @@
</message>
<message>
<source>&amp;Command-line options</source>
- <translation>&amp;Opรงรตes da linha de &amp;comandos</translation>
+ <translation>&amp;Opรงรตes da linha de &amp;comando</translation>
</message>
<message>
<source>Show the Bitcoin Core help message to get a list with possible Bitcoin command-line options</source>
- <translation>Mostrar a mensagem de ajuda do Bitcoin Core para obter uma lista com possรญveis opรงรตes de linha de comandos</translation>
+ <translation>Mostrar a mensagem de ajuda do Bitcoin Core para obter uma lista com possรญveis opรงรตes de linha de comando do Bitcoin</translation>
</message>
<message numerus="yes">
<source>%n active connection(s) to Bitcoin network</source>
@@ -463,11 +471,11 @@
</message>
<message>
<source>Last received block was generated %1 ago.</source>
- <translation>O รบltimo bloco recebido foi gerado %1 atrรกs.</translation>
+ <translation>O รบltimo bloco recebido foi gerado hรก %1.</translation>
</message>
<message>
<source>Transactions after this will not yet be visible.</source>
- <translation>Transaรงรตes posteriores nรฃo serรฃo visรญveis por enquanto.</translation>
+ <translation>As transaรงรตes depois de isto ainda nรฃo serรฃo visรญveis.</translation>
</message>
<message>
<source>Error</source>
@@ -498,7 +506,7 @@
<message>
<source>Amount: %1
</source>
- <translation>Quantia: %1
+ <translation>Valor: %1
</translation>
</message>
<message>
@@ -510,7 +518,7 @@
<message>
<source>Label: %1
</source>
- <translation>Rรณtulo: %1
+ <translation>Etiqueta: %1
</translation>
</message>
<message>
@@ -547,7 +555,7 @@
<name>CoinControlDialog</name>
<message>
<source>Coin Selection</source>
- <translation>Seleรงรฃo de moeda</translation>
+ <translation>Seleรงรฃo de Moeda</translation>
</message>
<message>
<source>Quantity:</source>
@@ -559,7 +567,7 @@
</message>
<message>
<source>Amount:</source>
- <translation>Quantia:</translation>
+ <translation>Valor:</translation>
</message>
<message>
<source>Priority:</source>
@@ -575,7 +583,7 @@
</message>
<message>
<source>After Fee:</source>
- <translation>Depois da Taxa:</translation>
+ <translation>Depois da taxa:</translation>
</message>
<message>
<source>Change:</source>
@@ -583,23 +591,23 @@
</message>
<message>
<source>(un)select all</source>
- <translation>(des)seleccionar todos</translation>
+ <translation>(des)selecionar todos</translation>
</message>
<message>
<source>Tree mode</source>
- <translation>Modo รกrvore</translation>
+ <translation>Modo de รกrvore</translation>
</message>
<message>
<source>List mode</source>
- <translation>Modo lista</translation>
+ <translation>Modo de lista</translation>
</message>
<message>
<source>Amount</source>
- <translation>Quantia</translation>
+ <translation>Valor</translation>
</message>
<message>
<source>Received with label</source>
- <translation>Recebido com rรณtulo</translation>
+ <translation>Recebido com etiqueta</translation>
</message>
<message>
<source>Received with address</source>
@@ -611,7 +619,7 @@
</message>
<message>
<source>Confirmations</source>
- <translation>Confirmados</translation>
+ <translation>Confirmaรงรตes</translation>
</message>
<message>
<source>Confirmed</source>
@@ -627,23 +635,23 @@
</message>
<message>
<source>Copy label</source>
- <translation>Copiar rรณtulo</translation>
+ <translation>Copiar etiqueta</translation>
</message>
<message>
<source>Copy amount</source>
- <translation>Copiar quantia</translation>
+ <translation>Copiar valor</translation>
</message>
<message>
<source>Copy transaction ID</source>
- <translation>Copiar ID da transaรงรฃo</translation>
+ <translation>Copiar id. da transaรงรฃo</translation>
</message>
<message>
<source>Lock unspent</source>
- <translation>Bloquear nรฃo gastos</translation>
+ <translation>Bloquear nรฃo gastas</translation>
</message>
<message>
<source>Unlock unspent</source>
- <translation>Desbloquear nรฃo gastos</translation>
+ <translation>Desbloquear nรฃo gastas</translation>
</message>
<message>
<source>Copy quantity</source>
@@ -655,7 +663,7 @@
</message>
<message>
<source>Copy after fee</source>
- <translation>Copiar valor apรณs taxa</translation>
+ <translation>Copiar depois da taxa</translation>
</message>
<message>
<source>Copy bytes</source>
@@ -687,7 +695,7 @@
</message>
<message>
<source>medium-high</source>
- <translation>mรฉdia-alta</translation>
+ <translation>mรฉdia alta</translation>
</message>
<message>
<source>medium</source>
@@ -695,7 +703,7 @@
</message>
<message>
<source>low-medium</source>
- <translation>mรฉdia-baixa</translation>
+ <translation>mรฉdia baixa</translation>
</message>
<message>
<source>low</source>
@@ -707,7 +715,7 @@
</message>
<message>
<source>lowest</source>
- <translation>muito alta</translation>
+ <translation>muito baixa</translation>
</message>
<message>
<source>(%1 locked)</source>
@@ -719,15 +727,15 @@
</message>
<message>
<source>This label turns red if the transaction size is greater than 1000 bytes.</source>
- <translation>Este rรณtulo fica vermelho se o tamanho da transacรงรฃo exceder os 1000 bytes.</translation>
+ <translation>Esta etiqueta fica vermelha se o tamanho da transaรงรฃo exceder os 1000 bytes.</translation>
</message>
<message>
<source>This label turns red if the priority is smaller than "medium".</source>
- <translation>Esta legenda fica vermelha se a prioridade for menor que "mรฉdia".</translation>
+ <translation>Esta etiqueta fica vermelha se a prioridade for menor que "mรฉdia".</translation>
</message>
<message>
<source>This label turns red if any recipient receives an amount smaller than %1.</source>
- <translation>Este rรณtulo fica vermelho se algum recipiente receber uma quantia menor que %1.</translation>
+ <translation>Esta etiqueta fica vermelha se qualquer recipiente receber uma quantia menor que %1.</translation>
</message>
<message>
<source>Can vary +/- %1 satoshi(s) per input.</source>
@@ -755,7 +763,7 @@
</message>
<message>
<source>(no label)</source>
- <translation>(sem rรณtulo)</translation>
+ <translation>(sem etiqueta)</translation>
</message>
<message>
<source>change from %1 (%2)</source>
@@ -774,15 +782,15 @@
</message>
<message>
<source>&amp;Label</source>
- <translation>&amp;Rรณtulo</translation>
+ <translation>&amp;Etiqueta</translation>
</message>
<message>
<source>The label associated with this address list entry</source>
- <translation>O rรณtulo associado com esta entrada no livro de endereรงos</translation>
+ <translation>A etiqueta associada com esta entrada da lista de endereรงos</translation>
</message>
<message>
<source>The address associated with this address list entry. This can only be modified for sending addresses.</source>
- <translation>O endereรงo associado com o esta entrada no livro de endereรงos. Isto sรณ pode ser modificado para endereรงos de saรญda.</translation>
+ <translation>O endereรงo associado com o esta entrada da lista de endereรงos. Isto sรณ pode ser modificado para os endereรงos de envio.</translation>
</message>
<message>
<source>&amp;Address</source>
@@ -825,7 +833,7 @@
<name>FreespaceChecker</name>
<message>
<source>A new data directory will be created.</source>
- <translation>Uma nova pasta de dados serรก criada.</translation>
+ <translation>Irรก ser criada uma nova diretoria de dados.</translation>
</message>
<message>
<source>name</source>
@@ -841,7 +849,7 @@
</message>
<message>
<source>Cannot create data directory here.</source>
- <translation>Nรฃo pode ser criada uma pasta de dados aqui.</translation>
+ <translation>Nรฃo รฉ possรญvel criar aqui uma diretoria de dados.</translation>
</message>
</context>
<context>
@@ -864,7 +872,7 @@
</message>
<message>
<source>Command-line options</source>
- <translation>Opรงรตes de linha de comandos</translation>
+ <translation>Opรงรตes da linha de comando</translation>
</message>
<message>
<source>Usage:</source>
@@ -872,9 +880,37 @@
</message>
<message>
<source>command-line options</source>
- <translation>opรงรตes da linha de comandos</translation>
+ <translation>opรงรตes da linha de comando</translation>
</message>
- </context>
+ <message>
+ <source>UI Options:</source>
+ <translation>Opรงรตes da IU:</translation>
+ </message>
+ <message>
+ <source>Choose data directory on startup (default: %u)</source>
+ <translation>Escolha a diretoria dos 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>
+ </message>
+ <message>
+ <source>Start minimized</source>
+ <translation>Iniciar minimizado</translation>
+ </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>
+ </message>
+ <message>
+ <source>Show splash screen on startup (default: %u)</source>
+ <translation>Mostrar o ecrรฃ de abertura no arranque (predefiniรงรฃo: %u)</translation>
+ </message>
+ <message>
+ <source>Reset all settings changes made over the GUI</source>
+ <translation>Reiniciar as alteraรงรตes das configuraรงรตes efetuadas na GUI</translation>
+ </message>
+</context>
<context>
<name>Intro</name>
<message>
@@ -887,19 +923,19 @@
</message>
<message>
<source>As this is the first time the program is launched, you can choose where Bitcoin Core will store its data.</source>
- <translation>Sendo esta a primeira vez que o programa รฉ iniciado, poderรก escolher onde o Bitcoin Core irรก guardar os seus dados.</translation>
+ <translation>Como esta รฉ a primeira vez que o programa รฉ iniciado, pode escolher onde guardar os seus dados do Bitcoin Core.</translation>
</message>
<message>
<source>Bitcoin Core will download and store a copy of the Bitcoin block chain. At least %1GB 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>O Bitcoin Core vai transferir e armazenar uma cรณpia do "block chain" (cadeia de blocos). Pelo menos %1GB de dados serรฃo armazenados nesta pasta, e vรฃo crescer ao longo do tempo. A sua carteira tambรฉm irรก ser armazenada nesta pasta.</translation>
+ <translation>O Bitcoin Core irรก transferir e guardar uma cรณpia da cadeia de bloco do Bitcoin. Pelo menos %1GB de dados serรฃo guardados nesta diretoria, e estes irรฃo crescer ao longo do tempo. A sua carteira tambรฉm serรก guardada nesta diretoria.</translation>
</message>
<message>
<source>Use the default data directory</source>
- <translation>Utilizar a pasta de dados padrรฃo</translation>
+ <translation>Utilizar a diretoria de dados predefinida</translation>
</message>
<message>
<source>Use a custom data directory:</source>
- <translation>Utilizar uma pasta de dados personalizada:</translation>
+ <translation>Utilizar uma diretoria de dados personalizada:</translation>
</message>
<message>
<source>Bitcoin Core</source>
@@ -907,7 +943,7 @@
</message>
<message>
<source>Error: Specified data directory "%1" cannot be created.</source>
- <translation>Erro: Pasta de dados especificada como "%1, nรฃo pode ser criada.</translation>
+ <translation>Erro: nรฃo pode ser criada a diretoria de dados especificada como "%1.</translation>
</message>
<message>
<source>Error</source>
@@ -915,7 +951,7 @@
</message>
<message numerus="yes">
<source>%n GB of free space available</source>
- <translation><numerusform>%n GB de espaรงo livre disponรญvel </numerusform><numerusform>%n GB de espaรงo livre disponรญvel </numerusform></translation>
+ <translation><numerusform>%n GB de espaรงo livre disponรญvel</numerusform><numerusform>%n GB de espaรงo livre disponรญvel</numerusform></translation>
</message>
<message numerus="yes">
<source>(of %n GB needed)</source>
@@ -969,11 +1005,11 @@
</message>
<message>
<source>Accept connections from outside</source>
- <translation>Aceitar conceรงรตes externas</translation>
+ <translation>Aceitar ligaรงรตes externas</translation>
</message>
<message>
<source>Allow incoming connections</source>
- <translation>Permitir conexรฃo</translation>
+ <translation>Permitir ligaรงรฃo a receber</translation>
</message>
<message>
<source>IP address of the proxy (e.g. IPv4: 127.0.0.1 / IPv6: ::1)</source>
@@ -985,7 +1021,7 @@
</message>
<message>
<source>The user interface language can be set here. This setting will take effect after restarting Bitcoin Core.</source>
- <translation>A linguagem da interface do utilizador pode ser definida aqui. Esta definiรงรฃo entrarรก em efeito apรณs reiniciar o Bitcoin Core.</translation>
+ <translation>O idioma da da interface do utilizador pode ser definida aqui. Esta definiรงรฃo serรก aplicada depois de reiniciar o Bitcoin Core.</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>
@@ -994,15 +1030,15 @@
</message>
<message>
<source>Third party transaction URLs</source>
- <translation>URLs de transaรงรฃo de outrem</translation>
+ <translation>URLs de transaรงรฃo de terceiros</translation>
</message>
<message>
<source>Active command-line options that override above options:</source>
- <translation>Opรงรตes de linha de comandos ativas que se sobrepรตem รกs opรงรตes anteriores:</translation>
+ <translation>Ativar as opรงรตes da linha de comando que se sobrepรตem ร s opรงรตes acima:</translation>
</message>
<message>
<source>Reset all client options to default.</source>
- <translation>Repor todas as opรงรตes do cliente.</translation>
+ <translation>Repor todas as opรงรตes de cliente para a predefiniรงรฃo.</translation>
</message>
<message>
<source>&amp;Reset Options</source>
@@ -1014,15 +1050,15 @@
</message>
<message>
<source>Automatically start Bitcoin Core after logging in to the system.</source>
- <translation>Comeรงar o Bitcoin Core automaticamente ao iniciar sessรฃo no sistema.</translation>
+ <translation>Iniciar automaticamente o Bitcoin Core depois de iniciar a sessรฃo no sistema.</translation>
</message>
<message>
<source>&amp;Start Bitcoin Core on system login</source>
- <translation>&amp;Comeรงar o Bitcoin Core ao iniciar o sistema</translation>
+ <translation>&amp;Iniciar o Bitcoin Core ao iniciar a sessรฃo no sistema</translation>
</message>
<message>
<source>(0 = auto, &lt;0 = leave that many cores free)</source>
- <translation>(0 = auto, &lt;0 = Deixar essa quantidade de nรบcleos livre)</translation>
+ <translation>(0 = automรกtico, &lt;0 = deixar essa quantidade de nรบcleos livre)</translation>
</message>
<message>
<source>W&amp;allet</source>
@@ -1030,11 +1066,11 @@
</message>
<message>
<source>Expert</source>
- <translation>Especialista</translation>
+ <translation> Especialistas </translation>
</message>
<message>
<source>Enable coin &amp;control features</source>
- <translation>Ativar funcionalidades de controlo de transaรงรฃo.</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>
@@ -1050,7 +1086,7 @@
</message>
<message>
<source>Map port using &amp;UPnP</source>
- <translation>Mapear porta usando &amp;UPnP</translation>
+ <translation>Mapear porta, utilizando &amp;UPnP</translation>
</message>
<message>
<source>Connect to the Bitcoin network through a SOCKS5 proxy.</source>
@@ -1073,6 +1109,34 @@
<translation>Porto do proxy (p.ex. 9050)</translation>
</message>
<message>
+ <source>Used for reaching peers via:</source>
+ <translation>Usado para alcanรงar nรณs via:</translation>
+ </message>
+ <message>
+ <source>Shows, if the supplied default SOCKS5 proxy is used to reach peers via this network type.</source>
+ <translation>Mostra, caso o proxy SOCKS5 predefinido submetido seja usado para alcanรงar nรณs atravรฉs deste tipo de rede.</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>Ligar ร  rede Bitcoin atravรฉs de um proxy SOCKS5 separado para utilizar os serviรงos ocultos do Tor.</translation>
+ </message>
+ <message>
+ <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services:</source>
+ <translation>Utilizar um proxy SOCKS5 separado para alcanรงar nรณs via serviรงos ocultos do Tor:</translation>
+ </message>
+ <message>
<source>&amp;Window</source>
<translation>&amp;Janela</translation>
</message>
@@ -1102,11 +1166,11 @@
</message>
<message>
<source>Choose the default subdivision unit to show in the interface and when sending coins.</source>
- <translation>Escolha a subdivisรฃo unitรกria a ser mostrada por defeito na aplicaรงรฃo e ao enviar moedas.</translation>
+ <translation>Escolha a unidade da subdivisรฃo predefinida para ser mostrada na interface e quando enviar as moedas.</translation>
</message>
<message>
<source>Whether to show coin control features or not.</source>
- <translation>Escolha para mostrar funcionalidades de Coin Control ou nรฃo.</translation>
+ <translation>Escolha se deve mostrar as funcionalidades de controlo de moedas ou nรฃo.</translation>
</message>
<message>
<source>&amp;OK</source>
@@ -1118,7 +1182,7 @@
</message>
<message>
<source>default</source>
- <translation>padrรฃo</translation>
+ <translation>predefiniรงรฃo</translation>
</message>
<message>
<source>none</source>
@@ -1126,7 +1190,7 @@
</message>
<message>
<source>Confirm options reset</source>
- <translation>Confirme a reposiรงรฃo de opรงรตes</translation>
+ <translation>Confirme a reposiรงรฃo das opรงรตes</translation>
</message>
<message>
<source>Client restart required to activate changes.</source>
@@ -1252,7 +1316,7 @@
</message>
<message>
<source>Cannot start bitcoin: click-to-pay handler</source>
- <translation>Impossรญvel iniciar o controlador de bitcoin: click-to-pay</translation>
+ <translation>Nรฃo รฉ possรญvel iniciar o Bitcoin: utilizador clique-para-pagar</translation>
</message>
<message>
<source>Payment request fetch URL is invalid: %1</source>
@@ -1411,16 +1475,12 @@
<translation>Geral</translation>
</message>
<message>
- <source>Using OpenSSL version</source>
- <translation>Usando versรฃo OpenSSL</translation>
- </message>
- <message>
<source>Using BerkeleyDB version</source>
<translation>Versรฃo BerkeleyDB em uso</translation>
</message>
<message>
<source>Startup time</source>
- <translation>Hora de inicializaรงรฃo</translation>
+ <translation>Hora de Arranque</translation>
</message>
<message>
<source>Network</source>
@@ -1443,6 +1503,22 @@
<translation>Nรบmero actual de blocos</translation>
</message>
<message>
+ <source>Memory Pool</source>
+ <translation>Banco de Memรณria</translation>
+ </message>
+ <message>
+ <source>Current number of transactions</source>
+ <translation>Nรบmero actual de transacรงรตes</translation>
+ </message>
+ <message>
+ <source>Memory usage</source>
+ <translation>Utilizaรงรฃo de memรณria</translation>
+ </message>
+ <message>
+ <source>Open the Bitcoin Core debug log file from the current data directory. This can take a few seconds for large log files.</source>
+ <translation>Abrir o ficheiro de registo de depuraรงรฃo da pasta de dados actual. Isto pode demorar alguns segundos para ficheiros de registo grandes.</translation>
+ </message>
+ <message>
<source>Received</source>
<translation>Recebido</translation>
</message>
@@ -1452,13 +1528,21 @@
</message>
<message>
<source>&amp;Peers</source>
- <translation>&amp;Conexรงรฃo</translation>
+ <translation>&amp;Conexรฃo</translation>
+ </message>
+ <message>
+ <source>Banned peers</source>
+ <translation>Nรณs banidos</translation>
</message>
<message>
<source>Select a peer to view detailed information.</source>
<translation>Selecione uma conexaรงรฃo para ver informaรงรฃo em detalhe.</translation>
</message>
<message>
+ <source>Whitelisted</source>
+ <translation>Permitido por si</translation>
+ </message>
+ <message>
<source>Direction</source>
<translation>Direcรงรฃo</translation>
</message>
@@ -1467,6 +1551,18 @@
<translation>Versรฃo</translation>
</message>
<message>
+ <source>Starting Block</source>
+ <translation>Bloco Inicial</translation>
+ </message>
+ <message>
+ <source>Synced Headers</source>
+ <translation>Cabeรงalhos Sincronizados</translation>
+ </message>
+ <message>
+ <source>Synced Blocks</source>
+ <translation>Blocos Sincronizados</translation>
+ </message>
+ <message>
<source>User Agent</source>
<translation>Agente Usuรกrio</translation>
</message>
@@ -1480,7 +1576,7 @@
</message>
<message>
<source>Connection Time</source>
- <translation>Tempo de Conexรงรฃo</translation>
+ <translation>Tempo de Ligaรงรฃo</translation>
</message>
<message>
<source>Last Send</source>
@@ -1495,6 +1591,18 @@
<translation>Tempo de Latรชncia</translation>
</message>
<message>
+ <source>The duration of a currently outstanding ping.</source>
+ <translation>A duraรงรฃo de um ping atualmente pendente.</translation>
+ </message>
+ <message>
+ <source>Ping Wait</source>
+ <translation>Espera do Ping</translation>
+ </message>
+ <message>
+ <source>Time Offset</source>
+ <translation>Fuso Horรกrio</translation>
+ </message>
+ <message>
<source>Last block time</source>
<translation>Data do รบltimo bloco</translation>
</message>
@@ -1539,6 +1647,34 @@
<translation>Limpar consola</translation>
</message>
<message>
+ <source>&amp;Disconnect Node</source>
+ <translation>&amp;Desligar Nรณ</translation>
+ </message>
+ <message>
+ <source>Ban Node for</source>
+ <translation>Banir Nรณ por</translation>
+ </message>
+ <message>
+ <source>1 &amp;hour</source>
+ <translation>1 &amp;hora</translation>
+ </message>
+ <message>
+ <source>1 &amp;day</source>
+ <translation>1 &amp;dia</translation>
+ </message>
+ <message>
+ <source>1 &amp;week</source>
+ <translation>1 &amp;semana</translation>
+ </message>
+ <message>
+ <source>1 &amp;year</source>
+ <translation>1 &amp;ano</translation>
+ </message>
+ <message>
+ <source>&amp;Unban Node</source>
+ <translation>&amp;Desbloquear Nรณ</translation>
+ </message>
+ <message>
<source>Welcome to the Bitcoin Core RPC console.</source>
<translation>Bem-vindo ร  consola RPC do Bitcoin Core.</translation>
</message>
@@ -1567,6 +1703,10 @@
<translation>%1 GB</translation>
</message>
<message>
+ <source>(node id: %1)</source>
+ <translation>(id nรณ: %1)</translation>
+ </message>
+ <message>
<source>via %1</source>
<translation>via %1</translation>
</message>
@@ -1583,6 +1723,14 @@
<translation>Saรญda</translation>
</message>
<message>
+ <source>Yes</source>
+ <translation>Sim</translation>
+ </message>
+ <message>
+ <source>No</source>
+ <translation>Nรฃo</translation>
+ </message>
+ <message>
<source>Unknown</source>
<translation>Desconhecido</translation>
</message>
@@ -1764,7 +1912,7 @@
</message>
<message>
<source>Coin Control Features</source>
- <translation>Funcionalidades de Coin Control:</translation>
+ <translation>Funcionalidades do Controlo de Moedas:</translation>
</message>
<message>
<source>Inputs...</source>
@@ -1820,7 +1968,7 @@
</message>
<message>
<source>Choose...</source>
- <translation>Escolha...</translation>
+ <translation>Escolher...</translation>
</message>
<message>
<source>collapse fee-settings</source>
@@ -1951,6 +2099,10 @@
<translation>Copiar alteraรงรฃo</translation>
</message>
<message>
+ <source>Total Amount %1</source>
+ <translation>Quantia Total %1</translation>
+ </message>
+ <message>
<source>or</source>
<translation>ou</translation>
</message>
@@ -1975,10 +2127,26 @@
<translation>A transaรงรฃo foi rejeitada! Isto poderรก acontecer se algumas das moedas na sua carteira jรก tiverem sido gastas, se por exemplo tiver usado uma cรณpia do ficheiro wallet.dat e as moedas tiverem sido gastas na cรณpia mas nรฃo tiverem sido marcadas como gastas aqui.</translation>
</message>
<message>
+ <source>A fee higher than %1 is considered an absurdly high fee.</source>
+ <translation>Uma taxa superior a %1 รฉ considerada muito alta.</translation>
+ </message>
+ <message>
<source>Payment request expired.</source>
<translation>Pedido de pagamento expirou.</translation>
</message>
<message>
+ <source>Pay only the required fee of %1</source>
+ <translation>Pagar somente a taxa mรญnima de %1</translation>
+ </message>
+ <message>
+ <source>The recipient address is not valid. Please recheck.</source>
+ <translation>O endereรงo de destino nรฃo รฉ vรกlido. Por favor, verifique novamente.</translation>
+ </message>
+ <message>
+ <source>Duplicate address found: addresses should only be used once each.</source>
+ <translation>Endereรงo duplicado encontrado: cada endereรงo sรณ poderรก ser usado uma vez.</translation>
+ </message>
+ <message>
<source>Warning: Invalid Bitcoin address</source>
<translation>Aviso: Endereรงo Bitcoin invรกlido</translation>
</message>
@@ -2023,7 +2191,7 @@
</message>
<message>
<source>Choose previously used address</source>
- <translation>Escolher endereรงo usado previamente</translation>
+ <translation>Escolha o endereรงo utilizado anteriormente</translation>
</message>
<message>
<source>This is a normal payment.</source>
@@ -2050,10 +2218,26 @@
<translation>Remover esta entrada</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>A taxa serรก deduzida ao montante enviado. O destinatรกrio irรก receber menos bitcoins do que as que introduziu no campo montante. Caso sejam seleccionados mรบltiplos destinatรกrios, a taxa serรก repartida equitativamente.</translation>
+ </message>
+ <message>
+ <source>S&amp;ubtract fee from amount</source>
+ <translation>S&amp;ubtrair taxa ao montante</translation>
+ </message>
+ <message>
<source>Message:</source>
<translation>Mensagem:</translation>
</message>
<message>
+ <source>This is an unauthenticated payment request.</source>
+ <translation>Pedido de pagamento nรฃo autenticado.</translation>
+ </message>
+ <message>
+ <source>This is an authenticated payment request.</source>
+ <translation>Pedido de pagamento autenticado.</translation>
+ </message>
+ <message>
<source>Enter a label for this address to add it to the list of used addresses</source>
<translation>Introduza um rรณtulo para este endereรงo para o adicionar ร  sua lista de endereรงos usados</translation>
</message>
@@ -2092,12 +2276,16 @@
<translation>&amp;Assinar Mensagem</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>Pode assinar mensagens com os seus endereรงos para provar que sรฃo seus. Tenha atenรงรฃo ao assinar mensagens ambรญguas, pois ataques de phishing podem tentar enganรก-lo de modo a assinar a sua identidade para os atacantes. Apenas assine declaraรงรตes detalhadas com as quais concorde.</translation>
+ </message>
+ <message>
<source>The Bitcoin address to sign the message with</source>
<translation>O endereรงo Bitcoin para designar a mensagem</translation>
</message>
<message>
<source>Choose previously used address</source>
- <translation>Escolher endereรงo usado previamente</translation>
+ <translation>Escolha o endereรงo utilizado anteriormente</translation>
</message>
<message>
<source>Alt+A</source>
@@ -2144,6 +2332,10 @@
<translation>&amp;Verificar Mensagem</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>Introduza o endereรงo de assinatura, mensagem (assegure-se que copia quebras de linha, espaรงos, tabulaรงรตes, etc. exactamente) e assinatura abaixo para verificar a mensagem. Tenha atenรงรฃo para nรฃo ler mais na assinatura do que o que estiver na mensagem assinada, para evitar ser enganado por um atacante que se encontre entre si e quem assinou a mensagem.</translation>
+ </message>
+ <message>
<source>The Bitcoin address the message was signed with</source>
<translation>O endereรงo Bitcoin com que a mensagem foi designada</translation>
</message>
@@ -2495,6 +2687,10 @@
<translation>Desde que um endereรงo de modo-verificaรงรฃo faรงa parte ou nรฃo desta transaรงรฃo</translation>
</message>
<message>
+ <source>User-defined intent/purpose of the transaction.</source>
+ <translation>Motivo da transacรงรฃo definido pelo utilizador.</translation>
+ </message>
+ <message>
<source>Amount removed from or added to balance.</source>
<translation>Quantia retirada ou adicionada ao saldo.</translation>
</message>
@@ -2574,6 +2770,10 @@
<translation>Copiar ID da Transaรงรฃo</translation>
</message>
<message>
+ <source>Copy raw transaction</source>
+ <translation>Copiar dados brutos da transacรงรฃo</translation>
+ </message>
+ <message>
<source>Edit label</source>
<translation>Editar rรณtulo</translation>
</message>
@@ -2653,7 +2853,7 @@
<name>WalletFrame</name>
<message>
<source>No wallet has been loaded.</source>
- <translation>Nenhuma carteira foi carregada.</translation>
+ <translation>Nรฃo foi carregada nenhuma carteira.</translation>
</message>
</context>
<context>
@@ -2721,14 +2921,70 @@
<translation>Aceitar comandos de linha de comandos e JSON-RPC</translation>
</message>
<message>
+ <source>If &lt;category&gt; is not supplied or if &lt;category&gt; = 1, output all debugging information.</source>
+ <translation>Se &lt;category&gt; nรฃo รฉ fornecida ou &lt;category&gt; = 1, imprimir toda a informaรงรฃo de depuraรงรฃo.</translation>
+ </message>
+ <message>
+ <source>Maximum total fees (in %s) to use in a single wallet transaction; setting this too low may abort large transactions (default: %s)</source>
+ <translation>Total mรกximo de taxas (em %s) a utilizar numa รบnica transacรงรฃo; definir este valor demasiado baixo pode abortar transacรงรตes grandes (padrรฃo: %s)</translation>
+ </message>
+ <message>
+ <source>Please check that your computer's date and time are correct! If your clock is wrong Bitcoin Core will not work properly.</source>
+ <translation>Por favor verifique que a data e hora do seu computador estรฃo correctas! Se o seu relรณgio nรฃo estiver certo o Bitcoin Core nรฃo irรก funcionar correctamente.</translation>
+ </message>
+ <message>
+ <source>Prune configured below the minimum of %d MiB. Please use a higher number.</source>
+ <translation>Poda configurada abaixo do mรญnimo de %d MiB. Por favor, utilize um valor mais elevado.</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>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, &gt;%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, &gt;%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>
+ <message>
+ <source>Error: A fatal internal error occurred, see debug.log for details</source>
+ <translation>Erro: Um erro fatal interno ocorreu, verificar debug.log para mais informaรงรฃo</translation>
+ </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>
+ </message>
+ <message>
+ <source>Pruning blockstore...</source>
+ <translation>A podar a blockstore...</translation>
+ </message>
+ <message>
<source>Run in the background as a daemon and accept commands</source>
<translation>Correr o processo em segundo plano e aceitar comandos</translation>
</message>
<message>
+ <source>Unable to start HTTP server. See debug log for details.</source>
+ <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>-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>
+ <message>
+ <source>Accept relayed transactions received from whitelisted peers even when not relaying transactions (default: %d)</source>
+ <translation>Aceitar as transaรงรตes retransmitidas recebidas dos pares na lista branca, mesmo quando nรฃo retransmitir as transaรงรตes (predefiniรงรฃo: %d)</translation>
+ </message>
+ <message>
<source>Bind to given address and always listen on it. Use [host]:port notation for IPv6</source>
<translation>Associar a endereรงo especรญfico e escutar sempre nele. Use a notaรงรฃo [anfitriรฃo]:porta para IPv6</translation>
</message>
@@ -2745,10 +3001,18 @@
<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>
+ </message>
+ <message>
<source>Set the number of script verification threads (%u to %d, 0 = auto, &lt;0 = leave that many cores free, default: %d)</source>
<translation>Defina o nรบmero de processos de verificaรงรฃo (%u atรฉ %d, 0 = automรกtico, &lt;0 = ldisponibiliza esse nรบmero de nรบcleos livres, por defeito: %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>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>
@@ -2757,10 +3021,30 @@
<translation>Incapaz de vincular ร  porta %s neste computador. O Bitcoin Core provavelmente jรก estรก a correr.</translation>
</message>
<message>
+ <source>Unsupported argument -whitelistalwaysrelay ignored, use -whitelistrelay and/or -whitelistforcerelay.</source>
+ <translation>Argumento nรฃo suportado -whitelistalwaysrelay ignorado, utilize -whitelistrelay e/ou -whitelistforcerelay.</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: abnormally high number of blocks generated, %d blocks received in the last %d hours (%d expected)</source>
+ <translation>AVISO: gerado um nรบmero anormalmente elevado de blocos, %d blocos recebidos nas รบltimas %d horas (%d esperados)</translation>
+ </message>
+ <message>
+ <source>WARNING: check your network connection, %d blocks received in the last %d hours (%d expected)</source>
+ <translation>AVISO: verifique a sua conexรฃo ร  rede, %d blocos recebidos nas รบltimas %d horas (%d esperados)</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: 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>
+ <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>
@@ -2773,12 +3057,20 @@
<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>
+ <message>
<source>&lt;category&gt; can be:</source>
<translation>&lt;categoria&gt; pode ser:</translation>
</message>
<message>
+ <source>Append comment to the user agent string</source>
+ <translation>Anexar um comentรกrio para a entrada de agente do utilizador</translation>
+ </message>
+ <message>
<source>Block creation options:</source>
- <translation>Opรงรตes de criaรงรฃo de bloco:</translation>
+ <translation>Opรงรตes da criaรงรฃo de bloco:</translation>
</message>
<message>
<source>Connect only to the specified node(s)</source>
@@ -2786,7 +3078,7 @@
</message>
<message>
<source>Connection options:</source>
- <translation>Opcรตes de conexรงรฃo:</translation>
+ <translation>Opรงรตes de ligaรงรฃo:</translation>
</message>
<message>
<source>Corrupted block database detected</source>
@@ -2794,17 +3086,37 @@
</message>
<message>
<source>Debugging/Testing options:</source>
- <translation>Depuraรงรฃo/Opรงรตes teste:</translation>
+ <translation>Opรงรตes de Depuraรงรฃo/Teste:</translation>
</message>
<message>
<source>Do not load the wallet and disable wallet RPC calls</source>
- <translation>Nรฃo carregar a carteira e desativar chamadas RPC de carteira.</translation>
+ <translation>Nรฃo carregar a carteira e desativar as chamadas de RPC da carteira.</translation>
</message>
<message>
<source>Do you want to rebuild the block database now?</source>
<translation>Deseja reconstruir agora a base de dados de blocos.</translation>
</message>
<message>
+ <source>Enable publish hash block in &lt;address&gt;</source>
+ <translation>Activar publicaรงรฃo do hash do bloco em &lt;address&gt;</translation>
+ </message>
+ <message>
+ <source>Enable publish hash transaction in &lt;address&gt;</source>
+ <translation>Activar publicaรงรฃo do hash da transacรงรฃo em &lt;address&gt;</translation>
+ </message>
+ <message>
+ <source>Enable publish raw block in &lt;address&gt;</source>
+ <translation>Activar publicaรงรฃo de dados brutos do bloco em &lt;address&gt;</translation>
+ </message>
+ <message>
+ <source>Enable publish raw transaction in &lt;address&gt;</source>
+ <translation>Activar publicaรงรฃo de dados brutos da transacรงรฃo em &lt;address&gt;</translation>
+ </message>
+ <message>
+ <source>Enable transaction replacement in the memory pool (default: %u)</source>
+ <translation>Ativar substituiรงรฃo da transaรงรฃo no banco de memรณria (predefiniรงรฃo: %u)</translation>
+ </message>
+ <message>
<source>Error initializing block database</source>
<translation>Erro ao inicializar a cadeia de blocos</translation>
</message>
@@ -2841,6 +3153,22 @@
<translation>Endereรงo -onion invรกlido: '%s'</translation>
</message>
<message>
+ <source>Invalid amount for -fallbackfee=&lt;amount&gt;: '%s'</source>
+ <translation>Valor invรกlido para -fallbackfee=&lt;amount&gt;: '%s'</translation>
+ </message>
+ <message>
+ <source>Keep the transaction memory pool below &lt;n&gt; megabytes (default: %u)</source>
+ <translation>Manter o banco de memรณria da transaรงรฃo abaixo de &lt;n&gt; megabytes (predefiniรงรฃo: %u)</translation>
+ </message>
+ <message>
+ <source>Location of the auth cookie (default: data dir)</source>
+ <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>
@@ -2849,6 +3177,18 @@
<translation>Somente conectar aos nodes na rede &lt;net&gt; (ipv4, ipv6 ou onion)</translation>
</message>
<message>
+ <source>Print version and exit</source>
+ <translation>Imprimir versรฃo e sair</translation>
+ </message>
+ <message>
+ <source>Prune cannot be configured with a negative value.</source>
+ <translation>Poda nรฃo pode ser configurada com um valor negativo.</translation>
+ </message>
+ <message>
+ <source>Prune mode is incompatible with -txindex.</source>
+ <translation>Modo poda รฉ incompatรญvel com -txindex.</translation>
+ </message>
+ <message>
<source>Set database cache size in megabytes (%d to %d, default: %d)</source>
<translation>Definir o tamanho da cache de base de dados em megabytes (%d a %d, padrรฃo: %d)</translation>
</message>
@@ -2861,8 +3201,24 @@
<translation>Especifique ficheiro de carteira (dentro da pasta de dados)</translation>
</message>
<message>
+ <source>Unsupported argument -benchmark ignored, use -debug=bench.</source>
+ <translation>Argumento nรฃo suportado -benchmark ignorado, use -debug=bench.</translation>
+ </message>
+ <message>
+ <source>Unsupported argument -debugnet ignored, use -debug=net.</source>
+ <translation>Argumento nรฃo suportado -debugnet ignorado, use -debug=net.</translation>
+ </message>
+ <message>
+ <source>Unsupported argument -tor found, use -onion.</source>
+ <translation>Argumento nรฃo suportado -tor encontrado, use -onion.</translation>
+ </message>
+ <message>
<source>Use UPnP to map the listening port (default: %u)</source>
- <translation>Use UPnP para mapear a porto de escuta (default: %u)</translation>
+ <translation>Utilizar UPnP para mapear a porta de escuta (predefiniรงรฃo: %u)</translation>
+ </message>
+ <message>
+ <source>User Agent comment (%s) contains unsafe characters.</source>
+ <translation>Comentรกrio no User Agent (%s) contรฉm caracteres inseguros.</translation>
</message>
<message>
<source>Verifying blocks...</source>
@@ -2881,10 +3237,6 @@
<translation>Opรงรตes da carteira:</translation>
</message>
<message>
- <source>Warning: This version is obsolete; upgrade required!</source>
- <translation>Aviso: Esta versรฃo estรก desatualizada; atualizaรงรฃo necessรกria!</translation>
- </message>
- <message>
<source>You need to rebuild the database using -reindex to change -txindex</source>
<translation>ร‰ necessรกrio reconstruir as bases de dados usando -reindex para mudar o -txindex</translation>
</message>
@@ -2905,34 +3257,122 @@
<translation>Impossรญvel trancar a pasta de dados %s. Provavelmente o Bitcoin Core jรก estรก a ser executado.</translation>
</message>
<message>
+ <source>Create new files with system default permissions, instead of umask 077 (only effective with disabled wallet functionality)</source>
+ <translation>Crie ficheiros novos com as permisรตes predefinidas do sistema, em vez de umask 077 (apenas eficaz caso a funcionalidade carteira esteja desactivada)</translation>
+ </message>
+ <message>
+ <source>Discover own IP addresses (default: 1 when listening and no -externalip or -proxy)</source>
+ <translation>Descobrir o prรณprio endereรงo IP (padrรฃo: 1 ao escutar e sem -externalip ou -proxy)</translation>
+ </message>
+ <message>
+ <source>Error: Listening for incoming connections failed (listen returned error %s)</source>
+ <translation>Erro: A escuta de ligaรงรตes de entrada falhou (escuta devolveu erro %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>Executar comando quando um alerta relevante for recebido ou em caso de uma divisรฃo longa da cadeia de blocos (no comando, %s รฉ substituรญdo 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>
+ <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>
+ </message>
+ <message>
+ <source>If paytxfee is not set, include enough fee so transactions begin confirmation on average within n blocks (default: %u)</source>
+ <translation>Caso o paytxfee nรฃo seja definido, inclua uma taxa suficiente para que as transacรงรตes comecem a ser confirmadas, em mรฉdia, dentro de n blocos (padrรฃo: %u)</translation>
+ </message>
+ <message>
+ <source>Invalid amount for -maxtxfee=&lt;amount&gt;: '%s' (must be at least the minrelay fee of %s to prevent stuck transactions)</source>
+ <translation>Montante invรกlido para -maxtxfee=&lt;amount&gt;: '%s' (deverรก ser, no mรญnimo , a taxa mรญnima de propagaรงรฃo de %s, de modo a evitar transaรงรตes bloqueadas)</translation>
+ </message>
+ <message>
+ <source>Maximum size of data in data carrier transactions we relay and mine (default: %u)</source>
+ <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>
+ <message>
<source>Set maximum size of high-priority/low-fee transactions in bytes (default: %d)</source>
<translation>Definir tamanho mรกximo de transaรงรตes com alta-prioridade/baixa-taxa em bytes (por defeito: %d)</translation>
</message>
<message>
+ <source>Set the number of threads for coin generation if enabled (-1 = all cores, default: %d)</source>
+ <translation>Definir o nรบmero threads para a geraรงรฃo de moedas, caso activo (-1 = todos os cores, padrรฃo: %d)</translation>
+ </message>
+ <message>
+ <source>The transaction amount is too small to send after the fee has been deducted</source>
+ <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 &lt;https://www.openssl.org/&gt; 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 &lt;https://www.openssl.org/&gt; 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>
+ <message>
+ <source>You need to rebuild the database using -reindex to go back to unpruned mode. This will redownload the entire blockchain</source>
+ <translation>ร‰ necessรกrio reconstruir a base de dados, utilizando -reindex para voltar ao modo de suprimir. Isto irรก transferir novamente a cadeia de blocos completa</translation>
+ </message>
+ <message>
<source>(default: %u)</source>
- <translation>(por defeito: %u)</translation>
+ <translation>(predefiniรงรฃo: %u)</translation>
+ </message>
+ <message>
+ <source>Accept public REST requests (default: %u)</source>
+ <translation>Aceitar pedidos REST pรบblicos (predefiniรงรฃo: %u)</translation>
+ </message>
+ <message>
+ <source>Activating best chain...</source>
+ <translation>A activar a melhor cadeia...</translation>
+ </message>
+ <message>
+ <source>Attempt to recover private keys from a corrupt wallet.dat on startup</source>
+ <translation>Tentar recuperar chaves privadas de um wallet.dat corrompido ao iniciar</translation>
+ </message>
+ <message>
+ <source>Automatically create Tor hidden service (default: %d)</source>
+ <translation>Criar automaticamente o serviรงo Tor oculto (predefiniรงรฃo: %d)</translation>
</message>
<message>
<source>Cannot resolve -whitebind address: '%s'</source>
<translation>Nรฃo foi possรญvel resolver o endereรงo -whitebind: '%s'</translation>
</message>
<message>
+ <source>Connect through SOCKS5 proxy</source>
+ <translation>Ligar atravรฉs de um proxy SOCKS5</translation>
+ </message>
+ <message>
<source>Copyright (C) 2009-%i The Bitcoin Core Developers</source>
<translation>Copyright (C) 2009-%i Os Programadores do Bitcoin Core</translation>
</message>
<message>
<source>Error loading wallet.dat: Wallet requires newer version of Bitcoin Core</source>
- <translation>Erro ao carregar wallet.dat: A Carteira requer uma versรฃo mais recente do Bitcoin Core</translation>
+ <translation>Erro ao carregar wallet.dat: A carteira requer uma versรฃo mais recente do Bitcoin Core</translation>
+ </message>
+ <message>
+ <source>Error reading from database, shutting down.</source>
+ <translation>Erro ao ler da base de dados, encerrando.</translation>
+ </message>
+ <message>
+ <source>Imports blocks from external blk000??.dat file on startup</source>
+ <translation>Importar blocos de um ficheiro blk000??.dat externo ao iniciar</translation>
</message>
<message>
<source>Information</source>
<translation>Informaรงรฃo</translation>
</message>
<message>
+ <source>Initialization sanity check failed. Bitcoin Core is shutting down.</source>
+ <translation>Falha na prova real inicial. Bitcoin Core estรก a desligar.</translation>
+ </message>
+ <message>
<source>Invalid amount for -maxtxfee=&lt;amount&gt;: '%s'</source>
<translation>Quantia invรกlida para -maxtxfee=&lt;quantidade&gt;: '%s'</translation>
</message>
@@ -2945,10 +3385,58 @@
<translation>Quantia invรกlida para -mintxfee=&lt;quantidade&gt;: '%s'</translation>
</message>
<message>
+ <source>Invalid amount for -paytxfee=&lt;amount&gt;: '%s' (must be at least %s)</source>
+ <translation>Montante invรกlido para -paytxfee=&lt;amount&gt;: '%s' (deverรก ser no mรญnimo %s)</translation>
+ </message>
+ <message>
+ <source>Invalid netmask specified in -whitelist: '%s'</source>
+ <translation>Mรกscara de rede invรกlida especificada em -whitelist: '%s'</translation>
+ </message>
+ <message>
+ <source>Keep at most &lt;n&gt; unconnectable transactions in memory (default: %u)</source>
+ <translation>Manter no mรกximo &lt;n&gt; transacรงรตes รณrfรฃs em memรณria (padrรฃo: %u)</translation>
+ </message>
+ <message>
+ <source>Need to specify a port with -whitebind: '%s'</source>
+ <translation>Necessรกrio especificar uma porta com -whitebind: '%s'</translation>
+ </message>
+ <message>
+ <source>Node relay options:</source>
+ <translation>Opรงรตes da transmissรฃo de nรณs:</translation>
+ </message>
+ <message>
+ <source>RPC server options:</source>
+ <translation>Opรงรตes do servidor RPC:</translation>
+ </message>
+ <message>
+ <source>Rebuild block chain index from current blk000??.dat files on startup</source>
+ <translation>Reconstruir a cadeia de blocos a partir dos ficheiros blk000??.dat actuais ao iniciar</translation>
+ </message>
+ <message>
+ <source>Receive and display P2P network alerts (default: %u)</source>
+ <translation>Receber e mostrar alertas da rede P2P (padrรฃo: %u)</translation>
+ </message>
+ <message>
+ <source>Reducing -maxconnections from %d to %d, because of system limitations.</source>
+ <translation>Reduzindo -maxconnections de %d para %d, devido a limitaรงรตes no sistema.</translation>
+ </message>
+ <message>
+ <source>Rescan the block chain for missing wallet transactions on startup</source>
+ <translation>Procurar transacรงรตes em falta na cadeia de blocos ao iniciar</translation>
+ </message>
+ <message>
<source>Send trace/debug info to console instead of debug.log file</source>
<translation>Enviar informaรงรฃo de rastreio/depuraรงรฃo para a consola e nรฃo para o ficheiro debug.log</translation>
</message>
<message>
+ <source>Send transactions as zero-fee transactions if possible (default: %u)</source>
+ <translation>Enviar como uma transacรงรฃo a custo zero se possรญvel (padrรฃo: %u)</translation>
+ </message>
+ <message>
+ <source>Show all debugging options (usage: --help -help-debug)</source>
+ <translation>Mostrar todas as opรงรตes de depuraรงรฃo (utilizaรงรฃo: --help -help-debug)</translation>
+ </message>
+ <message>
<source>Shrink debug.log file on client startup (default: 1 when no -debug)</source>
<translation>Encolher ficheiro debug.log ao iniciar o cliente (por defeito: 1 sem -debug definido)</translation>
</message>
@@ -2957,6 +3445,22 @@
<translation>Falhou assinatura da transaรงรฃo</translation>
</message>
<message>
+ <source>The transaction amount is too small to pay the fee</source>
+ <translation>O montante da transacรงรฃo รฉ demasiado baixo para pagar a taxa</translation>
+ </message>
+ <message>
+ <source>This is experimental software.</source>
+ <translation>Isto รฉ software experimental.</translation>
+ </message>
+ <message>
+ <source>Tor control port password (default: empty)</source>
+ <translation>Palavra-passe da porta de controlo Tor (predefiniรงรฃo: vazio)</translation>
+ </message>
+ <message>
+ <source>Tor control port to use if onion listening enabled (default: %s)</source>
+ <translation>Porta de controlo Tor a utilizar se a escuta cebola estiver ativada (predefiniรงรฃo: %s)</translation>
+ </message>
+ <message>
<source>Transaction amount too small</source>
<translation>Quantia da transaรงรฃo รฉ muito baixa</translation>
</message>
@@ -2965,10 +3469,22 @@
<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>
+ <message>
<source>Transaction too large</source>
<translation>Transaรงรฃo grande demais</translation>
</message>
<message>
+ <source>Unable to bind to %s on this computer (bind returned error %s)</source>
+ <translation>Incapaz de vincular ร  porta %s neste computador (vรญnculo retornou erro %s)</translation>
+ </message>
+ <message>
+ <source>Upgrade wallet to latest format on startup</source>
+ <translation>Actualizar carteira para o formato mais recente ao iniciar</translation>
+ </message>
+ <message>
<source>Username for JSON-RPC connections</source>
<translation>Nome de utilizador para ligaรงรตes JSON-RPC</translation>
</message>
@@ -2981,10 +3497,22 @@
<translation>Aviso</translation>
</message>
<message>
+ <source>Warning: unknown new rules activated (versionbit %i)</source>
+ <translation>Aviso: ativadas novas regras desconhecidas (versionbit %i)</translation>
+ </message>
+ <message>
+ <source>Whether to operate in a blocks only mode (default: %u)</source>
+ <translation>Se operar apenas num modo de blocos (predefiniรงรฃo: %u)</translation>
+ </message>
+ <message>
<source>Zapping all transactions from wallet...</source>
<translation>A limpar todas as transaรงรตes da carteira...</translation>
</message>
<message>
+ <source>ZeroMQ notification options:</source>
+ <translation>Opรงรตes de notificaรงรฃo ZeroMQ:</translation>
+ </message>
+ <message>
<source>wallet.dat corrupt, salvage failed</source>
<translation>wallet.dat corrompido, recuperaรงรฃo falhou</translation>
</message>
@@ -3006,27 +3534,107 @@
</message>
<message>
<source>Loading addresses...</source>
- <translation>A carregar endereรงos...</translation>
+ <translation>A carregar os endereรงos...</translation>
</message>
<message>
<source>Error loading wallet.dat: Wallet corrupted</source>
<translation>Erro ao carregar wallet.dat: Carteira danificada</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 = guardar metadados da transacรงรฃo ex: proprietรกrio da conta e informaรงรฃo do pedido de pagamento, 2 = descartar metadados da transacรงรฃo)</translation>
+ </message>
+ <message>
+ <source>-maxtxfee is set very high! Fees this large could be paid on a single transaction.</source>
+ <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 &lt;n&gt; hours (default: %u)</source>
+ <translation>Nรฃo guardar transaรงรตes no banco de memรณria por mais de &lt;n&gt; horas (predefiniรงรฃo: %u)</translation>
+ </message>
+ <message>
+ <source>Error reading wallet.dat! All keys read correctly, but transaction data or address book entries might be missing or incorrect.</source>
+ <translation>Erro ao ler wallet.dat! Todas as chaves foram lidas correctamente, mas os dados das transacรงรตes ou do livro de endereรงos podem estar em falta ou incorrectos.</translation>
+ </message>
+ <message>
+ <source>Fees (in %s/kB) smaller than this are considered zero fee for transaction creation (default: %s)</source>
+ <translation>Taxas (em %s/kB) abaixo deste valor sรฃo consideradas nulas para a criaรงรฃo de transacรงรตes (padrรฃo: %s)</translation>
+ </message>
+ <message>
+ <source>How thorough the block verification of -checkblocks is (0-4, default: %u)</source>
+ <translation>Minuciosidade da verificaรงรฃo de blocos para -checkblocks รฉ (0-4, padrรฃo: %u)</translation>
+ </message>
+ <message>
+ <source>Maintain a full transaction index, used by the getrawtransaction rpc call (default: %u)</source>
+ <translation>Manter um รญndice de transacรงรตes completo, usado pela chamada RPC getrawtransaction (padrรฃo: %u)</translation>
+ </message>
+ <message>
+ <source>Number of seconds to keep misbehaving peers from reconnecting (default: %u)</source>
+ <translation>Nรบmero de segundos a impedir que pares com comportamento indesejado se liguem de novo (padrรฃo: %u)</translation>
+ </message>
+ <message>
+ <source>Output debugging information (default: %u, supplying &lt;category&gt; is optional)</source>
+ <translation>Informaรงรฃo de depuraรงรฃo (padrรฃo: %u, fornecer uma &lt;category&gt; รฉ opcional)</translation>
+ </message>
+ <message>
+ <source>Support filtering of blocks and transaction with bloom filters (default: %u)</source>
+ <translation>Suportar filtragem de blocos e transacรงรตes com fitros bloom (padrรฃo: %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>Comprimento total da entrada da versรฃo de rede (%i) excede o comprimento mรกximo (%i). Reduzir o nรบmero ou o tamanho 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>Tenta manter o trรกfego externo abaixo do limite especificado (em MiB por 24h), 0 = sem limite (padrรฃo: %d)</translation>
+ </message>
+ <message>
+ <source>Unsupported argument -socks found. Setting SOCKS version isn't possible anymore, only SOCKS5 proxies are supported.</source>
+ <translation>Encontrado um argumento nรฃo suportado -socks. Definir a versรฃo do SOCKS jรก nรฃo รฉ possรญvel, apenas proxies SOCKS5 sรฃo suportados.</translation>
+ </message>
+ <message>
+ <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: %s)</source>
+ <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 &lt;userpw&gt; comes in the format: &lt;USERNAME&gt;:&lt;SALT&gt;$&lt;HASH&gt;. 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 &lt;userpw&gt; estรก no formato: &lt;USERNAME&gt;:&lt;SALT&gt;$&lt;HASH&gt;. Um script python estรก incluido em share/rpcuser. Esta opรงรฃo pode ser especificada mรบltiplas vezes.</translation>
+ </message>
+ <message>
<source>(default: %s)</source>
- <translation>(por defeito: %s)</translation>
+ <translation>(predefiniรงรฃo: %s)</translation>
+ </message>
+ <message>
+ <source>Always query for peer addresses via DNS lookup (default: %u)</source>
+ <translation>Utilizar sempre a consulta de DNS para endereรงos de pares (predefiniรงรฃo: %u)</translation>
</message>
<message>
<source>Error loading wallet.dat</source>
<translation>Erro ao carregar wallet.dat</translation>
</message>
<message>
+ <source>Generate coins (default: %u)</source>
+ <translation>Gerar moedas (predefiniรงรฃo: %u)</translation>
+ </message>
+ <message>
+ <source>How many blocks to check at startup (default: %u, 0 = all)</source>
+ <translation>Quantos blocos para verificar no arranque (predefiniรงรฃo: %u, 0 = todos)</translation>
+ </message>
+ <message>
+ <source>Include IP addresses in debug output (default: %u)</source>
+ <translation>Incluir endereรงos de IP na informaรงรฃo de depuraรงรฃo (predefiniรงรฃo: %u)</translation>
+ </message>
+ <message>
<source>Invalid -proxy address: '%s'</source>
<translation>Endereรงo -proxy invรกlido: '%s'</translation>
</message>
<message>
<source>Listen for JSON-RPC connections on &lt;port&gt; (default: %u or testnet: %u)</source>
- <translation>Escutar por ligaรงรตes JSON-RPC na porta &lt;port&gt; (por defeito: %u ou rede de testes: %u)</translation>
+ <translation>Escutar por ligaรงรตes JSON-RPC na porta &lt;port&gt; (predefiniรงรฃo: %u ou rede de testes: %u)</translation>
</message>
<message>
<source>Listen for connections on &lt;port&gt; (default: %u or testnet: %u)</source>
@@ -3037,6 +3645,10 @@
<translation>Manter no mรกximo &lt;n&gt; ligaรงรตes a outros nรณs da rede (por defeito: %u)</translation>
</message>
<message>
+ <source>Make the wallet broadcast transactions</source>
+ <translation>Colocar a carteira a transmitir transacรงรตes</translation>
+ </message>
+ <message>
<source>Maximum per-connection receive buffer, &lt;n&gt;*1000 bytes (default: %u)</source>
<translation>Maximo armazenamento intermรฉdio de recepรงรฃo por ligaรงรฃo, &lt;n&gt;*1000 bytes (por defeito: %u)</translation>
</message>
@@ -3049,8 +3661,16 @@
<translation>Adicionar data e hora ร  informaรงรฃo de depuraรงรฃo (por defeito: %u)</translation>
</message>
<message>
+ <source>Relay and mine data carrier transactions (default: %u)</source>
+ <translation>Propagar e minerar transacรงรตes que incluem dados (padrรฃo: %u)</translation>
+ </message>
+ <message>
+ <source>Relay non-P2SH multisig (default: %u)</source>
+ <translation>Propagar nรฃo P2SH multisig (predefiniรงรฃo: %u)</translation>
+ </message>
+ <message>
<source>Set key pool size to &lt;n&gt; (default: %u)</source>
- <translation>Definir o tamanho da memรณria de chaves para &lt;n&gt; (por defeito: %u)</translation>
+ <translation>Definir tamanho do banco de memรณria da chave para &lt;n&gt; (predefiniรงรฃo: %u)</translation>
</message>
<message>
<source>Set minimum block size in bytes (default: %u)</source>
@@ -3069,6 +3689,18 @@
<translation>Especificar tempo de espera da ligaรงรฃo em milissegundos (mรญnimo 1, por defeito: %d)</translation>
</message>
<message>
+ <source>Specify pid file (default: %s)</source>
+ <translation>Especificar ficheiro pid (padrรฃo: %s)</translation>
+ </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>
+ </message>
+ <message>
+ <source>Threshold for disconnecting misbehaving peers (default: %u)</source>
+ <translation>Tolerรขncia para desligar nรณs com comportamento indesejรกvel (padrรฃo: %u)</translation>
+ </message>
+ <message>
<source>Unknown network specified in -onlynet: '%s'</source>
<translation>Rede desconhecida especificada em -onlynet: '%s'</translation>
</message>
@@ -3090,7 +3722,7 @@
</message>
<message>
<source>Loading block index...</source>
- <translation>A carregar รญndice de blocos...</translation>
+ <translation>A carregar o รญndice de blocos...</translation>
</message>
<message>
<source>Add a node to connect to and attempt to keep the connection open</source>
@@ -3098,7 +3730,7 @@
</message>
<message>
<source>Loading wallet...</source>
- <translation>A carregar carteira...</translation>
+ <translation>A carregar a carteira...</translation>
</message>
<message>
<source>Cannot downgrade wallet</source>
@@ -3114,7 +3746,7 @@
</message>
<message>
<source>Done loading</source>
- <translation>Carregamento completo</translation>
+ <translation>Carregamento concluรญdo</translation>
</message>
<message>
<source>Error</source>
diff --git a/src/qt/locale/bitcoin_ro.ts b/src/qt/locale/bitcoin_ro.ts
new file mode 100644
index 0000000000..11ac69f0f2
--- /dev/null
+++ b/src/qt/locale/bitcoin_ro.ts
@@ -0,0 +1,169 @@
+<TS language="ro" version="2.1">
+<context>
+ <name>AddressBookPage</name>
+ <message>
+ <source>Right-click to edit address or label</source>
+ <translation>Click dreapta pentru a modifica adresa o eticheta</translation>
+ </message>
+ <message>
+ <source>Create a new address</source>
+ <translation>Creazฤƒ o nouฤƒ adresฤƒ</translation>
+ </message>
+ <message>
+ <source>&amp;New</source>
+ <translation>&amp;Nou</translation>
+ </message>
+ <message>
+ <source>Copy the currently selected address to the system clipboard</source>
+ <translation>Copiazฤƒ รฎn notiศ›e adresa selectatฤƒ รฎn prezent</translation>
+ </message>
+ <message>
+ <source>&amp;Copy</source>
+ <translation>&amp;Copiazฤƒ</translation>
+ </message>
+ <message>
+ <source>C&amp;lose</source>
+ <translation>รŽ&amp;nchide</translation>
+ </message>
+ <message>
+ <source>&amp;Copy Address</source>
+ <translation>&amp;Copiazฤƒ Adresa</translation>
+ </message>
+ <message>
+ <source>Delete the currently selected address from the list</source>
+ <translation>ศ˜terge adresa curentฤƒ selectata din listฤƒ</translation>
+ </message>
+ <message>
+ <source>Export the data in the current tab to a file</source>
+ <translation>Exportฤƒ datele din tabul curent in fisier</translation>
+ </message>
+ <message>
+ <source>&amp;Export</source>
+ <translation>&amp;Exportฤƒ</translation>
+ </message>
+ <message>
+ <source>Choose the address to send coins to</source>
+ <translation>Indicฤƒ adresa de expediere a monedelor</translation>
+ </message>
+ <message>
+ <source>Choose the address to receive coins with</source>
+ <translation>Indicฤƒ adresa de a primi monedele</translation>
+ </message>
+ </context>
+<context>
+ <name>AddressTableModel</name>
+ </context>
+<context>
+ <name>AskPassphraseDialog</name>
+ </context>
+<context>
+ <name>BanTableModel</name>
+ </context>
+<context>
+ <name>BitcoinGUI</name>
+ </context>
+<context>
+ <name>ClientModel</name>
+ </context>
+<context>
+ <name>CoinControlDialog</name>
+ </context>
+<context>
+ <name>EditAddressDialog</name>
+ </context>
+<context>
+ <name>FreespaceChecker</name>
+ </context>
+<context>
+ <name>HelpMessageDialog</name>
+ </context>
+<context>
+ <name>Intro</name>
+ </context>
+<context>
+ <name>OpenURIDialog</name>
+ </context>
+<context>
+ <name>OptionsDialog</name>
+ </context>
+<context>
+ <name>OverviewPage</name>
+ </context>
+<context>
+ <name>PaymentServer</name>
+ </context>
+<context>
+ <name>PeerTableModel</name>
+ </context>
+<context>
+ <name>QObject</name>
+ </context>
+<context>
+ <name>QRImageWidget</name>
+ </context>
+<context>
+ <name>RPCConsole</name>
+ </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>
+ </context>
+<context>
+ <name>ShutdownWindow</name>
+ </context>
+<context>
+ <name>SignVerifyMessageDialog</name>
+ </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>
+ <message>
+ <source>&amp;Export</source>
+ <translation>&amp;Exportฤƒ</translation>
+ </message>
+ <message>
+ <source>Export the data in the current tab to a file</source>
+ <translation>Exportฤƒ datele din tabul curent in fisier</translation>
+ </message>
+ </context>
+<context>
+ <name>bitcoin-core</name>
+ </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 8bccf037a7..502052dffb 100644
--- a/src/qt/locale/bitcoin_ro_RO.ts
+++ b/src/qt/locale/bitcoin_ro_RO.ts
@@ -27,7 +27,7 @@
</message>
<message>
<source>&amp;Copy Address</source>
- <translation>&amp;Copiazฤƒ adresa</translation>
+ <translation>&amp;Copiazฤƒ Adresa</translation>
</message>
<message>
<source>Delete the currently selected address from the list</source>
@@ -43,15 +43,15 @@
</message>
<message>
<source>&amp;Delete</source>
- <translation>ลžterge</translation>
+ <translation>&amp;ลžterge</translation>
</message>
<message>
<source>Choose the address to send coins to</source>
- <translation>Alegeลฃi adresa unde vreลฃi sฤƒ trimiteลฃi monezile</translation>
+ <translation>Alegeลฃi adresa unde vreลฃi sฤƒ trimiteลฃi monedele</translation>
</message>
<message>
<source>Choose the address to receive coins with</source>
- <translation>Alegeลฃi adresa unde vreลฃi sฤƒ primiลฃi monezile</translation>
+ <translation>Alegeลฃi adresa unde vreลฃi sฤƒ primiลฃi monedele</translation>
</message>
<message>
<source>C&amp;hoose</source>
@@ -67,7 +67,7 @@
</message>
<message>
<source>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source>
- <translation>Acestea sรฎnt adresele dumneavoastrฤƒ Bitcoin pentru efectuarea plฤƒลฃilor. Verificaลฃi รฎntotdeauna cantitatea ลŸi adresa de primire รฎnainte de a trimite monezi.</translation>
+ <translation>Acestea sรฎnt adresele dumneavoastrฤƒ Bitcoin pentru efectuarea plฤƒลฃilor. Verificaลฃi รฎntotdeauna cantitatea ลŸi adresa de primire รฎnainte de a trimite monede.</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>
@@ -222,7 +222,15 @@
</context>
<context>
<name>BanTableModel</name>
- </context>
+ <message>
+ <source>IP/Netmask</source>
+ <translation>IP/Netmask</translation>
+ </message>
+ <message>
+ <source>Banned Until</source>
+ <translation>Banat pรขnฤƒ la</translation>
+ </message>
+</context>
<context>
<name>BitcoinGUI</name>
<message>
@@ -547,7 +555,7 @@
<name>CoinControlDialog</name>
<message>
<source>Coin Selection</source>
- <translation>Selectarea monezii</translation>
+ <translation>Selectarea monedei</translation>
</message>
<message>
<source>Quantity:</source>
@@ -874,7 +882,35 @@
<source>command-line options</source>
<translation>Opลฃiuni linie de comandฤƒ</translation>
</message>
- </context>
+ <message>
+ <source>UI Options:</source>
+ <translation>Opลฃiuni UI:</translation>
+ </message>
+ <message>
+ <source>Choose data directory on startup (default: %u)</source>
+ <translation>Alege dosarul de date la pornire (implicit: %u)</translation>
+ </message>
+ <message>
+ <source>Set language, for example "de_DE" (default: system locale)</source>
+ <translation>Seteazฤƒ limba, de exemplu: "ro_RO" (implicit: sistem local)</translation>
+ </message>
+ <message>
+ <source>Start minimized</source>
+ <translation>Porniลฃi minimizat</translation>
+ </message>
+ <message>
+ <source>Set SSL root certificates for payment request (default: -system-)</source>
+ <translation>Setare rฤƒdฤƒcinฤƒ certificat SSL pentru cerere de platฤƒ (implicit: -sistem- )</translation>
+ </message>
+ <message>
+ <source>Show splash screen on startup (default: %u)</source>
+ <translation>AfiลŸeazฤƒ ecran splash la pornire (implicit: %u)</translation>
+ </message>
+ <message>
+ <source>Reset all settings changes made over the GUI</source>
+ <translation>Reseteazฤƒ toate schimbฤƒrile fฤƒcute รฎn GUI</translation>
+ </message>
+</context>
<context>
<name>Intro</name>
<message>
@@ -1012,6 +1048,10 @@
<translation>Reลฃea</translation>
</message>
<message>
+ <source>Automatically start Bitcoin Core after logging in to the system.</source>
+ <translation>PorneลŸte automat Bitcoin Core dupฤƒ logarea รฎn sistem.</translation>
+ </message>
+ <message>
<source>&amp;Start Bitcoin Core on system login</source>
<translation>PorneลŸte Nucleul Bitcoin la pornirea sistemului</translation>
</message>
@@ -1068,6 +1108,18 @@
<translation>Portul proxy (de exemplu: 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>&amp;Window</source>
<translation>&amp;Fereastrฤƒ</translation>
</message>
@@ -1313,6 +1365,10 @@
<translation>Agent utilizator</translation>
</message>
<message>
+ <source>Node/Service</source>
+ <translation>Nod/Serviciu</translation>
+ </message>
+ <message>
<source>Ping Time</source>
<translation>Timp ping</translation>
</message>
@@ -1402,10 +1458,6 @@
<translation>General</translation>
</message>
<message>
- <source>Using OpenSSL version</source>
- <translation>FoloseลŸte OpenSSL versiunea</translation>
- </message>
- <message>
<source>Using BerkeleyDB version</source>
<translation>FoloseลŸte BerkeleyDB versiunea</translation>
</message>
@@ -1434,6 +1486,14 @@
<translation>Numฤƒrul curent de blocuri</translation>
</message>
<message>
+ <source>Current number of transactions</source>
+ <translation>Numฤƒrul curent de tranzacลฃii</translation>
+ </message>
+ <message>
+ <source>Memory usage</source>
+ <translation>Memorie folositฤƒ</translation>
+ </message>
+ <message>
<source>Received</source>
<translation>Recepลฃionat</translation>
</message>
@@ -1450,6 +1510,10 @@
<translation>Selectaลฃi un partener pentru a vedea informaลฃiile detaliate.</translation>
</message>
<message>
+ <source>Whitelisted</source>
+ <translation>Whitelisted</translation>
+ </message>
+ <message>
<source>Direction</source>
<translation>Direcลฃie</translation>
</message>
@@ -1458,6 +1522,18 @@
<translation>Versiune</translation>
</message>
<message>
+ <source>Starting Block</source>
+ <translation>Bloc de รฎnceput</translation>
+ </message>
+ <message>
+ <source>Synced Headers</source>
+ <translation>Headere Sincronizate</translation>
+ </message>
+ <message>
+ <source>Synced Blocks</source>
+ <translation>Blocuri Sincronizate</translation>
+ </message>
+ <message>
<source>User Agent</source>
<translation>Agent utilizator</translation>
</message>
@@ -1526,6 +1602,26 @@
<translation>Curฤƒลฃฤƒ consola</translation>
</message>
<message>
+ <source>&amp;Disconnect Node</source>
+ <translation>&amp;Deconectare nod</translation>
+ </message>
+ <message>
+ <source>1 &amp;hour</source>
+ <translation>1 &amp;orฤƒ</translation>
+ </message>
+ <message>
+ <source>1 &amp;day</source>
+ <translation>1 &amp;zi</translation>
+ </message>
+ <message>
+ <source>1 &amp;week</source>
+ <translation>1 &amp;sฤƒptฤƒmรขnฤƒ</translation>
+ </message>
+ <message>
+ <source>1 &amp;year</source>
+ <translation>1 &amp;an</translation>
+ </message>
+ <message>
<source>Welcome to the Bitcoin Core RPC console.</source>
<translation>Bun venit la consola Nucleului Bitcoin RPC.</translation>
</message>
@@ -1570,6 +1666,14 @@
<translation>IeลŸire</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>
@@ -1918,6 +2022,10 @@
<translation>Copiazฤƒ rest</translation>
</message>
<message>
+ <source>Total Amount %1</source>
+ <translation>Suma totalฤƒ %1</translation>
+ </message>
+ <message>
<source>or</source>
<translation>sau</translation>
</message>
@@ -1950,6 +2058,10 @@
<translation>Adresa destinatarului nu este validฤƒ, vฤƒ rugฤƒm sฤƒ o verificaลฃi.</translation>
</message>
<message>
+ <source>Duplicate address found: addresses should only be used once each.</source>
+ <translation>Adresฤƒ duplicat gฤƒsitฤƒ: fiecare adresฤƒ ar trebui folositฤƒ o singurฤƒ datฤƒ.</translation>
+ </message>
+ <message>
<source>Warning: Invalid Bitcoin address</source>
<translation>Atenลฃie: Adresa bitcoin nevalidฤƒ!</translation>
</message>
@@ -2317,7 +2429,7 @@
</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>Monezile generate trebuie sฤƒ creascฤƒ %1 blocuri รฎnainte sฤƒ poatฤƒ fi cheltuite. Cรฎnd aลฃi generat acest bloc, a fost transmis reลฃelei pentru a fi adaugat la lanลฃul de blocuri. Aceasta se poate รฎntรฎmpla ocazional dacฤƒ alt nod genereazฤƒ un bloc la numai cรฎteva secunde de al dvs.</translation>
+ <translation>Monedele generate trebuie sฤƒ creascฤƒ %1 blocuri รฎnainte sฤƒ poatฤƒ fi cheltuite. Cรฎnd aลฃi generat acest bloc, a fost transmis reลฃelei pentru a fi adaugat la lanลฃul de blocuri. Aceasta se poate รฎntรฎmpla ocazional dacฤƒ alt nod genereazฤƒ un bloc la numai cรฎteva secunde de al dvs.</translation>
</message>
<message>
<source>Debug information</source>
diff --git a/src/qt/locale/bitcoin_ru.ts b/src/qt/locale/bitcoin_ru.ts
index 00dfd833ab..b4546a2157 100644
--- a/src/qt/locale/bitcoin_ru.ts
+++ b/src/qt/locale/bitcoin_ru.ts
@@ -1474,10 +1474,6 @@
<translation>ะžะฑั‰ะธะต</translation>
</message>
<message>
- <source>Using OpenSSL version</source>
- <translation>ะ˜ัะฟะพะปัŒะทัƒะตั‚ัั ะฒะตั€ัะธั OpenSSL</translation>
- </message>
- <message>
<source>Using BerkeleyDB version</source>
<translation>ะ˜ัะฟะพะปัŒะทัƒะตั‚ัั ะฒะตั€ัะธั BerkeleyDB</translation>
</message>
@@ -2996,6 +2992,10 @@
<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>
+ </message>
+ <message>
<source>Set the number of script verification threads (%u to %d, 0 = auto, &lt;0 = leave that many cores free, default: %d)</source>
<translation>ะ—ะฐะดะฐั‚ัŒ ั‡ะธัะปะพ ะฟะพั‚ะพะบะพะฒ ะฟั€ะพะฒะตั€ะบะธ ัะบั€ะธะฟั‚ะฐ (ะพั‚ %u ะดะพ %d, 0=ะฐะฒั‚ะพ, &lt;0 = ะพัั‚ะฐะฒะธั‚ัŒ ัั‚ะพะปัŒะบะพ ัะดะตั€ ัะฒะพะฑะพะดะฝั‹ะผะธ, ะฟะพ ัƒะผะพะปั‡ะฐะฝะธัŽ: %d)</translation>
</message>
@@ -3028,6 +3028,10 @@
<translation>ะ’ะฝะธะผะฐะฝะธะต: ะฟะพั…ะพะถะต, ะฒ ัะตั‚ะธ ะฝะตั‚ ะฟะพะปะฝะพะณะพ ัะพะณะปะฐัะธั! ะะตะบะพั‚ะพั€ั‹ะน ะผะฐะนะฝะตั€ั‹, ะฒะพะทะผะพะถะฝะพ, ะธัะฟั‹ั‚ั‹ะฒะฐัŽั‚ ะฟั€ะพะฑะปะตะผั‹.</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: 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>
@@ -3048,6 +3052,10 @@
<translation>&lt;category&gt; ะผะพะถะตั‚ ะฑั‹ั‚ัŒ:</translation>
</message>
<message>
+ <source>Append comment to the user agent string</source>
+ <translation>ะ”ะพะฑะฐะฒะธั‚ัŒ ะบะพะผะผะตะฝั‚ะฐั€ะธะน ะบ ัั‚ั€ะพะบะต ะฟะพะปัŒะทะพะฒะฐั‚ะตะปัŒัะบะพะณะพ ะฐะณะตะฝั‚ะฐ</translation>
+ </message>
+ <message>
<source>Block creation options:</source>
<translation>ะŸะฐั€ะฐะผะตั‚ั€ั‹ ัะพะทะดะฐะฝะธั ะฑะปะพะบะพะฒ:</translation>
</message>
@@ -3132,6 +3140,10 @@
<translation>ะกะฑั€ะฐัั‹ะฒะฐั‚ัŒ ั‚ั€ะฐะฝะทะฐะบั†ะธะธ ะธะท ะฟะฐะผัั‚ะธ ะฝะฐ ะดะธัะบ ะบะฐะถะดั‹ะต &lt;n&gt; ะผะตะณะฐะฑะฐะนั‚ (ะฟะพ ัƒะผะพะปั‡ะฐะฝะธัŽ: %u)</translation>
</message>
<message>
+ <source>Location of the auth cookie (default: data dir)</source>
+ <translation>ะ ะฐัะฟะพะปะพะถะตะฝะธะต ะบัƒะบะธ ะฒั…ะพะดั‹(ะฟะพ ัƒะผะพะปั‡ะฐะฝะธัŽ: data dir)</translation>
+ </message>
+ <message>
<source>Not enough file descriptors available.</source>
<translation>ะะตะดะพัั‚ะฐั‚ะพั‡ะฝะพ ั„ะฐะนะปะพะฒั‹ั… ะดะตัะบั€ะธะฟั‚ะพั€ะพะฒ.</translation>
</message>
@@ -3140,6 +3152,10 @@
<translation>ะกะพะตะดะธะฝัั‚ัŒัั ั‚ะพะปัŒะบะพ ะฟะพ ัะตั‚ะธ &lt;net&gt; (ipv4, ipv6 ะธะปะธ onion)</translation>
</message>
<message>
+ <source>Print version and exit</source>
+ <translation>ะะฐะฟะธัะฐั‚ัŒ ะฒะตั€ัะธัŽ ะธ ะฒั‹ะนั‚ะธ</translation>
+ </message>
+ <message>
<source>Prune cannot be configured with a negative value.</source>
<translation>ะฃะดะฐะปะตะฝะธะต ะฑะปะพะบะพะฒ ะฝะต ะผะพะถะตั‚ ะธัะฟะพะปัŒะทะพะฒะฐั‚ัŒ ะพั‚ั€ะธั†ะฐั‚ะตะปัŒะฝะพะต ะทะฝะฐั‡ะตะฝะธะต.</translation>
</message>
@@ -3196,10 +3212,6 @@
<translation>ะะฐัั‚ั€ะพะนะบะธ ะฑัƒะผะฐะถะฝะธะบะฐ:</translation>
</message>
<message>
- <source>Warning: This version is obsolete; upgrade required!</source>
- <translation>ะ’ะฝะธะผะฐะฝะธะต: ัั‚ะฐ ะฒะตั€ัะธั ัƒัั‚ะฐั€ะตะปะฐ; ั‚ั€ะตะฑัƒะตั‚ัั ะพะฑะฝะพะฒะปะตะฝะธะต!</translation>
- </message>
- <message>
<source>You need to rebuild the database using -reindex to change -txindex</source>
<translation>ะ’ะฐะผ ะฝะตะพะฑั…ะพะดะธะผะพ ะฟะตั€ะตัะพะฑั€ะฐั‚ัŒ ะฑะฐะทั‹ ะดะฐะฝะฝั‹ั… ั ะฟะพะผะพั‰ัŒัŽ -reindex, ั‡ั‚ะพะฑั‹ ะธะทะผะตะฝะธั‚ัŒ -txindex</translation>
</message>
@@ -3296,10 +3308,6 @@
<translation>ะะบั‚ะธะฒะธั€ัƒะตั‚ัั ะปัƒั‡ัˆะฐั ั†ะตะฟัŒ...</translation>
</message>
<message>
- <source>Always relay transactions received from whitelisted peers (default: %d)</source>
- <translation>ะ’ัะตะณะดะฐ ั‚ั€ะฐะฝัะปะธั€ะพะฒะฐั‚ัŒ ั‚ั€ะฐะฝะทะฐะบั†ะธะธ, ะฟะพะปัƒั‡ะตะฝะฝั‹ะต ะธะท ะฑะตะปะพะณะพ ัะฟะธัะบะฐ ัƒั‡ะฐัั‚ะฝะธะบะพะฒ (ะฟะพ ัƒะผะพะปั‡ะฐะฝะธัŽ: %d)</translation>
- </message>
- <message>
<source>Attempt to recover private keys from a corrupt wallet.dat on startup</source>
<translation>ะŸะพะฟั‹ั‚ะฐั‚ัŒัั ะฒะพััั‚ะฐะฝะพะฒะธั‚ัŒ ะฟั€ะธะฒะฐั‚ะฝั‹ะต ะบะปัŽั‡ะธ ะธะท ะฟะพะฒั€ะตะถะดั‘ะฝะฝะพะณะพ wallet.dat ะฟั€ะธ ะทะฐะฟัƒัะบะต</translation>
</message>
@@ -3464,6 +3472,10 @@
<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>
diff --git a/src/qt/locale/bitcoin_ru_RU.ts b/src/qt/locale/bitcoin_ru_RU.ts
index 53a1c1d8a4..41e467e496 100644
--- a/src/qt/locale/bitcoin_ru_RU.ts
+++ b/src/qt/locale/bitcoin_ru_RU.ts
@@ -1,6 +1,50 @@
<TS language="ru_RU" version="2.1">
<context>
<name>AddressBookPage</name>
+ <message>
+ <source>Create a new address</source>
+ <translation>ะกะพะทะดะฐั‚ัŒ ะฝะพะฒั‹ะน ะฐะดั€ะตั</translation>
+ </message>
+ <message>
+ <source>&amp;New</source>
+ <translation>ะะพะฒั‹ะน</translation>
+ </message>
+ <message>
+ <source>Copy the currently selected address to the system clipboard</source>
+ <translation>Copy the currently selected address to the system clipboardั‹ะน ะฐะดั€ะตั ะฒ ะฑัƒั„ะตั€</translation>
+ </message>
+ <message>
+ <source>&amp;Copy</source>
+ <translation>ะšะพะฟะธั€ะพะฒะฐั‚ัŒ</translation>
+ </message>
+ <message>
+ <source>C&amp;lose</source>
+ <translation>ะ—ะฐะบั€ั‹ั‚ัŒ</translation>
+ </message>
+ <message>
+ <source>&amp;Copy Address</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>&amp;Export</source>
+ <translation>ะญะบัะฟะพั€ั‚ะธั€ะพะฒะฐั‚ัŒ</translation>
+ </message>
+ <message>
+ <source>&amp;Delete</source>
+ <translation>ะฃะดะฐะปะธั‚ัŒ</translation>
+ </message>
+ <message>
+ <source>C&amp;hoose</source>
+ <translation>ะ’ั‹ะฑั€ะฐั‚ัŒ</translation>
+ </message>
</context>
<context>
<name>AddressTableModel</name>
@@ -226,6 +270,14 @@
</context>
<context>
<name>WalletView</name>
+ <message>
+ <source>&amp;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>
diff --git a/src/qt/locale/bitcoin_sk.ts b/src/qt/locale/bitcoin_sk.ts
index 8c779cbe98..9addbdaa8a 100644
--- a/src/qt/locale/bitcoin_sk.ts
+++ b/src/qt/locale/bitcoin_sk.ts
@@ -63,7 +63,7 @@
</message>
<message>
<source>Receiving addresses</source>
- <translation>Adresa prijatia</translation>
+ <translation>Prijรญmacia adresa</translation>
</message>
<message>
<source>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source>
@@ -222,7 +222,15 @@
</context>
<context>
<name>BanTableModel</name>
- </context>
+ <message>
+ <source>IP/Netmask</source>
+ <translation>IP/Maska stiete</translation>
+ </message>
+ <message>
+ <source>Banned Until</source>
+ <translation>Blokovanรฝ do</translation>
+ </message>
+</context>
<context>
<name>BitcoinGUI</name>
<message>
@@ -874,7 +882,35 @@
<source>command-line options</source>
<translation>voฤพby prรญkazovรฉho riadku</translation>
</message>
- </context>
+ <message>
+ <source>UI Options:</source>
+ <translation>Moลพnosti pouลพรญvateฤพskรฉho rozhrania:</translation>
+ </message>
+ <message>
+ <source>Choose data directory on startup (default: %u)</source>
+ <translation>Vyberte dรกtovรฝ prieฤinok pri ลกtarte (predvolenรฉ: %u)</translation>
+ </message>
+ <message>
+ <source>Set language, for example "de_DE" (default: system locale)</source>
+ <translation>Nastavte jazyk, naprรญklad "de_DE" (predvolenรฉ: podฤพa systรฉmu)</translation>
+ </message>
+ <message>
+ <source>Start minimized</source>
+ <translation>Spustiลฅ minimalizovanรฉ</translation>
+ </message>
+ <message>
+ <source>Set SSL root certificates for payment request (default: -system-)</source>
+ <translation>Nastaviลฅ SSL root certifikรกty pre vyลพiadanie platby (predvolenรฉ: -system-)</translation>
+ </message>
+ <message>
+ <source>Show splash screen on startup (default: %u)</source>
+ <translation>Zobraziลฅ uvรญtaciu obrazovku pri ลกtarte (predvolenรฉ: %u)</translation>
+ </message>
+ <message>
+ <source>Reset all settings changes made over the GUI</source>
+ <translation>Reลกtartovaลฅ vลกetky nastavenia urobenรฉ v pouลพรญvateฤพskom rozhranรญ.</translation>
+ </message>
+</context>
<context>
<name>Intro</name>
<message>
@@ -1009,7 +1045,7 @@
</message>
<message>
<source>&amp;Network</source>
- <translation>Sieลฅ</translation>
+ <translation>&amp;Sieลฅ</translation>
</message>
<message>
<source>Automatically start Bitcoin Core after logging in to the system.</source>
@@ -1025,7 +1061,7 @@
</message>
<message>
<source>W&amp;allet</source>
- <translation>Peลˆaลพenka</translation>
+ <translation>&amp;Peลˆaลพenka</translation>
</message>
<message>
<source>Expert</source>
@@ -1072,12 +1108,36 @@
<translation>Port proxy (napr. 9050)</translation>
</message>
<message>
+ <source>Used for reaching peers via:</source>
+ <translation>Pouลพitรฉ pre zรญskavanie peerov cez:</translation>
+ </message>
+ <message>
+ <source>Shows, if the supplied default SOCKS5 proxy is used to reach peers via this network type.</source>
+ <translation>Zobrazuje, ฤi je poskytovanรฉ predvolenรฉ SOCKS5 proxy pouลพรญvanรฉ pre zรญskavanie peerov cez tento typ siete.</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>Pripojiลฅ k Bitcoinovej sieti cez separovanรฉ SOCKS5 proxy pre skrytรบ sluลพbu Tor.</translation>
+ </message>
+ <message>
<source>Use separate SOCKS5 proxy to reach peers via Tor hidden services:</source>
<translation>Pouลพiลฅ samostatnรฝ SOCKS5 proxy server na dosiahnutie poฤรญtaฤov cez skrytรฉ sluลพby Tor:</translation>
</message>
<message>
<source>&amp;Window</source>
- <translation>Okno</translation>
+ <translation>&amp;Okno</translation>
</message>
<message>
<source>Show only a tray icon after minimizing the window.</source>
@@ -1093,7 +1153,7 @@
</message>
<message>
<source>&amp;Display</source>
- <translation>&amp;Displej</translation>
+ <translation>&amp;Zobrazenie</translation>
</message>
<message>
<source>User Interface &amp;language:</source>
@@ -1414,10 +1474,6 @@
<translation>Vลกeobecnรฉ</translation>
</message>
<message>
- <source>Using OpenSSL version</source>
- <translation>Pouลพรญva OpenSSL verziu</translation>
- </message>
- <message>
<source>Using BerkeleyDB version</source>
<translation>Pouลพรญva BerkeleyDB verziu</translation>
</message>
@@ -1446,6 +1502,18 @@
<translation>Aktuรกlny poฤet blokov</translation>
</message>
<message>
+ <source>Memory Pool</source>
+ <translation>Pamรคลฅ Poolu</translation>
+ </message>
+ <message>
+ <source>Current number of transactions</source>
+ <translation>Aktuรกlny poฤet tranzakciรญ</translation>
+ </message>
+ <message>
+ <source>Memory usage</source>
+ <translation>Vyuลพitie pamรคte</translation>
+ </message>
+ <message>
<source>Open the Bitcoin Core debug log file from the current data directory. This can take a few seconds for large log files.</source>
<translation>Otvoriลฅ Bitcoin log sรบbor pre ladenie z aktuรกlneho dรกtovรฉho adresรกra. Toto mรดลพe trvaลฅ niekoฤพko sekรบnd pre veฤพkรฉ sรบbory.</translation>
</message>
@@ -1462,10 +1530,18 @@
<translation>&amp;Partneri</translation>
</message>
<message>
+ <source>Banned peers</source>
+ <translation>Zablokovanรฉ spojenia</translation>
+ </message>
+ <message>
<source>Select a peer to view detailed information.</source>
<translation>Vyberte poฤรญtaฤ pre zobrazenie podrobnostรญ.</translation>
</message>
<message>
+ <source>Whitelisted</source>
+ <translation>Povolenรฉ</translation>
+ </message>
+ <message>
<source>Direction</source>
<translation>Smer</translation>
</message>
@@ -1474,6 +1550,19 @@
<translation>Verzia</translation>
</message>
<message>
+ <source>Starting Block</source>
+ <translation>Poฤiatoฤnรฝ Blok</translation>
+ </message>
+ <message>
+ <source>Synced Headers</source>
+ <translation>Synchronizovanรฉ hlaviฤky
+</translation>
+ </message>
+ <message>
+ <source>Synced Blocks</source>
+ <translation>Synchronizovanรฉ bloky</translation>
+ </message>
+ <message>
<source>User Agent</source>
<translation>Aplikรกcia</translation>
</message>
@@ -1502,6 +1591,10 @@
<translation>ฤŒas odozvy</translation>
</message>
<message>
+ <source>Ping Wait</source>
+ <translation>ฤŒakanie na ping</translation>
+ </message>
+ <message>
<source>Time Offset</source>
<translation>ฤŒasovรฝ posun</translation>
</message>
@@ -1550,6 +1643,34 @@
<translation>Vymazaลฅ konzolu</translation>
</message>
<message>
+ <source>&amp;Disconnect Node</source>
+ <translation>&amp;Odpojenรฉ uzly</translation>
+ </message>
+ <message>
+ <source>Ban Node for</source>
+ <translation>Blokovaลฅ uzol na</translation>
+ </message>
+ <message>
+ <source>1 &amp;hour</source>
+ <translation>1 &amp;hodinu</translation>
+ </message>
+ <message>
+ <source>1 &amp;day</source>
+ <translation>1 &amp;deลˆ</translation>
+ </message>
+ <message>
+ <source>1 &amp;week</source>
+ <translation>1 &amp;tรฝลพdeลˆ</translation>
+ </message>
+ <message>
+ <source>1 &amp;year</source>
+ <translation>1 &amp;rok</translation>
+ </message>
+ <message>
+ <source>&amp;Unban Node</source>
+ <translation>&amp;odblokovaลฅ uzol</translation>
+ </message>
+ <message>
<source>Welcome to the Bitcoin Core RPC console.</source>
<translation>Vitajte v RPC konzole pre Jadro Bitcoin.</translation>
</message>
@@ -1578,6 +1699,10 @@
<translation>%1 GB</translation>
</message>
<message>
+ <source>(node id: %1)</source>
+ <translation>(ID uzlu: %1)</translation>
+ </message>
+ <message>
<source>via %1</source>
<translation>cez %1</translation>
</message>
@@ -1594,6 +1719,14 @@
<translation>Odchรกdzajรบce</translation>
</message>
<message>
+ <source>Yes</source>
+ <translation>รno</translation>
+ </message>
+ <message>
+ <source>No</source>
+ <translation>Nie</translation>
+ </message>
+ <message>
<source>Unknown</source>
<translation>neznรกmy</translation>
</message>
@@ -1962,6 +2095,10 @@
<translation>Kopรญrovaลฅ zmenu</translation>
</message>
<message>
+ <source>Total Amount %1</source>
+ <translation>Celkovรฉ mnoลพstvo %1</translation>
+ </message>
+ <message>
<source>or</source>
<translation>alebo</translation>
</message>
@@ -1994,6 +2131,10 @@
<translation>Vyprลกala platnosลฅ poลพiadavky na platbu.</translation>
</message>
<message>
+ <source>Pay only the required fee of %1</source>
+ <translation>Zaplatiลฅ len vyลพadovanรฝ poplatok z %1</translation>
+ </message>
+ <message>
<source>The recipient address is not valid. Please recheck.</source>
<translation>Adresa prรญjemcu je neplatnรก. Prosรญm, overte ju.</translation>
</message>
@@ -2073,6 +2214,10 @@
<translation>Odstrรกniลฅ tรบto poloลพku</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>Poplatok sa odpoฤรญta od ฤiastky, ktorรบ odosielate. Prรญjemca dostane menej bitcoinov ako zadรกte. Ak je vybranรฝch viacero prรญjemcov, poplatok je rozdelenรฝ rovnรฝm dielom.</translation>
+ </message>
+ <message>
<source>S&amp;ubtract fee from amount</source>
<translation>Odpoฤรญtaลฅ poplatok od s&amp;umy</translation>
</message>
@@ -2127,6 +2272,10 @@
<translation>&amp;Podpรญsaลฅ Sprรกvu</translation>
</message>
<message>
+ <source>The Bitcoin address to sign the message with</source>
+ <translation>Bitcoin adresa pre podpรญsanie sprรกvy s</translation>
+ </message>
+ <message>
<source>Choose previously used address</source>
<translation>Vybraลฅ predtรฝm pouลพitรบ adresu</translation>
</message>
@@ -2601,6 +2750,10 @@
<translation>Kopรญrovaลฅ ID transakcie</translation>
</message>
<message>
+ <source>Copy raw transaction</source>
+ <translation>Kopรญrovaลฅ celรบ tranzakciu</translation>
+ </message>
+ <message>
<source>Edit label</source>
<translation>Editovaลฅ popis</translation>
</message>
@@ -2748,10 +2901,30 @@
<translation>Prijรญmaลฅ prรญkazy z prรญkazovรฉho riadku a JSON-RPC</translation>
</message>
<message>
+ <source>Please check that your computer's date and time are correct! If your clock is wrong Bitcoin Core will not work properly.</source>
+ <translation>Skontrolujte sprรกvnosลฅ nastavenia dรกtumu a ฤasu na vaลกom poฤรญtaฤi! Ak je ฤas nesprรกvny Jadro Bitcoin nebude sprรกvne fungovaลฅ.</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>
+ <message>
+ <source>Fee (in %s/kB) to add to transactions you send (default: %s)</source>
+ <translation>Poplatok (za %s/kB) pridanรฝ do tranzakcie, ktorรบ posielate (predvolenรฉ: %s)</translation>
+ </message>
+ <message>
+ <source>Pruning blockstore...</source>
+ <translation>Redukovanie blockstore...</translation>
+ </message>
+ <message>
<source>Run in the background as a daemon and accept commands</source>
<translation>Beลพaลฅ na pozadรญ ako dรฉmon a prijรญmaลฅ prรญkazy</translation>
</message>
<message>
+ <source>Unable to start HTTP server. See debug log for details.</source>
+ <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>
@@ -2784,6 +2957,14 @@
<translation>Nepodarilo sa pripojiลฅ na %s na tomto poฤรญtaฤi. Bitcoin Jadro je uลพ pravdepodobne spustenรฉ.</translation>
</message>
<message>
+ <source>WARNING: abnormally high number of blocks generated, %d blocks received in the last %d hours (%d expected)</source>
+ <translation>VAROVANIE: prรญliลก veฤพa vygenerovanรฝch blokov; %d prijatรฝch blokov v poslednรฝch %d hodinรกch (oฤakรกvanรฝch %d)</translation>
+ </message>
+ <message>
+ <source>WARNING: check your network connection, %d blocks received in the last %d hours (%d expected)</source>
+ <translation>VAROVANIE: skontrolujte sieลฅovรฉ pripojenie, %d prijatรฝch blokov za poslednรฝch %d hodรญn (oฤakรกvanรฉ %d)</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.
@@ -2802,6 +2983,10 @@ The network does not appear to fully agree! Some miners appear to be experiencin
<translation>Uzle na zoznam povolenรฝch, ktorรฉ sa pripรกjajรบ z danej netmask alebo IP adresy. Mรดลพe byลฅ zadanรฉ viac krรกt.</translation>
</message>
<message>
+ <source>-maxmempool must be at least %d MB</source>
+ <translation>-maxmempool musรญ byลฅ najmenej %d MB</translation>
+ </message>
+ <message>
<source>&lt;category&gt; can be:</source>
<translation>&lt;category&gt; mรดลพe byลฅ:</translation>
</message>
@@ -2834,6 +3019,18 @@ The network does not appear to fully agree! Some miners appear to be experiencin
<translation>Chcete znovu zostaviลฅ databรกzu blokov?</translation>
</message>
<message>
+ <source>Enable publish hash block in &lt;address&gt;</source>
+ <translation>Povoliลฅ zverejneneie hash blokov pre &lt;address&gt;</translation>
+ </message>
+ <message>
+ <source>Enable publish hash transaction in &lt;address&gt;</source>
+ <translation>Povoliลฅ zverejnenie hash tranzakciรญ pre &lt;address&gt;</translation>
+ </message>
+ <message>
+ <source>Enable publish raw block in &lt;address&gt;</source>
+ <translation>Povoliลฅ zverejnenie raw bloku pre &lt;address&gt;</translation>
+ </message>
+ <message>
<source>Error initializing block database</source>
<translation>Chyba inicializรกcie databรกzy blokov</translation>
</message>
@@ -2870,6 +3067,10 @@ The network does not appear to fully agree! Some miners appear to be experiencin
<translation>Neplatnรก -onion adresa: '%s'</translation>
</message>
<message>
+ <source>Invalid amount for -fallbackfee=&lt;amount&gt;: '%s'</source>
+ <translation>Neplatnรก suma pre -fallbackfee=&lt;amount&gt;: '%s'</translation>
+ </message>
+ <message>
<source>Not enough file descriptors available.</source>
<translation>Nedostatok kฤพรบฤovรฝch slov sรบboru.</translation>
</message>
@@ -2878,6 +3079,14 @@ The network does not appear to fully agree! Some miners appear to be experiencin
<translation>Pripojiลฅ iba k uzlom v sieti &lt;net&gt; (ipv4, ipv6, alebo onion)</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>
+ <message>
+ <source>Prune mode is incompatible with -txindex.</source>
+ <translation>Redukovanie je nekompatibilnรฉ s -txindex.</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>
@@ -2890,6 +3099,18 @@ 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>Unsupported argument -benchmark ignored, use -debug=bench.</source>
+ <translation>Nepodporovanรฝ parameter -benchmark bol ignorovanรฝ, pouลพite -debug=bench.</translation>
+ </message>
+ <message>
+ <source>Unsupported argument -debugnet ignored, use -debug=net.</source>
+ <translation>Nepodporovanรฝ argument -debugnet bol ignorovanรฝ, pouลพite -debug=net.</translation>
+ </message>
+ <message>
+ <source>Unsupported argument -tor found, use -onion.</source>
+ <translation>Nepodporovanรฝ argument -tor, pouลพite -onion.</translation>
+ </message>
+ <message>
<source>Use UPnP to map the listening port (default: %u)</source>
<translation>Pouลพiลฅ UPnP pre mapovanie poฤรบvajรบceho portu (predvolenรฉ: %u)</translation>
</message>
@@ -2934,6 +3155,10 @@ The network does not appear to fully agree! Some miners appear to be experiencin
<translation>Vytvoriลฅ novรฉ sรบbory z predvolenรฝmi systรฉmovรฝmi prรกvami, namiesto umask 077 (funguje iba z vypnutou funkcionalitou peลˆaลพenky)</translation>
</message>
<message>
+ <source>Discover own IP addresses (default: 1 when listening and no -externalip or -proxy)</source>
+ <translation>Zisti vlastnรบ IP adresu (predvolenรฉ: 1 pre listen a -externalip alebo -proxy)</translation>
+ </message>
+ <message>
<source>Error: Listening for incoming connections failed (listen returned error %s)</source>
<translation>Chyba: Poฤรบvanie prichรกdzajรบcich spojenรญ zlyhalo (vrรกtenรก chyba je %s)</translation>
</message>
@@ -2966,6 +3191,10 @@ The network does not appear to fully agree! Some miners appear to be experiencin
<translation>Nastaviลฅ poฤet vlรกkien pre generรกciu mincรญ (-1 = vลกetky jadrรก, predvolenรฉ: %d)</translation>
</message>
<message>
+ <source>The transaction amount is too small to send after the fee has been deducted</source>
+ <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 &lt;https://www.openssl.org/&gt; 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 &lt;https://www.openssl.org/&gt; a kryptografickรฉho softvรฉru napรญsanรฉho Eric Young a UPnP softvรฉr napรญsanรฝ Thomas Bernard.</translation>
</message>
@@ -2982,6 +3211,18 @@ The network does not appear to fully agree! Some miners appear to be experiencin
<translation>Akceptovaลฅ verejnรฉ REST ลพiadosti (predvolenรฉ: %u)</translation>
</message>
<message>
+ <source>Activating best chain...</source>
+ <translation>Aktivรกcia najlepลกej reลฅaze...</translation>
+ </message>
+ <message>
+ <source>Attempt to recover private keys from a corrupt wallet.dat on startup</source>
+ <translation>Pokus o obnovenie privรกtnych kฤพรบฤov z poลกkodenej wallet.dat pri spustenรญ</translation>
+ </message>
+ <message>
+ <source>Automatically create Tor hidden service (default: %d)</source>
+ <translation>Automaticky vytvoriลฅ skrytรบ sluลพbu Tor (predvolenรฉ: %d)</translation>
+ </message>
+ <message>
<source>Cannot resolve -whitebind address: '%s'</source>
<translation>Nedรก sa vyrieลกiลฅ -whitebind adresa: '%s'</translation>
</message>
@@ -3002,10 +3243,18 @@ The network does not appear to fully agree! Some miners appear to be experiencin
<translation>Chyba pri naฤรญtanรญ z databรกzy, ukonฤuje sa.</translation>
</message>
<message>
+ <source>Imports blocks from external blk000??.dat file on startup</source>
+ <translation>Importovaลฅ bloky z externรฉho sรบboru blk000??.dat pri ลกtarte</translation>
+ </message>
+ <message>
<source>Information</source>
<translation>Informรกcia</translation>
</message>
<message>
+ <source>Initialization sanity check failed. Bitcoin Core is shutting down.</source>
+ <translation>Inicializaฤnรก kontrola zlyhala. Jadro Bitcoin sa ukonฤuje.</translation>
+ </message>
+ <message>
<source>Invalid amount for -maxtxfee=&lt;amount&gt;: '%s'</source>
<translation>Neplatnรก suma pre -maxtxfee=&lt;amount&gt;: '%s'</translation>
</message>
@@ -3066,10 +3315,18 @@ The network does not appear to fully agree! Some miners appear to be experiencin
<translation>Podpรญsanie sprรกvy zlyhalo</translation>
</message>
<message>
+ <source>The transaction amount is too small to pay the fee</source>
+ <translation>Suma tranzakcie je prรญliลก malรก na zaplatenie poplatku</translation>
+ </message>
+ <message>
<source>This is experimental software.</source>
<translation>Toto je experimentรกlny softvรฉr.</translation>
</message>
<message>
+ <source>Tor control port password (default: empty)</source>
+ <translation>Heslo na kontrolu portu pre Tor (predvolenรฉ: ลพiadne)</translation>
+ </message>
+ <message>
<source>Transaction amount too small</source>
<translation>Suma transakcie prรญliลก malรก</translation>
</message>
@@ -3090,10 +3347,18 @@ The network does not appear to fully agree! Some miners appear to be experiencin
<translation>Na tomto poฤรญtaฤi sa nedรก vytvoriลฅ vรคzba %s (vytvorenie vรคzby vrรกtilo chybu %s)</translation>
</message>
<message>
+ <source>Upgrade wallet to latest format on startup</source>
+ <translation>Aktualizovaลฅ peลˆaลพenku na poslednรฝ formรกt pri ลกtarte</translation>
+ </message>
+ <message>
<source>Username for JSON-RPC connections</source>
<translation>Uลพรญvateฤพskรฉ meno pre JSON-RPC spojenia</translation>
</message>
<message>
+ <source>Wallet needed to be rewritten: restart Bitcoin Core to complete</source>
+ <translation>Peลˆaลพenka musรญ byลฅ prepรญsanรก: pre dokonฤenie reลกtartujte Jadro Bitcoin</translation>
+ </message>
+ <message>
<source>Warning</source>
<translation>Upozornenie</translation>
</message>
diff --git a/src/qt/locale/bitcoin_sl_SI.ts b/src/qt/locale/bitcoin_sl_SI.ts
index c62c8cf273..1b540a7310 100644
--- a/src/qt/locale/bitcoin_sl_SI.ts
+++ b/src/qt/locale/bitcoin_sl_SI.ts
@@ -427,7 +427,7 @@
</message>
<message numerus="yes">
<source>%n active connection(s) to Bitcoin network</source>
- <translation><numerusform>%n aktivna povezava v bitcoin omreลพje</numerusform><numerusform>%n aktivni povezavi v bitcoin omreลพje</numerusform><numerusform>%n aktivne povezave v bitcoin omreลพje</numerusform><numerusform>%n aktivnih povezav v bitcoin omreลพje</numerusform></translation>
+ <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>
@@ -463,7 +463,7 @@
</message>
<message>
<source>Last received block was generated %1 ago.</source>
- <translation>Zadnji prejeti blok je bil ustvarjen %1 nazaj.</translation>
+ <translation>Zadnji prejeti blok je star %1.</translation>
</message>
<message>
<source>Transactions after this will not yet be visible.</source>
@@ -1322,7 +1322,7 @@
</message>
<message>
<source>Node/Service</source>
- <translation>Vozliลกฤe/Storitev</translation>
+ <translation>Naslov</translation>
</message>
<message>
<source>Ping Time</source>
@@ -1414,10 +1414,6 @@
<translation>Sploลกno</translation>
</message>
<message>
- <source>Using OpenSSL version</source>
- <translation>OpenSSL razliฤica v rabi</translation>
- </message>
- <message>
<source>Using BerkeleyDB version</source>
<translation>BerkeleyDB razliฤica v rabi</translation>
</message>
@@ -2437,7 +2433,7 @@
</message>
<message numerus="yes">
<source>Open for %n more block(s)</source>
- <translation><numerusform>Odprto ลกe %n blok</numerusform><numerusform>Odprto ลกe %n bloka</numerusform><numerusform>Odprto ลกe %n bloke</numerusform><numerusform>Odprto ลกe %n blokov</numerusform></translation>
+ <translation><numerusform>ล e %n blok do potrditve</numerusform><numerusform>ล e %n bloka do potrditve</numerusform><numerusform>ล e %n bloki do potrditve</numerusform><numerusform>ล e %n blokov do potrditve</numerusform></translation>
</message>
<message>
<source>unknown</source>
@@ -2471,7 +2467,7 @@
</message>
<message numerus="yes">
<source>Open for %n more block(s)</source>
- <translation><numerusform>Odprto ลกe %n blok</numerusform><numerusform>Odprto ลกe %n bloka</numerusform><numerusform>Odprto ลกe %n bloke</numerusform><numerusform>Odprto ลกe %n blokov</numerusform></translation>
+ <translation><numerusform>ล e %n blok do potrditve</numerusform><numerusform>ล e %n bloka do potrditve</numerusform><numerusform>ล e %n bloki do potrditve</numerusform><numerusform>ล e %n blokov do potrditve</numerusform></translation>
</message>
<message>
<source>Open until %1</source>
@@ -2956,10 +2952,6 @@
<translation>Izbire denarnice:</translation>
</message>
<message>
- <source>Warning: This version is obsolete; upgrade required!</source>
- <translation>Opozorilo: Razliฤica vaลกega odjemalca je zastarela. Potrebna je nadgradnja!</translation>
- </message>
- <message>
<source>You need to rebuild the database using -reindex to change -txindex</source>
<translation>Ob spremembi vrednosti opcije -txindex boste morali obnoviti bazo podatkov z uporabo opcije -reindex</translation>
</message>
@@ -3009,7 +3001,7 @@
</message>
<message>
<source>Activating best chain...</source>
- <translation>Preklapljam na najboljลกo verigo ...</translation>
+ <translation>Prehajam na najboljลกo verigo ...</translation>
</message>
<message>
<source>Cannot resolve -whitebind address: '%s'</source>
diff --git a/src/qt/locale/bitcoin_sq.ts b/src/qt/locale/bitcoin_sq.ts
index 994b065994..d87bd9db58 100644
--- a/src/qt/locale/bitcoin_sq.ts
+++ b/src/qt/locale/bitcoin_sq.ts
@@ -30,6 +30,10 @@
<translation>Fshi adresen e selektuar nga lista</translation>
</message>
<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>
+ <message>
<source>&amp;Delete</source>
<translation>&amp;Fshi</translation>
</message>
@@ -790,6 +794,10 @@
</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>
diff --git a/src/qt/locale/bitcoin_sr@latin.ts b/src/qt/locale/bitcoin_sr@latin.ts
new file mode 100644
index 0000000000..c836c8ddba
--- /dev/null
+++ b/src/qt/locale/bitcoin_sr@latin.ts
@@ -0,0 +1,653 @@
+<TS language="sr@latin" version="2.1">
+<context>
+ <name>AddressBookPage</name>
+ <message>
+ <source>Right-click to edit address or label</source>
+ <translation>Klikni desnim tasterom za ureฤ‘ivanje adrese ili oznake</translation>
+ </message>
+ <message>
+ <source>Create a new address</source>
+ <translation>Kreiraj novu adresu</translation>
+ </message>
+ <message>
+ <source>&amp;New</source>
+ <translation>&amp;Novi</translation>
+ </message>
+ <message>
+ <source>Copy the currently selected address to the system clipboard</source>
+ <translation>Kopiraj selektovanu adresu u sistemski klipbord</translation>
+ </message>
+ <message>
+ <source>&amp;Copy</source>
+ <translation>&amp;Kopiraj</translation>
+ </message>
+ <message>
+ <source>C&amp;lose</source>
+ <translation>Zatvori</translation>
+ </message>
+ <message>
+ <source>&amp;Copy Address</source>
+ <translation>Kopiraj adresu</translation>
+ </message>
+ <message>
+ <source>Delete the currently selected address from the list</source>
+ <translation>Briลกe trenutno izabranu adresu sa liste</translation>
+ </message>
+ <message>
+ <source>Export the data in the current tab to a file</source>
+ <translation>Izvoz podataka iz trenutne kartice u datoteku</translation>
+ </message>
+ <message>
+ <source>&amp;Export</source>
+ <translation>&amp;Izvoz</translation>
+ </message>
+ <message>
+ <source>&amp;Delete</source>
+ <translation>&amp;Izbrisati</translation>
+ </message>
+ <message>
+ <source>Choose the address to send coins to</source>
+ <translation>Izaberi adresu za slanje bitkoina</translation>
+ </message>
+ <message>
+ <source>Choose the address to receive coins with</source>
+ <translation>Izaberi adresu za primanje bitkoina</translation>
+ </message>
+ <message>
+ <source>C&amp;hoose</source>
+ <translation>I&amp;zaberi</translation>
+ </message>
+ <message>
+ <source>Sending addresses</source>
+ <translation>Adrese za slanje</translation>
+ </message>
+ <message>
+ <source>Receiving addresses</source>
+ <translation>Adrese za primanje</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 vase Bitkoin adrese za slanje bitkoina. Uvek proverite unetu kolicinu bitkoina i adresu za slanje bitkoin pre slanja.</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>Ovo su vase Bitkoin adrese za primanje bitkoina. Preporuceno je da koristite drugaciju adresu za primanje kod svake transakcije.</translation>
+ </message>
+ <message>
+ <source>&amp;Edit</source>
+ <translation>&amp;Izmeni</translation>
+ </message>
+ <message>
+ <source>Export Address List</source>
+ <translation>Izvezi listu adresa</translation>
+ </message>
+ <message>
+ <source>Comma separated file (*.csv)</source>
+ <translation>Zapetom odvojene ('.csv) datoteke</translation>
+ </message>
+ <message>
+ <source>Exporting Failed</source>
+ <translation>Izvoz nije uspeo</translation>
+ </message>
+ <message>
+ <source>There was an error trying to save the address list to %1. Please try again.</source>
+ <translation>Dogodila se greska prilikom cuvanja adrese u %1. Molimo pokusajte ponovo.</translation>
+ </message>
+</context>
+<context>
+ <name>AddressTableModel</name>
+ <message>
+ <source>Label</source>
+ <translation>Etiketa</translation>
+ </message>
+ <message>
+ <source>Address</source>
+ <translation>Adresa</translation>
+ </message>
+ <message>
+ <source>(no label)</source>
+ <translation>(bez etikete)</translation>
+ </message>
+</context>
+<context>
+ <name>AskPassphraseDialog</name>
+ <message>
+ <source>Passphrase Dialog</source>
+ <translation>Dialog pristupne fraze</translation>
+ </message>
+ <message>
+ <source>Enter passphrase</source>
+ <translation>Unesi pristupnu frazu</translation>
+ </message>
+ <message>
+ <source>New passphrase</source>
+ <translation>Nova pristupna fraza</translation>
+ </message>
+ <message>
+ <source>Repeat new passphrase</source>
+ <translation>Ponovo unesite pristupnu frazu</translation>
+ </message>
+ <message>
+ <source>Encrypt wallet</source>
+ <translation>Enkriptuj/Sifruj novcanik</translation>
+ </message>
+ <message>
+ <source>This operation needs your wallet passphrase to unlock the wallet.</source>
+ <translation>Da bi ste otkljucali novcanik potrebno je da unesete pristupnu frazu</translation>
+ </message>
+ <message>
+ <source>Unlock wallet</source>
+ <translation>Otkljucaj novcanik</translation>
+ </message>
+ <message>
+ <source>This operation needs your wallet passphrase to decrypt the wallet.</source>
+ <translation>Da bi ste dekriptovali/desifrovali novcanik potrebno je da unesete pristupnu frazu</translation>
+ </message>
+ <message>
+ <source>Decrypt wallet</source>
+ <translation>Dekriptuj/Desifruj novcanik</translation>
+ </message>
+ <message>
+ <source>Change passphrase</source>
+ <translation>Izmeni pristupnu frazu</translation>
+ </message>
+ <message>
+ <source>Confirm wallet encryption</source>
+ <translation>Potvrdite enkripciju/sifrovanje novcanika</translation>
+ </message>
+ <message>
+ <source>Warning: If you encrypt your wallet and lose your passphrase, you will &lt;b&gt;LOSE ALL OF YOUR BITCOINS&lt;/b&gt;!</source>
+ <translation>Upozorenje: Ako ekriptujete/sifrujete novcanik, a izgubite pristupnu frazu &lt;b&gt;IZGUBICETE SVE VASE BITKOINE&lt;/b&gt;!</translation>
+ </message>
+ <message>
+ <source>Are you sure you wish to encrypt your wallet?</source>
+ <translation>Da li ste sigurni da zelite da enkriptujete/sifrujete novcanik?</translation>
+ </message>
+ <message>
+ <source>Bitcoin Core 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>Bitcoin Core ce se sada zatvoriti radi zavrsavanje procesa enkripcije/sifrovanja novcanika. Zapamtite da enkriptovanje/sifrovanje novcanika ne moze u potpunosti da zastiti vase bitkoine od kradje od strane virusa koji su zarazili vas racunar.</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>VAZNO : Bilo koja prethodne rezervne kopije koje ste nacinili od svoje datoteke novcanika treba da se zamene sa novogenerisanom, sifrovanom datotekom novcanika. Iz bezbednosnih razloga, prethodne rezervne kopije su nezasifrovanih datoteka novcanika ce postati beskorisne cim pocnete da koristite novi, sifrovani novฤanik.</translation>
+ </message>
+ <message>
+ <source>Warning: The Caps Lock key is on!</source>
+ <translation>Upozorenje: Dugme Caps Lock je upaljeno</translation>
+ </message>
+ <message>
+ <source>Wallet encrypted</source>
+ <translation>Novcanik je enkriptovan/sifrovan</translation>
+ </message>
+ <message>
+ <source>Enter the new passphrase to the wallet.&lt;br/&gt;Please use a passphrase of &lt;b&gt;ten or more random characters&lt;/b&gt;, or &lt;b&gt;eight or more words&lt;/b&gt;.</source>
+ <translation>Unesite novu pristupnu frazu u novcanik.&lt;br/&gt;Molimo koristite pristupnu frazu od &lt;br/&gt;deset ili vise nasumicnih karaktera &lt;br/&gt;, ili &lt;b&gt;osm ili vise reci &lt;/b&gt;.</translation>
+ </message>
+ <message>
+ <source>Enter the old passphrase and new passphrase to the wallet.</source>
+ <translation>Unesite staru pristupnu frazu i novu pristupnu frazu u novcanik.</translation>
+ </message>
+ <message>
+ <source>Wallet encryption failed</source>
+ <translation>Ekripcija/Sifrovanje novcanika nije uspelo</translation>
+ </message>
+ <message>
+ <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source>
+ <translation>Enkriptovanje/Sifrovanje novcanika nije uspelo zbog greske. Vas novcanik nije enkriptovan/sifrovan.</translation>
+ </message>
+ <message>
+ <source>The supplied passphrases do not match.</source>
+ <translation>Uneta pristupne fraze se ne podudaraju</translation>
+ </message>
+ <message>
+ <source>Wallet unlock failed</source>
+ <translation>Otkljucavanje novcanika nije uspelo</translation>
+ </message>
+ <message>
+ <source>The passphrase entered for the wallet decryption was incorrect.</source>
+ <translation>Pristupna fraza za dekriptovanje/desifrovanje novcanika nije tacna.</translation>
+ </message>
+ <message>
+ <source>Wallet decryption failed</source>
+ <translation>Dekriptovanje/desifrovanje novcanika nije uspelo</translation>
+ </message>
+ <message>
+ <source>Wallet passphrase was successfully changed.</source>
+ <translation>Pristupna fraza novcanika je uspesno promenjena.</translation>
+ </message>
+</context>
+<context>
+ <name>BanTableModel</name>
+ <message>
+ <source>IP/Netmask</source>
+ <translation>IP/Netmask</translation>
+ </message>
+ <message>
+ <source>Banned Until</source>
+ <translation>Banovani ste do</translation>
+ </message>
+</context>
+<context>
+ <name>BitcoinGUI</name>
+ <message>
+ <source>Bitcoin Core</source>
+ <translation>Bitcoin Core</translation>
+ </message>
+ <message>
+ <source>Error</source>
+ <translation>Greska</translation>
+ </message>
+ </context>
+<context>
+ <name>ClientModel</name>
+ </context>
+<context>
+ <name>CoinControlDialog</name>
+ <message>
+ <source>Amount</source>
+ <translation>Kolicina</translation>
+ </message>
+ <message>
+ <source>Date</source>
+ <translation>Datum</translation>
+ </message>
+ <message>
+ <source>(no label)</source>
+ <translation>(bez etikete)</translation>
+ </message>
+ </context>
+<context>
+ <name>EditAddressDialog</name>
+ </context>
+<context>
+ <name>FreespaceChecker</name>
+ </context>
+<context>
+ <name>HelpMessageDialog</name>
+ <message>
+ <source>Bitcoin Core</source>
+ <translation>Bitcoin Core</translation>
+ </message>
+ </context>
+<context>
+ <name>Intro</name>
+ <message>
+ <source>Bitcoin Core</source>
+ <translation>Bitcoin Core</translation>
+ </message>
+ <message>
+ <source>Error</source>
+ <translation>Greska</translation>
+ </message>
+ </context>
+<context>
+ <name>OpenURIDialog</name>
+ </context>
+<context>
+ <name>OptionsDialog</name>
+ </context>
+<context>
+ <name>OverviewPage</name>
+ </context>
+<context>
+ <name>PaymentServer</name>
+ </context>
+<context>
+ <name>PeerTableModel</name>
+ </context>
+<context>
+ <name>QObject</name>
+ <message>
+ <source>Amount</source>
+ <translation>Kolicina</translation>
+ </message>
+ </context>
+<context>
+ <name>QRImageWidget</name>
+ </context>
+<context>
+ <name>RPCConsole</name>
+ </context>
+<context>
+ <name>ReceiveCoinsDialog</name>
+ </context>
+<context>
+ <name>ReceiveRequestDialog</name>
+ <message>
+ <source>Address</source>
+ <translation>Adresa</translation>
+ </message>
+ <message>
+ <source>Amount</source>
+ <translation>Kolicina</translation>
+ </message>
+ <message>
+ <source>Label</source>
+ <translation>Etiketa</translation>
+ </message>
+ <message>
+ <source>Message</source>
+ <translation>Poruka</translation>
+ </message>
+ </context>
+<context>
+ <name>RecentRequestsTableModel</name>
+ <message>
+ <source>Date</source>
+ <translation>Datum</translation>
+ </message>
+ <message>
+ <source>Label</source>
+ <translation>Etiketa</translation>
+ </message>
+ <message>
+ <source>Message</source>
+ <translation>Poruka</translation>
+ </message>
+ <message>
+ <source>Amount</source>
+ <translation>Kolicina</translation>
+ </message>
+ <message>
+ <source>(no label)</source>
+ <translation>(bez etikete)</translation>
+ </message>
+ </context>
+<context>
+ <name>SendCoinsDialog</name>
+ <message>
+ <source>(no label)</source>
+ <translation>(bez etikete)</translation>
+ </message>
+ </context>
+<context>
+ <name>SendCoinsEntry</name>
+ </context>
+<context>
+ <name>ShutdownWindow</name>
+ </context>
+<context>
+ <name>SignVerifyMessageDialog</name>
+ </context>
+<context>
+ <name>SplashScreen</name>
+ <message>
+ <source>Bitcoin Core</source>
+ <translation>Bitcoin Core</translation>
+ </message>
+ <message>
+ <source>The Bitcoin Core developers</source>
+ <translation>Razvojni tim Bitcoin Core</translation>
+ </message>
+ </context>
+<context>
+ <name>TrafficGraphWidget</name>
+ </context>
+<context>
+ <name>TransactionDesc</name>
+ <message>
+ <source>%1/offline</source>
+ <translation>%1/van mreze</translation>
+ </message>
+ <message>
+ <source>%1/unconfirmed</source>
+ <translation>%1/nepotvrdjeno</translation>
+ </message>
+ <message>
+ <source>%1 confirmations</source>
+ <translation>%1 potvrdjeno/ih</translation>
+ </message>
+ <message>
+ <source>Status</source>
+ <translation>Stanje/Status</translation>
+ </message>
+ <message>
+ <source>Date</source>
+ <translation>Datum</translation>
+ </message>
+ <message>
+ <source>Source</source>
+ <translation>Izvor</translation>
+ </message>
+ <message>
+ <source>Generated</source>
+ <translation>Generisano</translation>
+ </message>
+ <message>
+ <source>From</source>
+ <translation>Od</translation>
+ </message>
+ <message>
+ <source>To</source>
+ <translation>Kome</translation>
+ </message>
+ <message>
+ <source>own address</source>
+ <translation>sopstvena adresa</translation>
+ </message>
+ <message>
+ <source>watch-only</source>
+ <translation>samo za gledanje</translation>
+ </message>
+ <message>
+ <source>label</source>
+ <translation>etiketa</translation>
+ </message>
+ <message>
+ <source>Credit</source>
+ <translation>Kredit</translation>
+ </message>
+ <message>
+ <source>not accepted</source>
+ <translation>nije prihvaceno</translation>
+ </message>
+ <message>
+ <source>Debit</source>
+ <translation>Zaduzenje</translation>
+ </message>
+ <message>
+ <source>Total debit</source>
+ <translation>Ukupno zaduzenje</translation>
+ </message>
+ <message>
+ <source>Total credit</source>
+ <translation>Totalni kredit</translation>
+ </message>
+ <message>
+ <source>Transaction fee</source>
+ <translation>Taksa transakcije</translation>
+ </message>
+ <message>
+ <source>Net amount</source>
+ <translation>Neto iznos</translation>
+ </message>
+ <message>
+ <source>Message</source>
+ <translation>Poruka</translation>
+ </message>
+ <message>
+ <source>Comment</source>
+ <translation>Komentar</translation>
+ </message>
+ <message>
+ <source>Transaction ID</source>
+ <translation>ID Transakcije</translation>
+ </message>
+ <message>
+ <source>Merchant</source>
+ <translation>Trgovac</translation>
+ </message>
+ <message>
+ <source>Debug information</source>
+ <translation>Informacije debugovanja</translation>
+ </message>
+ <message>
+ <source>Transaction</source>
+ <translation>Transakcije</translation>
+ </message>
+ <message>
+ <source>Inputs</source>
+ <translation>Unosi</translation>
+ </message>
+ <message>
+ <source>Amount</source>
+ <translation>Kolicina</translation>
+ </message>
+ <message>
+ <source>true</source>
+ <translation>tacno</translation>
+ </message>
+ <message>
+ <source>false</source>
+ <translation>netacno</translation>
+ </message>
+ <message>
+ <source>, has not been successfully broadcast yet</source>
+ <translation>, nisu uspesno jos emitovano</translation>
+ </message>
+ <message>
+ <source>unknown</source>
+ <translation>nepoznato</translation>
+ </message>
+</context>
+<context>
+ <name>TransactionDescDialog</name>
+ <message>
+ <source>Transaction details</source>
+ <translation>Detalji transakcije</translation>
+ </message>
+ </context>
+<context>
+ <name>TransactionTableModel</name>
+ <message>
+ <source>Date</source>
+ <translation>Datum</translation>
+ </message>
+ <message>
+ <source>Type</source>
+ <translation>Tip</translation>
+ </message>
+ <message>
+ <source>Label</source>
+ <translation>Etiketa</translation>
+ </message>
+ <message>
+ <source>Received with</source>
+ <translation>Primljeno uz</translation>
+ </message>
+ <message>
+ <source>Received from</source>
+ <translation>Primljeno od</translation>
+ </message>
+ <message>
+ <source>Sent to</source>
+ <translation>Poslat</translation>
+ </message>
+ <message>
+ <source>Payment to yourself</source>
+ <translation>Placanje samom sebi</translation>
+ </message>
+ <message>
+ <source>Mined</source>
+ <translation>Iskopano</translation>
+ </message>
+ <message>
+ <source>watch-only</source>
+ <translation>samo za gledanje</translation>
+ </message>
+ </context>
+<context>
+ <name>TransactionView</name>
+ <message>
+ <source>Received with</source>
+ <translation>Primljeno uz</translation>
+ </message>
+ <message>
+ <source>Sent to</source>
+ <translation>Poslat</translation>
+ </message>
+ <message>
+ <source>Mined</source>
+ <translation>Iskopano</translation>
+ </message>
+ <message>
+ <source>Exporting Failed</source>
+ <translation>Izvoz nije uspeo</translation>
+ </message>
+ <message>
+ <source>Comma separated file (*.csv)</source>
+ <translation>Zarezom odvojene ('.csv) datoteke</translation>
+ </message>
+ <message>
+ <source>Date</source>
+ <translation>Datum</translation>
+ </message>
+ <message>
+ <source>Type</source>
+ <translation>Tip</translation>
+ </message>
+ <message>
+ <source>Label</source>
+ <translation>Etiketa</translation>
+ </message>
+ <message>
+ <source>Address</source>
+ <translation>Adresa</translation>
+ </message>
+ </context>
+<context>
+ <name>UnitDisplayStatusBarControl</name>
+ </context>
+<context>
+ <name>WalletFrame</name>
+ </context>
+<context>
+ <name>WalletModel</name>
+ </context>
+<context>
+ <name>WalletView</name>
+ <message>
+ <source>&amp;Export</source>
+ <translation>&amp;Izvoz</translation>
+ </message>
+ <message>
+ <source>Export the data in the current tab to a file</source>
+ <translation>Izvoz podataka iz trenutne kartice u datoteku</translation>
+ </message>
+ </context>
+<context>
+ <name>bitcoin-core</name>
+ <message>
+ <source>Insufficient funds</source>
+ <translation>Nedovoljno sredstava</translation>
+ </message>
+ <message>
+ <source>Loading block index...</source>
+ <translation>Ucitavanje indeksa bloka...</translation>
+ </message>
+ <message>
+ <source>Add a node to connect to and attempt to keep the connection open</source>
+ <translation>Dodajte cvor za povezivanje, da bi pokusali da odrzite vezu otvorenom</translation>
+ </message>
+ <message>
+ <source>Loading wallet...</source>
+ <translation>Ucitavanje novcanika...</translation>
+ </message>
+ <message>
+ <source>Cannot write default address</source>
+ <translation>Nije moguce ispisivanje podrazumevane adrese</translation>
+ </message>
+ <message>
+ <source>Rescanning...</source>
+ <translation>Ponovno skeniranje...</translation>
+ </message>
+ <message>
+ <source>Done loading</source>
+ <translation>Zavrseno ucitavanje</translation>
+ </message>
+ <message>
+ <source>Error</source>
+ <translation>Greska</translation>
+ </message>
+</context>
+</TS> \ No newline at end of file
diff --git a/src/qt/locale/bitcoin_sv.ts b/src/qt/locale/bitcoin_sv.ts
index 756114351f..acf37bd1d4 100644
--- a/src/qt/locale/bitcoin_sv.ts
+++ b/src/qt/locale/bitcoin_sv.ts
@@ -1475,10 +1475,6 @@ Var vรคnlig och fรถrsรถk igen.</translation>
<translation>Generell</translation>
</message>
<message>
- <source>Using OpenSSL version</source>
- <translation>Anvรคnder OpenSSL version</translation>
- </message>
- <message>
<source>Using BerkeleyDB version</source>
<translation>Anvรคnder BerkeleyDB versionen</translation>
</message>
@@ -2981,6 +2977,18 @@ Var vรคnlig och fรถrsรถk igen.</translation>
<translation>Acceptera anslutningar utifrรฅn (fรถrvalt: 1 om ingen -proxy eller -connect)</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>
+ </message>
+ <message>
+ <source>A fee rate (in %s/kB) that will be used when fee estimation has insufficient data (default: %s)</source>
+ <translation>En avgiftskurs (i %s/kB) som anvรคnds nรคr det inte finns tillrรคcklig data fรถr att uppskatta avgiften (fรถrvalt: %s)</translation>
+ </message>
+ <message>
+ <source>Accept relayed transactions received from whitelisted peers even when not relaying transactions (default: %d)</source>
+ <translation>Acceptera vidarebefodrade transaktioner frรฅn vitlistade noder รคven nรคr transaktioner inte vidarebefodras (fรถrvalt: %d)</translation>
+ </message>
+ <message>
<source>Bind to given address and always listen on it. Use [host]:port notation for IPv6</source>
<translation>Bind till given adress och lyssna alltid pรฅ den. Anvรคnd [vรคrd]:port notation fรถr IPv6</translation>
</message>
@@ -2997,6 +3005,10 @@ Var vรคnlig och fรถrsรถk igen.</translation>
<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>Set the number of script verification threads (%u to %d, 0 = auto, &lt;0 = leave that many cores free, default: %d)</source>
<translation>Ange antalet skriptkontrolltrรฅdar (%u till %d, 0 = auto, &lt;0 = lรคmna sรฅ mรฅnga kรคrnor lediga, fรถrval: %d)</translation>
</message>
@@ -3013,6 +3025,10 @@ Var vรคnlig och fรถrsรถk igen.</translation>
<translation>Det gรฅr inte att binda till %s pรฅ den hรคr datorn. Bitcoin Core รคr fรถrmodligen redan igรฅng.</translation>
</message>
<message>
+ <source>Unsupported argument -whitelistalwaysrelay ignored, use -whitelistrelay and/or -whitelistforcerelay.</source>
+ <translation>Argumentet -whitelistalwaysrelay stรถds inte utan ignoreras, anvรคnd -whitelistrelay och/eller -whitelistforcerelay.</translation>
+ </message>
+ <message>
<source>Use UPnP to map the listening port (default: 1 when listening and no -proxy)</source>
<translation>Anvรคnd UPnP fรถr att mappa den lyssnande porten (fรถrvalt: 1 nรคr lyssning aktiverat och utan -proxy)</translation>
</message>
@@ -3029,6 +3045,10 @@ Var vรคnlig och fรถrsรถk igen.</translation>
<translation>Varning: Nรคtverket verkar inte vara helt รถverens! Nรฅgra miners verkar ha problem.</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>
+ <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>
@@ -3049,6 +3069,10 @@ Var vรคnlig och fรถrsรถk igen.</translation>
<translation>&lt;category&gt; Kan vara:</translation>
</message>
<message>
+ <source>Append comment to the user agent string</source>
+ <translation>Lรคgg till kommentar till user-agent-strรคngen</translation>
+ </message>
+ <message>
<source>Block creation options:</source>
<translation>Block skapande instรคllningar:</translation>
</message>
@@ -3093,6 +3117,10 @@ Var vรคnlig och fรถrsรถk igen.</translation>
<translation>Aktivera publicering av rรฅa transaktioner i &lt;adress&gt;</translation>
</message>
<message>
+ <source>Enable transaction replacement in the memory pool (default: %u)</source>
+ <translation>Aktivera byte av transaktioner i minnespoolen (fรถrvalt: %u)</translation>
+ </message>
+ <message>
<source>Error initializing block database</source>
<translation>Fel vid initiering av blockdatabasen</translation>
</message>
@@ -3129,10 +3157,22 @@ Var vรคnlig och fรถrsรถk igen.</translation>
<translation>Ogiltig -onion adress:'%s'</translation>
</message>
<message>
+ <source>Invalid amount for -fallbackfee=&lt;amount&gt;: '%s'</source>
+ <translation>Ogiltigt belopp fรถr -fallbackfee=&lt;belopp&gt;: '%s'</translation>
+ </message>
+ <message>
<source>Keep the transaction memory pool below &lt;n&gt; megabytes (default: %u)</source>
<translation>Hรฅll minnespoolen รถver transaktioner under &lt;n&gt; megabyte (fรถrvalt: %u)</translation>
</message>
<message>
+ <source>Location of the auth cookie (default: data dir)</source>
+ <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>
@@ -3141,6 +3181,10 @@ Var vรคnlig och fรถrsรถk igen.</translation>
<translation>Anslut enbart till noder i nรคtverket &lt;net&gt; (IPv4, IPv6 eller onion)</translation>
</message>
<message>
+ <source>Print version and exit</source>
+ <translation>Visa version och avsluta</translation>
+ </message>
+ <message>
<source>Prune cannot be configured with a negative value.</source>
<translation>Beskรคrning kan inte konfigureras med ett negativt vรคrde.</translation>
</message>
@@ -3197,10 +3241,6 @@ Var vรคnlig och fรถrsรถk igen.</translation>
<translation>Plรฅnboksinstรคllningar:</translation>
</message>
<message>
- <source>Warning: This version is obsolete; upgrade required!</source>
- <translation>Varning: Denna version รคr fรถrรฅldrad; uppgradering krรคvs!</translation>
- </message>
- <message>
<source>You need to rebuild the database using -reindex to change -txindex</source>
<translation>Du mรฅste รฅterskapa databasen med -reindex fรถr att รคndra -txindex</translation>
</message>
@@ -3297,10 +3337,6 @@ Var vรคnlig och fรถrsรถk igen.</translation>
<translation>Aktiverar bรคsta kedjan...</translation>
</message>
<message>
- <source>Always relay transactions received from whitelisted peers (default: %d)</source>
- <translation>Vidarebefordra alltid transaktioner frรฅn vitlistade noder (fรถrval: %d)</translation>
- </message>
- <message>
<source>Attempt to recover private keys from a corrupt wallet.dat on startup</source>
<translation>Fรถrsรถk att rรคdda privata nycklar frรฅn en korrupt wallet.dat vid uppstart</translation>
</message>
@@ -3465,6 +3501,10 @@ Var vรคnlig och fรถrsรถk igen.</translation>
<translation>Varning</translation>
</message>
<message>
+ <source>Warning: unknown new rules activated (versionbit %i)</source>
+ <translation>Varning: okรคnda nya regler aktiverade (versionsbit %i)</translation>
+ </message>
+ <message>
<source>Whether to operate in a blocks only mode (default: %u)</source>
<translation>Ska allt gรถras i endast block-lรคge (fรถrval: %u)</translation>
</message>
diff --git a/src/qt/locale/bitcoin_ta.ts b/src/qt/locale/bitcoin_ta.ts
new file mode 100644
index 0000000000..c93524cdac
--- /dev/null
+++ b/src/qt/locale/bitcoin_ta.ts
@@ -0,0 +1,1029 @@
+<TS language="ta" version="2.1">
+<context>
+ <name>AddressBookPage</name>
+ <message>
+ <source>Create a new address</source>
+ <translation>เฎ’เฎฐเฏ เฎชเฏเฎคเฎฟเฎฏ เฎฎเฏเฎ•เฎตเฎฐเฎฟเฎฏเฏˆ เฎ‰เฎฐเฏเฎตเฎพเฎ•เฏเฎ•เฏ</translation>
+ </message>
+ <message>
+ <source>&amp;New</source>
+ <translation>&amp;เฎชเฏเฎคเฎฟเฎฏ</translation>
+ </message>
+ <message>
+ <source>&amp;Copy</source>
+ <translation>&amp;เฎจเฎ•เฎฒเฏ</translation>
+ </message>
+ <message>
+ <source>C&amp;lose</source>
+ <translation>&amp;เฎฎเฏ‚เฎŸเฏ</translation>
+ </message>
+ <message>
+ <source>&amp;Copy Address</source>
+ <translation>&amp;เฎฎเฏเฎ•เฎตเฎฐเฎฟเฎฏเฏˆ เฎจเฎ•เฎฒเฏ†เฎŸเฏ</translation>
+ </message>
+ <message>
+ <source>&amp;Export</source>
+ <translation>&amp;เฎเฎฑเฏเฎฑเฏเฎฎเฎคเฎฟ</translation>
+ </message>
+ <message>
+ <source>&amp;Delete</source>
+ <translation>&amp;เฎ…เฎดเฎฟ</translation>
+ </message>
+ <message>
+ <source>C&amp;hoose</source>
+ <translation>&amp;เฎคเฏ‡เฎฐเฏเฎจเฏเฎคเฏ†เฎŸเฏ</translation>
+ </message>
+ <message>
+ <source>Sending addresses</source>
+ <translation>เฎ…เฎฉเฏเฎชเฏเฎชเฏเฎฎเฏ เฎฎเฏเฎ•เฎตเฎฐเฎฟเฎ•เฎณเฏ</translation>
+ </message>
+ <message>
+ <source>Receiving addresses</source>
+ <translation>เฎชเฏ†เฎฑเฏเฎฎเฏ เฎฎเฏเฎ•เฎตเฎฐเฎฟเฎ•เฎณเฏ</translation>
+ </message>
+ <message>
+ <source>&amp;Edit</source>
+ <translation>&amp;เฎคเฏ†เฎพเฎ•เฏ</translation>
+ </message>
+ </context>
+<context>
+ <name>AddressTableModel</name>
+ <message>
+ <source>Label</source>
+ <translation>เฎฒเฏ‡เฎชเฎฟเฎณเฏ</translation>
+ </message>
+ <message>
+ <source>Address</source>
+ <translation>เฎตเฎฟเฎฒเฎพเฎšเฎฎเฏ</translation>
+ </message>
+ </context>
+<context>
+ <name>AskPassphraseDialog</name>
+ <message>
+ <source>Encrypt wallet</source>
+ <translation>เฎŽเฎฉเฏเฎ•เฏเฎฐเฎฟเฎชเฏเฎŸเฏ เฎชเฎฃเฎชเฏเฎชเฏˆ</translation>
+ </message>
+ <message>
+ <source>Decrypt wallet</source>
+ <translation>เฎŸเฎฟเฎ•เฏเฎฐเฎฟเฎชเฏเฎŸเฏ เฎชเฎฃเฎชเฏเฎชเฏˆ</translation>
+ </message>
+ </context>
+<context>
+ <name>BanTableModel</name>
+ <message>
+ <source>IP/Netmask</source>
+ <translation>IP/Netmask</translation>
+ </message>
+ </context>
+<context>
+ <name>BitcoinGUI</name>
+ <message>
+ <source>&amp;Overview</source>
+ <translation>&amp;เฎ•เฎฃเฏเฎฃเฏ‡เฎพเฎŸเฏเฎŸเฎฎเฏ</translation>
+ </message>
+ <message>
+ <source>&amp;Transactions</source>
+ <translation>&amp;เฎชเฎฐเฎฟเฎตเฎฐเฏเฎคเฏเฎคเฎฉเฏˆเฎ•เฎณเฏ</translation>
+ </message>
+ <message>
+ <source>E&amp;xit</source>
+ <translation>&amp;เฎตเฏ†เฎณเฎฟเฎฏเฏ‡เฎฑเฏ</translation>
+ </message>
+ <message>
+ <source>Quit application</source>
+ <translation>เฎตเฎฟเฎฒเฎ•เฏ</translation>
+ </message>
+ <message>
+ <source>About &amp;Qt</source>
+ <translation>&amp;Qt-เฎ เฎชเฎฑเฏเฎฑเฎฟ</translation>
+ </message>
+ <message>
+ <source>&amp;Options...</source>
+ <translation>&amp;เฎตเฎฟเฎฐเฏเฎชเฏเฎชเฎ™เฏเฎ•เฎณเฏ...</translation>
+ </message>
+ <message>
+ <source>&amp;Encrypt Wallet...</source>
+ <translation>&amp;เฎŽเฎฉเฏเฎ•เฏเฎฐเฎฟเฎชเฏเฎŸเฏ เฎชเฎฃเฎชเฏเฎชเฏˆ...</translation>
+ </message>
+ <message>
+ <source>Open &amp;URI...</source>
+ <translation>&amp;URI-เฎ เฎคเฎฟเฎฑ</translation>
+ </message>
+ <message>
+ <source>&amp;Verify message...</source>
+ <translation>&amp;เฎšเฏ†เฎฏเฏเฎคเฎฟเฎฏเฏˆ เฎšเฎฐเฎฟเฎšเฏ†เฎฏเฏ...</translation>
+ </message>
+ <message>
+ <source>Bitcoin</source>
+ <translation>Bitcoin</translation>
+ </message>
+ <message>
+ <source>Wallet</source>
+ <translation>เฎชเฎฃเฎชเฏเฎชเฏˆ</translation>
+ </message>
+ <message>
+ <source>&amp;Send</source>
+ <translation>&amp;เฎ…เฎฉเฏเฎชเฏเฎชเฏ</translation>
+ </message>
+ <message>
+ <source>&amp;Receive</source>
+ <translation>&amp;เฎชเฏ†เฎฑเฏ</translation>
+ </message>
+ <message>
+ <source>&amp;Show / Hide</source>
+ <translation>&amp;เฎ•เฎพเฎŸเฏเฎŸเฏ/เฎฎเฎฑเฏˆ</translation>
+ </message>
+ <message>
+ <source>&amp;File</source>
+ <translation>&amp;เฎ•เฏ‹เฎชเฏเฎชเฏ</translation>
+ </message>
+ <message>
+ <source>&amp;Settings</source>
+ <translation>&amp;เฎ…เฎฎเฏˆเฎชเฏเฎชเฏ</translation>
+ </message>
+ <message>
+ <source>&amp;Help</source>
+ <translation>&amp;เฎ‰เฎคเฎตเฎฟ</translation>
+ </message>
+ <message>
+ <source>Bitcoin Core</source>
+ <translation>Bitcoin เฎฎเฏˆเฎฏเฎฎเฏ</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>
+ </message>
+ <message>
+ <source>Error</source>
+ <translation>เฎคเฎตเฎฑเฏ</translation>
+ </message>
+ <message>
+ <source>Warning</source>
+ <translation>เฎŽเฎšเฏเฎšเฎฐเฎฟเฎ•เฏเฎ•เฏˆ</translation>
+ </message>
+ <message>
+ <source>Information</source>
+ <translation>เฎคเฎ•เฎตเฎฒเฏ</translation>
+ </message>
+ <message>
+ <source>Date: %1
+</source>
+ <translation>เฎคเฏ‡เฎคเฎฟ: %1
+</translation>
+ </message>
+ <message>
+ <source>Amount: %1
+</source>
+ <translation>เฎคเฏŠเฎ•เฏˆ: %1
+</translation>
+ </message>
+ <message>
+ <source>Type: %1
+</source>
+ <translation>เฎตเฎ•เฏˆ: %1
+</translation>
+ </message>
+ <message>
+ <source>Address: %1
+</source>
+ <translation>เฎฎเฏเฎ•เฎตเฎฐเฎฟ: %1
+</translation>
+ </message>
+ <message>
+ <source>Sent transaction</source>
+ <translation>เฎ…เฎฉเฏเฎชเฏเฎชเฎฟเฎฏ เฎชเฎฐเฎฟเฎตเฎฐเฏเฎคเฏเฎคเฎฉเฏˆ</translation>
+ </message>
+ </context>
+<context>
+ <name>ClientModel</name>
+ <message>
+ <source>Network Alert</source>
+ <translation>เฎชเฎฟเฎฃเฏˆเฎฏ เฎŽเฎšเฏเฎšเฎฐเฎฟเฎ•เฏเฎ•เฏˆ</translation>
+ </message>
+</context>
+<context>
+ <name>CoinControlDialog</name>
+ <message>
+ <source>Quantity:</source>
+ <translation>เฎ…เฎณเฎตเฏ</translation>
+ </message>
+ <message>
+ <source>Amount:</source>
+ <translation>เฎตเฎฟเฎฒเฏˆ:</translation>
+ </message>
+ <message>
+ <source>Priority:</source>
+ <translation>เฎฎเฏเฎฉเฏเฎฉเฏเฎฐเฎฟเฎฎเฏˆ</translation>
+ </message>
+ <message>
+ <source>Fee:</source>
+ <translation>เฎ•เฎŸเฏเฎŸเฎฃเฎฎเฏ:</translation>
+ </message>
+ <message>
+ <source>After Fee:</source>
+ <translation>เฎ•เฎŸเฏเฎŸเฎฃเฎคเฏเฎคเฎฟเฎฑเฎ•เฏเฎชเฏ เฎชเฎฟเฎฉเฏ:</translation>
+ </message>
+ <message>
+ <source>Change:</source>
+ <translation>เฎฎเฎพเฎฑเฏเฎฑเฏ:</translation>
+ </message>
+ <message>
+ <source>Amount</source>
+ <translation>เฎตเฎฟเฎฒเฏˆ</translation>
+ </message>
+ <message>
+ <source>Date</source>
+ <translation>เฎคเฏ‡เฎคเฎฟ</translation>
+ </message>
+ <message>
+ <source>Confirmations</source>
+ <translation>เฎ‰เฎฑเฏเฎคเฎฟเฎชเฏเฎชเฎŸเฏเฎคเฏเฎคเฎฒเฏเฎ•เฎณเฏ</translation>
+ </message>
+ <message>
+ <source>Confirmed</source>
+ <translation>เฎ‰เฎฑเฏเฎคเฎฟเฎฏเฎพเฎ•</translation>
+ </message>
+ <message>
+ <source>Priority</source>
+ <translation>เฎฎเฏเฎฉเฏเฎฉเฏเฎฐเฎฟเฎฎเฏˆ</translation>
+ </message>
+ <message>
+ <source>Copy address</source>
+ <translation>เฎชเฎฟเฎฐเฎคเฎฟเฎฏเฏˆ เฎฎเฏเฎ•เฎตเฎฐเฎฟเฎฏเฏˆ</translation>
+ </message>
+ <message>
+ <source>Copy amount</source>
+ <translation>เฎจเฎ•เฎฒเฏˆ เฎคเฏŠเฎ•เฏˆ</translation>
+ </message>
+ <message>
+ <source>none</source>
+ <translation>none</translation>
+ </message>
+ <message>
+ <source>yes</source>
+ <translation>เฎ†เฎฎเฏ</translation>
+ </message>
+ <message>
+ <source>no</source>
+ <translation>เฎ‡เฎฒเฏเฎฒเฏˆ</translation>
+ </message>
+ </context>
+<context>
+ <name>EditAddressDialog</name>
+ </context>
+<context>
+ <name>FreespaceChecker</name>
+ <message>
+ <source>name</source>
+ <translation>เฎชเฏ†เฎฏเฎฐเฏ</translation>
+ </message>
+ </context>
+<context>
+ <name>HelpMessageDialog</name>
+ <message>
+ <source>Bitcoin Core</source>
+ <translation>Bitcoin เฎฎเฏˆเฎฏเฎฎเฏ</translation>
+ </message>
+ <message>
+ <source>About Bitcoin Core</source>
+ <translation>Bitcoin เฎฎเฏˆเฎฏเฎฎเฏ เฎชเฎฑเฏเฎฑเฎฟ</translation>
+ </message>
+ </context>
+<context>
+ <name>Intro</name>
+ <message>
+ <source>Welcome</source>
+ <translation>เฎจเฎฒเฏเฎตเฎฐเฎตเฏ</translation>
+ </message>
+ <message>
+ <source>Bitcoin Core</source>
+ <translation>Bitcoin เฎฎเฏˆเฎฏเฎฎเฏ</translation>
+ </message>
+ <message>
+ <source>Error</source>
+ <translation>เฎคเฎตเฎฑเฏ</translation>
+ </message>
+ </context>
+<context>
+ <name>OpenURIDialog</name>
+ <message>
+ <source>Open URI</source>
+ <translation>URI-เฎ เฎคเฎฟเฎฑ</translation>
+ </message>
+ <message>
+ <source>URI:</source>
+ <translation>URI:</translation>
+ </message>
+ </context>
+<context>
+ <name>OptionsDialog</name>
+ <message>
+ <source>Options</source>
+ <translation>เฎตเฎฟเฎฐเฏเฎชเฏเฎชเฎคเฏเฎคเฏ‡เฎฐเฏเฎตเฏ</translation>
+ </message>
+ <message>
+ <source>&amp;Main</source>
+ <translation>&amp;เฎคเฎฒเฏˆเฎฎเฏˆ</translation>
+ </message>
+ <message>
+ <source>MB</source>
+ <translation>MB</translation>
+ </message>
+ <message>
+ <source>&amp;Network</source>
+ <translation>&amp;เฎชเฎฟเฎฃเฏˆเฎฏเฎฎเฏ</translation>
+ </message>
+ <message>
+ <source>W&amp;allet</source>
+ <translation>&amp;เฎชเฎฃเฎชเฏเฎชเฏˆ</translation>
+ </message>
+ <message>
+ <source>Expert</source>
+ <translation>เฎตเฎฒเฏเฎฒเฏเฎจเฎฐเฏ</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>&amp;Window</source>
+ <translation>&amp;เฎšเฎพเฎณเฎฐเฎฎเฏ</translation>
+ </message>
+ <message>
+ <source>&amp;Display</source>
+ <translation>&amp;เฎ•เฎพเฎŸเฏเฎŸเฏ</translation>
+ </message>
+ <message>
+ <source>&amp;OK</source>
+ <translation>&amp;เฎšเฎฐเฎฟ</translation>
+ </message>
+ <message>
+ <source>&amp;Cancel</source>
+ <translation>&amp;เฎฐเฎคเฏเฎคเฏ</translation>
+ </message>
+ <message>
+ <source>default</source>
+ <translation>เฎ‡เฎฏเฎฒเฏเฎชเฏเฎจเฎฟเฎฒเฏˆ</translation>
+ </message>
+ <message>
+ <source>none</source>
+ <translation>none</translation>
+ </message>
+ </context>
+<context>
+ <name>OverviewPage</name>
+ <message>
+ <source>Form</source>
+ <translation>เฎชเฎŸเฎฟเฎตเฎฎเฏ</translation>
+ </message>
+ <message>
+ <source>Available:</source>
+ <translation>เฎ•เฎฟเฎŸเฏˆเฎ•เฏเฎ•เฎ•เฏ‚เฎŸเฎฟเฎฏ:</translation>
+ </message>
+ <message>
+ <source>Pending:</source>
+ <translation>เฎจเฎฟเฎฒเฏเฎตเฏˆเฎฏเฎฟเฎฒเฏ:</translation>
+ </message>
+ <message>
+ <source>Immature:</source>
+ <translation>เฎฎเฏเฎคเฎฟเฎฐเฎพเฎค:</translation>
+ </message>
+ <message>
+ <source>Balances</source>
+ <translation>เฎฎเฏ€เฎคเฎฟ</translation>
+ </message>
+ <message>
+ <source>Total:</source>
+ <translation>เฎฎเฏŠเฎคเฏเฎคเฎฎเฏ:</translation>
+ </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>
+ <name>QObject</name>
+ <message>
+ <source>Amount</source>
+ <translation>เฎตเฎฟเฎฒเฏˆ</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 s</source>
+ <translation>%1 s</translation>
+ </message>
+ <message>
+ <source>N/A</source>
+ <translation>N/A</translation>
+ </message>
+ <message>
+ <source>%1 ms</source>
+ <translation>%1 ms</translation>
+ </message>
+</context>
+<context>
+ <name>QRImageWidget</name>
+ <message>
+ <source>&amp;Save Image...</source>
+ <translation>&amp;เฎชเฎŸเฎคเฏเฎคเฏˆ เฎšเฏ‡เฎฎเฎฟ...</translation>
+ </message>
+ <message>
+ <source>&amp;Copy Image</source>
+ <translation>&amp;เฎชเฎŸเฎคเฏเฎคเฏˆ</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>Client name</source>
+ <translation>เฎตเฎพเฎŸเฎฟเฎ•เฏเฎ•เฏˆเฎฏเฎพเฎณเฎฐเฏ เฎชเฏ†เฎฏเฎฐเฏ</translation>
+ </message>
+ <message>
+ <source>N/A</source>
+ <translation>N/A</translation>
+ </message>
+ <message>
+ <source>Client version</source>
+ <translation>เฎตเฎพเฎŸเฎฟเฎ•เฏเฎ•เฏˆเฎฏเฎพเฎณเฎฐเฏ เฎชเฎคเฎฟเฎชเฏเฎชเฏ</translation>
+ </message>
+ <message>
+ <source>&amp;Information</source>
+ <translation>&amp;เฎคเฎ•เฎตเฎฒเฏ</translation>
+ </message>
+ <message>
+ <source>Network</source>
+ <translation>เฎชเฎฟเฎฃเฏˆเฎฏเฎฎเฏ</translation>
+ </message>
+ <message>
+ <source>Name</source>
+ <translation>เฎชเฏ†เฎฏเฎฐเฏ</translation>
+ </message>
+ <message>
+ <source>Memory Pool</source>
+ <translation>เฎจเฎฟเฎฉเฏˆเฎตเฎ• เฎ•เฏเฎณเฎฎเฏ</translation>
+ </message>
+ <message>
+ <source>Memory usage</source>
+ <translation>เฎจเฎฟเฎฉเฏˆเฎตเฎ• เฎชเฎฏเฎฉเฏเฎชเฎพเฎŸเฏ</translation>
+ </message>
+ <message>
+ <source>Sent</source>
+ <translation>เฎ…เฎฉเฏเฎชเฏเฎชเฎฟเฎฏ</translation>
+ </message>
+ <message>
+ <source>Direction</source>
+ <translation>เฎคเฎฟเฎšเฏˆ</translation>
+ </message>
+ <message>
+ <source>Version</source>
+ <translation>เฎชเฎคเฎฟเฎชเฏเฎชเฏ</translation>
+ </message>
+ <message>
+ <source>User Agent</source>
+ <translation>เฎชเฎฏเฎฉเฎฐเฏ เฎฎเฏเฎ•เฎตเฎฐเฏ</translation>
+ </message>
+ <message>
+ <source>Ping Time</source>
+ <translation>เฎชเฎฟเฎ™เฏ เฎจเฏ‡เฎฐเฎฎเฏ</translation>
+ </message>
+ <message>
+ <source>&amp;Open</source>
+ <translation>&amp;เฎคเฎฟเฎฑ</translation>
+ </message>
+ <message>
+ <source>&amp;Console</source>
+ <translation>&amp;เฎชเฎฃเฎฟเฎฏเฎ•เฎฎเฏ</translation>
+ </message>
+ <message>
+ <source>&amp;Clear</source>
+ <translation>&amp;เฎตเฎดเฏเฎจเฏ€เฎ•เฏเฎ•เฏ</translation>
+ </message>
+ <message>
+ <source>Totals</source>
+ <translation>เฎฎเฏŠเฎคเฏเฎคเฎฎเฏ</translation>
+ </message>
+ <message>
+ <source>In:</source>
+ <translation>เฎ‰เฎณเฏเฎณเฏ‡:</translation>
+ </message>
+ <message>
+ <source>Out:</source>
+ <translation>เฎตเฏ†เฎณเฎฟเฎฏเฏ‡:</translation>
+ </message>
+ <message>
+ <source>1 &amp;hour</source>
+ <translation>1 &amp;เฎฎเฎฃเฎฟ</translation>
+ </message>
+ <message>
+ <source>1 &amp;day</source>
+ <translation>1 &amp;เฎจเฎพเฎณเฏ</translation>
+ </message>
+ <message>
+ <source>1 &amp;week</source>
+ <translation>1 &amp;เฎตเฎพเฎฐเฎฎเฏ</translation>
+ </message>
+ <message>
+ <source>1 &amp;year</source>
+ <translation>1 &amp;เฎ†เฎฃเฏเฎŸเฏ</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>via %1</source>
+ <translation>via %1</translation>
+ </message>
+ <message>
+ <source>never</source>
+ <translation>เฎ’เฎฐเฏเฎชเฏ‡เฎพเฎคเฏเฎฎเฏ</translation>
+ </message>
+ <message>
+ <source>Inbound</source>
+ <translation>เฎ‰เฎณเฏเฎตเฎฐเฏเฎฎเฏ</translation>
+ </message>
+ <message>
+ <source>Outbound</source>
+ <translation>เฎตเฏ†เฎณเฎฟ เฎšเฏ†เฎฒเฏเฎฒเฏเฎฎเฏ</translation>
+ </message>
+ <message>
+ <source>Yes</source>
+ <translation>เฎ†เฎฎเฏ</translation>
+ </message>
+ <message>
+ <source>No</source>
+ <translation>เฎฎเฎฑเฏ</translation>
+ </message>
+ <message>
+ <source>Unknown</source>
+ <translation>เฎ…เฎฑเฎฟเฎฏเฎชเฏเฎชเฎŸเฎพเฎค</translation>
+ </message>
+</context>
+<context>
+ <name>ReceiveCoinsDialog</name>
+ <message>
+ <source>&amp;Amount:</source>
+ <translation>&amp;เฎคเฏŠเฎ•เฏˆ:</translation>
+ </message>
+ <message>
+ <source>&amp;Label:</source>
+ <translation>&amp;เฎšเฎฟเฎŸเฏเฎŸเฏˆ:</translation>
+ </message>
+ <message>
+ <source>&amp;Message:</source>
+ <translation>&amp;เฎšเฏ†เฎฏเฏเฎคเฎฟ:</translation>
+ </message>
+ <message>
+ <source>Clear</source>
+ <translation>เฎจเฏ€เฎ•เฏเฎ•เฏ</translation>
+ </message>
+ <message>
+ <source>Show</source>
+ <translation>เฎ•เฎพเฎฃเฏเฎชเฎฟ</translation>
+ </message>
+ <message>
+ <source>Remove</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>
+ <message>
+ <source>QR Code</source>
+ <translation>QR เฎ•เฏเฎฑเฎฟเฎฏเฏ€เฎŸเฏ</translation>
+ </message>
+ <message>
+ <source>Copy &amp;URI</source>
+ <translation>เฎจเฎ•เฎฒเฏˆ &amp;URI</translation>
+ </message>
+ <message>
+ <source>Copy &amp;Address</source>
+ <translation>เฎจเฎ•เฎฒเฏˆ เฎตเฎฟเฎฒเฎพเฎšเฎฎเฏ</translation>
+ </message>
+ <message>
+ <source>&amp;Save Image...</source>
+ <translation>&amp;เฎชเฎŸเฎคเฏเฎคเฏˆ เฎšเฏ‡เฎฎเฎฟ...</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>Amount</source>
+ <translation>เฎตเฎฟเฎฒเฏˆ</translation>
+ </message>
+ </context>
+<context>
+ <name>SendCoinsDialog</name>
+ <message>
+ <source>Quantity:</source>
+ <translation>เฎ…เฎณเฎตเฏ</translation>
+ </message>
+ <message>
+ <source>Amount:</source>
+ <translation>เฎตเฎฟเฎฒเฏˆ</translation>
+ </message>
+ <message>
+ <source>Priority:</source>
+ <translation>เฎฎเฏเฎฉเฏเฎฉเฏเฎฐเฎฟเฎฎเฏˆ</translation>
+ </message>
+ <message>
+ <source>Fee:</source>
+ <translation>เฎ•เฎŸเฏเฎŸเฎฃเฎฎเฏ:</translation>
+ </message>
+ <message>
+ <source>After Fee:</source>
+ <translation>เฎ•เฎŸเฏเฎŸเฎฃเฎคเฏเฎคเฎฟเฎฑเฎ•เฏเฎชเฏ เฎชเฎฟเฎฉเฏ:</translation>
+ </message>
+ <message>
+ <source>Change:</source>
+ <translation>เฎฎเฎพเฎฑเฏเฎฑเฏ:</translation>
+ </message>
+ <message>
+ <source>Choose...</source>
+ <translation>เฎคเฏ‡เฎฐเฏเฎจเฏเฎคเฏ†เฎŸเฏ...</translation>
+ </message>
+ <message>
+ <source>Hide</source>
+ <translation>เฎฎเฎฑเฏˆ</translation>
+ </message>
+ <message>
+ <source>normal</source>
+ <translation>เฎ‡เฎฏเฎฒเฏเฎชเฎพเฎฉ</translation>
+ </message>
+ <message>
+ <source>fast</source>
+ <translation>เฎตเฏ‡เฎ•เฎฎเฎพเฎ•</translation>
+ </message>
+ <message>
+ <source>Balance:</source>
+ <translation>เฎฎเฏ€เฎคเฎฟ:</translation>
+ </message>
+ <message>
+ <source>S&amp;end</source>
+ <translation>&amp;เฎ…เฎฉเฏเฎชเฏเฎชเฏ</translation>
+ </message>
+ <message>
+ <source>%1 to %2</source>
+ <translation>%1 to %2</translation>
+ </message>
+ <message>
+ <source>Copy amount</source>
+ <translation>เฎจเฎ•เฎฒเฏˆ เฎคเฏŠเฎ•เฏˆ</translation>
+ </message>
+ <message>
+ <source>or</source>
+ <translation>เฎ…เฎฒเฏเฎฒเฎคเฏ</translation>
+ </message>
+ </context>
+<context>
+ <name>SendCoinsEntry</name>
+ <message>
+ <source>A&amp;mount:</source>
+ <translation>&amp;เฎคเฏŠเฎ•เฏˆ:</translation>
+ </message>
+ <message>
+ <source>&amp;Label:</source>
+ <translation>&amp;เฎšเฎฟเฎŸเฏเฎŸเฏˆ:</translation>
+ </message>
+ <message>
+ <source>Alt+A</source>
+ <translation>Alt+A</translation>
+ </message>
+ <message>
+ <source>Alt+P</source>
+ <translation>Alt+P</translation>
+ </message>
+ <message>
+ <source>Message:</source>
+ <translation>เฎšเฏ†เฎฏเฏเฎคเฎฟ:</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>เฎ•เฏˆเฎฏเฏ†เฎพเฎชเฏเฎชเฎฎเฏ</translation>
+ </message>
+ </context>
+<context>
+ <name>SplashScreen</name>
+ <message>
+ <source>Bitcoin Core</source>
+ <translation>Bitcoin เฎฎเฏˆเฎฏเฎฎเฏ</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>เฎจเฎฟเฎฒเฏˆ</translation>
+ </message>
+ <message>
+ <source>Date</source>
+ <translation>เฎคเฏ‡เฎคเฎฟ</translation>
+ </message>
+ <message>
+ <source>Source</source>
+ <translation>เฎฎเฏ‚เฎฒเฎฎเฏ</translation>
+ </message>
+ <message>
+ <source>Credit</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>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>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>
+ </context>
+<context>
+ <name>TransactionTableModel</name>
+ <message>
+ <source>Date</source>
+ <translation>เฎคเฏ‡เฎคเฎฟ</translation>
+ </message>
+ <message>
+ <source>Offline</source>
+ <translation>เฎ†เฎƒเฎชเฏเฎฒเฏˆเฎฉเฏ</translation>
+ </message>
+ <message>
+ <source>Label</source>
+ <translation>เฎฒเฏ‡เฎชเฎฟเฎณเฏ</translation>
+ </message>
+ <message>
+ <source>(n/a)</source>
+ <translation>(n/a)</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>Other</source>
+ <translation>เฎตเฏ‡เฎฑเฏ</translation>
+ </message>
+ <message>
+ <source>Copy address</source>
+ <translation>เฎชเฎฟเฎฐเฎคเฎฟเฎฏเฏˆ เฎฎเฏเฎ•เฎตเฎฐเฎฟเฎฏเฏˆ</translation>
+ </message>
+ <message>
+ <source>Copy amount</source>
+ <translation>เฎจเฎ•เฎฒเฏˆ เฎคเฏŠเฎ•เฏˆ</translation>
+ </message>
+ <message>
+ <source>Confirmed</source>
+ <translation>เฎ‰เฎฑเฏเฎคเฎฟเฎฏเฎพเฎ•</translation>
+ </message>
+ <message>
+ <source>Date</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>Range:</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>&amp;Export</source>
+ <translation>&amp;เฎเฎฑเฏเฎฑเฏเฎฎเฎคเฎฟ</translation>
+ </message>
+ </context>
+<context>
+ <name>bitcoin-core</name>
+ <message>
+ <source>(default: %u)</source>
+ <translation>(default: %u)</translation>
+ </message>
+ <message>
+ <source>Information</source>
+ <translation>เฎคเฎ•เฎตเฎฒเฏ</translation>
+ </message>
+ <message>
+ <source>Warning</source>
+ <translation>เฎŽเฎšเฏเฎšเฎฐเฎฟเฎ•เฏเฎ•เฏˆ</translation>
+ </message>
+ <message>
+ <source>(default: %s)</source>
+ <translation>(default: %s)</translation>
+ </message>
+ <message>
+ <source>Error</source>
+ <translation>เฎคเฎตเฎฑเฏ</translation>
+ </message>
+</context>
+</TS> \ No newline at end of file
diff --git a/src/qt/locale/bitcoin_th_TH.ts b/src/qt/locale/bitcoin_th_TH.ts
index 79a55cdd51..ba3b1e8741 100644
--- a/src/qt/locale/bitcoin_th_TH.ts
+++ b/src/qt/locale/bitcoin_th_TH.ts
@@ -2,22 +2,98 @@
<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>&amp;New</source>
+ <translation>&amp;เธชเธฃเน‰เธฒเธ‡เนƒเธซเธกเนˆ</translation>
+ </message>
+ <message>
<source>Copy the currently selected address to the system clipboard</source>
<translation>เธ„เธฑเธ”เธฅเธญเธเธ—เธตเนˆเธญเธขเธนเนˆเธ—เธตเนˆเธ–เธนเธเน€เธฅเธทเธญเธเน„เธ›เธขเธฑเธ‡ เธ„เธฅเธดเธ›เธšเธญเธฃเนŒเธ”เธ‚เธญเธ‡เธฃเธฐเธšเธš</translation>
</message>
<message>
+ <source>&amp;Copy</source>
+ <translation>&amp;เธ„เธฑเธ”เธฅเธญเธ</translation>
+ </message>
+ <message>
+ <source>C&amp;lose</source>
+ <translation>&amp;เธ›เธดเธ”</translation>
+ </message>
+ <message>
+ <source>&amp;Copy Address</source>
+ <translation>&amp;เธ„เธฑเธ”เธฅเธญเธเธ—เธตเนˆเธญเธขเธนเนˆ</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>&amp;Export</source>
+ <translation>&amp;เธชเนˆเธ‡เธญเธญเธ</translation>
+ </message>
+ <message>
<source>&amp;Delete</source>
<translation>&amp;เธฅเธš</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&amp;hoose</source>
+ <translation>&amp;เน€เธฅเธทเธญเธ</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>Copy &amp;Label</source>
+ <translation>เธ„เธฑเธ”เธฅเธญเธ &amp;เธ›เน‰เธฒเธขเธŠเธทเนˆเธญ</translation>
+ </message>
+ <message>
+ <source>&amp;Edit</source>
+ <translation>&amp;เนเธเน‰เน„เธ‚</translation>
+ </message>
+ <message>
+ <source>Export Address List</source>
+ <translation>เธชเนˆเธ‡เธญเธญเธเธฃเธฒเธขเธเธฒเธฃเธ—เธตเนˆเธญเธขเธนเนˆ</translation>
+ </message>
+ <message>
<source>Comma separated file (*.csv)</source>
<translation>เธ„เธฑเนˆเธ™เน„เธŸเธฅเนŒเธ”เน‰เธงเธขเน€เธ„เธฃเธทเนˆเธญเธ‡เธซเธกเธฒเธขเธˆเธธเธฅเธ เธฒเธ„ (*.csv)</translation>
</message>
- </context>
+ <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>
@@ -76,6 +152,10 @@
<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>
@@ -130,10 +210,18 @@
<translation>เน€เธฃเธตเธขเธเธ”เธนเธ›เธฃเธฐเธงเธฑเธ•เธดเธเธฒเธฃเธ—เธณเธ˜เธธเธฃเธเธฃเธฃเธก</translation>
</message>
<message>
+ <source>E&amp;xit</source>
+ <translation>E&amp;เธญเธญเธ</translation>
+ </message>
+ <message>
<source>Quit application</source>
<translation>เธญเธญเธเธˆเธฒเธเน‚เธ›เธฃเนเธเธฃเธก</translation>
</message>
<message>
+ <source>About &amp;Qt</source>
+ <translation>เน€เธเธตเนˆเธขเธงเธเธฑเธš &amp;Qt</translation>
+ </message>
+ <message>
<source>&amp;Options...</source>
<translation>&amp;เธ•เธฑเธงเน€เธฅเธทเธญเธ...</translation>
</message>
@@ -142,6 +230,30 @@
<translation>เน€เธ›เธฅเธตเนˆเธขเธ™เธฃเธซเธฑเธชเธœเนˆเธฒเธ™เธ—เธตเนˆเนƒเธŠเน‰เธชเธณเธซเธฃเธฑเธšเธเธฒเธฃเน€เธ‚เน‰เธฒเธฃเธซเธฑเธชเธเธฃเธฐเน€เธ›เน‹เธฒเน€เธ‡เธดเธ™</translation>
</message>
<message>
+ <source>&amp;Debug window</source>
+ <translation>&amp;เธซเธ™เน‰เธฒเธ•เนˆเธฒเธ‡เธ•เธฃเธงเธˆเธชเธญเธšเธ‚เน‰เธญเธœเธดเธ”เธžเธฅเธฒเธ”</translation>
+ </message>
+ <message>
+ <source>&amp;Verify message...</source>
+ <translation>&amp;เธขเธทเธ™เธขเธฑเธ™เธ‚เน‰เธญเธ„เธงเธฒเธก...</translation>
+ </message>
+ <message>
+ <source>Bitcoin</source>
+ <translation>Bitcoin</translation>
+ </message>
+ <message>
+ <source>Wallet</source>
+ <translation>เธเธฃเธฐเน€เธ›เน‹เธฒเธชเธ•เธฒเธ‡เธ„เนŒ</translation>
+ </message>
+ <message>
+ <source>&amp;Send</source>
+ <translation>&amp;เธชเนˆเธ‡</translation>
+ </message>
+ <message>
+ <source>&amp;Receive</source>
+ <translation>&amp;เธฃเธฑเธš</translation>
+ </message>
+ <message>
<source>&amp;File</source>
<translation>&amp;เน„เธŸเธฅเนŒ</translation>
</message>
@@ -192,6 +304,26 @@
<context>
<name>CoinControlDialog</name>
<message>
+ <source>Amount</source>
+ <translation>เธˆเธณเธ™เธงเธ™</translation>
+ </message>
+ <message>
+ <source>Date</source>
+ <translation>เธงเธฑเธ™เธ—เธตเนˆ</translation>
+ </message>
+ <message>
+ <source>Confirmations</source>
+ <translation>เธเธฒเธฃเธขเธทเธ™เธขเธฑเธ™</translation>
+ </message>
+ <message>
+ <source>Confirmed</source>
+ <translation>เธขเธทเธ™เธขเธฑเธ™เนเธฅเน‰เธง</translation>
+ </message>
+ <message>
+ <source>Priority</source>
+ <translation>เธฃเธฐเธ”เธฑเธšเธ„เธงเธฒเธกเธชเธณเธ„เธฑเธ</translation>
+ </message>
+ <message>
<source>(no label)</source>
<translation>(เน„เธกเนˆเธกเธตเธŠเธทเนˆเธญ)</translation>
</message>
@@ -273,6 +405,10 @@
</context>
<context>
<name>QObject</name>
+ <message>
+ <source>Amount</source>
+ <translation>เธˆเธณเธ™เธงเธ™</translation>
+ </message>
</context>
<context>
<name>QRImageWidget</name>
@@ -294,6 +430,10 @@
<translation>เธ—เธตเนˆเธญเธขเธนเนˆ</translation>
</message>
<message>
+ <source>Amount</source>
+ <translation>เธˆเธณเธ™เธงเธ™</translation>
+ </message>
+ <message>
<source>Label</source>
<translation>เธŠเธทเนˆเธญ</translation>
</message>
@@ -301,10 +441,18 @@
<context>
<name>RecentRequestsTableModel</name>
<message>
+ <source>Date</source>
+ <translation>เธงเธฑเธ™เธ—เธตเนˆ</translation>
+ </message>
+ <message>
<source>Label</source>
<translation>เธŠเธทเนˆเธญ</translation>
</message>
<message>
+ <source>Amount</source>
+ <translation>เธˆเธณเธ™เธงเธ™</translation>
+ </message>
+ <message>
<source>(no label)</source>
<translation>(เน„เธกเนˆเธกเธตเธŠเธทเนˆเธญ)</translation>
</message>
@@ -345,6 +493,14 @@
</context>
<context>
<name>TransactionDesc</name>
+ <message>
+ <source>Date</source>
+ <translation>เธงเธฑเธ™เธ—เธตเนˆ</translation>
+ </message>
+ <message>
+ <source>Amount</source>
+ <translation>เธˆเธณเธ™เธงเธ™</translation>
+ </message>
</context>
<context>
<name>TransactionDescDialog</name>
@@ -352,6 +508,10 @@
<context>
<name>TransactionTableModel</name>
<message>
+ <source>Date</source>
+ <translation>เธงเธฑเธ™เธ—เธตเนˆ</translation>
+ </message>
+ <message>
<source>Label</source>
<translation>เธŠเธทเนˆเธญ</translation>
</message>
@@ -363,10 +523,22 @@
<translation>เธงเธฑเธ™เธ™เธตเน‰</translation>
</message>
<message>
+ <source>Exporting Failed</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>Label</source>
<translation>เธŠเธทเนˆเธญ</translation>
</message>
@@ -390,6 +562,14 @@
</context>
<context>
<name>WalletView</name>
+ <message>
+ <source>&amp;Export</source>
+ <translation>&amp;เธชเนˆเธ‡เธญเธญเธ</translation>
+ </message>
+ <message>
+ <source>Export the data in the current tab to a file</source>
+ <translation>เธชเนˆเธ‡เธญเธญเธเธ‚เน‰เธญเธกเธนเธฅเธ—เธตเนˆเธญเธขเธนเนˆเนƒเธ™เนเธ—เน‡เธšเน„เธ›เธ—เธตเนˆเน„เธŸเธฅเนŒ</translation>
+ </message>
</context>
<context>
<name>bitcoin-core</name>
diff --git a/src/qt/locale/bitcoin_tr.ts b/src/qt/locale/bitcoin_tr.ts
index 96fca8bb24..2406776773 100644
--- a/src/qt/locale/bitcoin_tr.ts
+++ b/src/qt/locale/bitcoin_tr.ts
@@ -1474,10 +1474,6 @@
<translation>Genel</translation>
</message>
<message>
- <source>Using OpenSSL version</source>
- <translation>Kullanฤฑlan OpenSSL sรผrรผmรผ</translation>
- </message>
- <message>
<source>Using BerkeleyDB version</source>
<translation>Kullanฤฑlan BerkeleyDB sรผrรผmรผ</translation>
</message>
@@ -2941,7 +2937,7 @@
</message>
<message>
<source>Prune configured below the minimum of %d MiB. Please use a higher number.</source>
- <translation>Prune, 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, asgari 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>
@@ -2980,6 +2976,18 @@
<translation>DฤฑลŸarฤฑdan gelen baฤŸlantฤฑlarฤฑ kabul et (varsayฤฑlan: -proxy veya -connect yoksa 1)</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>
+ </message>
+ <message>
<source>Bind to given address and always listen on it. Use [host]:port notation for IPv6</source>
<translation>Belirtilen adrese baฤŸlan ve daima ondan dinle. IPv6 iรงin [makine]:port yazฤฑmฤฑnฤฑ kullanฤฑnฤฑz</translation>
</message>
@@ -2996,6 +3004,10 @@
<translation>Bir cรผzdan muamelesi deฤŸiลŸtiฤŸinde komutu รงalฤฑลŸtฤฑr (komuttaki %s muamele 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>
+ </message>
+ <message>
<source>Set the number of script verification threads (%u to %d, 0 = auto, &lt;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, &lt;0 = bu sayฤฑda รงekirdeฤŸi kullanma, varsayฤฑlan: %d)</translation>
</message>
@@ -3012,6 +3024,10 @@
<translation>Bu bilgisayarda %s unsuruna baฤŸlanฤฑlamadฤฑ. Bitcoin ร‡ekirdeฤŸi muhtemelen hรขlihazฤฑrda รงalฤฑลŸmaktadฤฑr.</translation>
</message>
<message>
+ <source>Unsupported argument -whitelistalwaysrelay ignored, use -whitelistrelay and/or -whitelistforcerelay.</source>
+ <translation>Desteklenmeyen argรผman -whitelistalwaysrelay gรถrmezden gelindi, -whitelistrelay ve/veya -whitelistforcerelay kullanฤฑn.</translation>
+ </message>
+ <message>
<source>Use UPnP to map the listening port (default: 1 when listening and no -proxy)</source>
<translation>Dinlenecek portu haritalamak iรงin UPnP kullan (varsayฤฑlan: dinlenildiฤŸinde ve -proxy olmadฤฑฤŸฤฑnda 1)</translation>
</message>
@@ -3028,6 +3044,10 @@
<translation>Uyarฤฑ: ลŸebeke tamamen mutabฤฑk deฤŸil gibi gรถrรผnรผyor! Bazฤฑ madenciler sorun yaลŸฤฑyor gibi gรถrรผnรผyor.</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>
+ </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>
</message>
@@ -3048,6 +3068,10 @@
<translation>&lt;kategori&gt; ลŸunlar olabilir:</translation>
</message>
<message>
+ <source>Append comment to the user agent string</source>
+ <translation>Kullanฤฑcฤฑ aracฤฑ zincirine yorumu ekle</translation>
+ </message>
+ <message>
<source>Block creation options:</source>
<translation>Blok oluลŸturma seรงenekleri:</translation>
</message>
@@ -3092,6 +3116,10 @@
<translation>Ham muamelenin &lt;adres&gt;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>
+ </message>
+ <message>
<source>Error initializing block database</source>
<translation>Blok veritabanฤฑnฤฑ baลŸlatฤฑlฤฑrken bir hata meydana geldi</translation>
</message>
@@ -3128,10 +3156,22 @@
<translation>Geรงersiz -onion adresi: '%s'</translation>
</message>
<message>
+ <source>Invalid amount for -fallbackfee=&lt;amount&gt;: '%s'</source>
+ <translation> -fallbackfee=&lt;meblaฤŸ&gt; iรงin geรงersiz meblaฤŸ: '%s'</translation>
+ </message>
+ <message>
<source>Keep the transaction memory pool below &lt;n&gt; megabytes (default: %u)</source>
<translation>Muamele bellek alanฤฑnฤฑ &lt;n&gt; megabayttan dรผลŸรผk tut (varsayฤฑlan: %u)</translation>
</message>
<message>
+ <source>Location of the auth cookie (default: data dir)</source>
+ <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>
@@ -3140,12 +3180,16 @@
<translation>Sadece &lt;net&gt; ลŸebekesindeki dรผฤŸรผmlere baฤŸlan (ipv4, ipv6 veya onion)</translation>
</message>
<message>
+ <source>Print version and exit</source>
+ <translation>Sรผrรผmรผ yaz ve รงฤฑk</translation>
+ </message>
+ <message>
<source>Prune cannot be configured with a negative value.</source>
- <translation>Prune negatif bir deฤŸerle yapฤฑlandฤฑrฤฑlamaz.</translation>
+ <translation>Budama negatif bir deฤŸerle yapฤฑlandฤฑrฤฑlamaz.</translation>
</message>
<message>
<source>Prune mode is incompatible with -txindex.</source>
- <translation>Prune kipi -txindex ile uyumsuzdur.</translation>
+ <translation>Budama kipi -txindex ile uyumsuzdur.</translation>
</message>
<message>
<source>Set database cache size in megabytes (%d to %d, default: %d)</source>
@@ -3196,10 +3240,6 @@
<translation>Cรผzdan seรงenekleri:</translation>
</message>
<message>
- <source>Warning: This version is obsolete; upgrade required!</source>
- <translation>Uyarฤฑ: Bu sรผrรผm รงok eskidir; gรผncellemeniz gerekir!</translation>
- </message>
- <message>
<source>You need to rebuild the database using -reindex to change -txindex</source>
<translation>-txindex'i deฤŸiลŸtirmek iรงin veritabanฤฑnฤฑ -reindex kullanarak tekrar inลŸa etmeniz gerekmektedir</translation>
</message>
@@ -3281,7 +3321,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>Prune olmayan kipe dรถnmek iรงin veritabanฤฑnฤฑ -reindex ile tekrar derlemeniz gerekir. Bu, tรผm blok zincirini tekrar indirecektir</translation>
+ <translation>Budama olmayan kipe dรถnmek iรงin veritabanฤฑnฤฑ -reindex ile tekrar derlemeniz gerekir. Bu, tรผm blok zincirini tekrar indirecektir</translation>
</message>
<message>
<source>(default: %u)</source>
@@ -3296,10 +3336,6 @@
<translation>En iyi zincir etkinleลŸtiriliyor...</translation>
</message>
<message>
- <source>Always relay transactions received from whitelisted peers (default: %d)</source>
- <translation>Beyaz listedeki eลŸlerden gelen muameleleri daima aktar (varsayฤฑlan: %d)</translation>
- </message>
- <message>
<source>Attempt to recover private keys from a corrupt wallet.dat on startup</source>
<translation>BaลŸlangฤฑรงta bozuk bir wallet.dat dosyasฤฑndan รถzel anahtarlarฤฑ geri kazanmayฤฑ dene</translation>
</message>
@@ -3464,6 +3500,10 @@
<translation>Uyarฤฑ</translation>
</message>
<message>
+ <source>Warning: unknown new rules activated (versionbit %i)</source>
+ <translation>ฤฐkaz: 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>
</message>
diff --git a/src/qt/locale/bitcoin_tr_TR.ts b/src/qt/locale/bitcoin_tr_TR.ts
index 10866b011b..979aeea038 100644
--- a/src/qt/locale/bitcoin_tr_TR.ts
+++ b/src/qt/locale/bitcoin_tr_TR.ts
@@ -86,6 +86,10 @@
<translation>Adres Listesini DฤฑลŸa Aktar</translation>
</message>
<message>
+ <source>Comma separated file (*.csv)</source>
+ <translation>Virgรผl ile ayrฤฑlmฤฑลŸ dosya (*.csv)</translation>
+ </message>
+ <message>
<source>Exporting Failed</source>
<translation>DฤฑลŸa Aktarma BaลŸarฤฑsฤฑz Oldu</translation>
</message>
@@ -247,6 +251,10 @@
<translation>DฤฑลŸa Aktarma BaลŸarฤฑsฤฑz Oldu</translation>
</message>
<message>
+ <source>Comma separated file (*.csv)</source>
+ <translation>Virgรผl ile ayrฤฑlmฤฑลŸ dosya (*.csv)</translation>
+ </message>
+ <message>
<source>Label</source>
<translation>Etiket</translation>
</message>
diff --git a/src/qt/locale/bitcoin_uk.ts b/src/qt/locale/bitcoin_uk.ts
index ea783aa856..64df7b5ba5 100644
--- a/src/qt/locale/bitcoin_uk.ts
+++ b/src/qt/locale/bitcoin_uk.ts
@@ -1474,10 +1474,6 @@
<translation>ะ—ะฐะณะฐะปัŒะฝะฐ</translation>
</message>
<message>
- <source>Using OpenSSL version</source>
- <translation>ะ’ะธะบะพั€ะธัั‚ะพะฒัƒั”ั‚ัŒัั OpenSSL ะฒะตั€ัั–ั—</translation>
- </message>
- <message>
<source>Using BerkeleyDB version</source>
<translation>ะ’ะธะบะพั€ะธัั‚ะพะฒัƒั”ั‚ัŒัั BerkeleyDB ะฒะตั€ัั–ั—</translation>
</message>
@@ -3140,6 +3136,10 @@
<translation>ะŸั–ะดะบะปัŽั‡ะฐั‚ะธัั ั‚ั–ะปัŒะบะธ ะดะพ ะฒัƒะทะปั–ะฒ ะฒ ะผะตั€ะตะถั– &lt;net&gt; (ipv4, ipv6 ะฐะฑะพ onion)</translation>
</message>
<message>
+ <source>Print version and exit</source>
+ <translation>ะ’ะตั€ัั–ั ะดะปั ะดั€ัƒะบัƒ ั– ะฒะธั…ะพะดัƒ</translation>
+ </message>
+ <message>
<source>Prune cannot be configured with a negative value.</source>
<translation>ะ ะพะทะผั–ั€ ัะบะพั€ะพั‡ะตะฝะพะณะพ ะปะฐะฝั†ัŽะถะบะฐ ะฑะปะพะบั–ะฒ ะฝะต ะผะพะถะต ะฑัƒั‚ะธ ะฒั–ะด'ั”ะผะฝะธะผ. </translation>
</message>
@@ -3196,10 +3196,6 @@
<translation>ะŸะฐั€ะฐะผะตั‚ั€ะธ ะณะฐะผะฐะฝั†ั:</translation>
</message>
<message>
- <source>Warning: This version is obsolete; upgrade required!</source>
- <translation>ะฃะฒะฐะณะฐ: ะŸะพั‚ะพั‡ะฝะฐ ะฒะตั€ัั–ั ะทะฐัั‚ะฐั€ั–ะปะฐ, ะฝะตะพะฑั…ั–ะดะฝะต ะพะฝะพะฒะปะตะฝะฝั!</translation>
- </message>
- <message>
<source>You need to rebuild the database using -reindex to change -txindex</source>
<translation>ะ’ะฐะผ ะฝะตะพะฑั…ั–ะดะฝะพ ะฟะตั€ะตะฑัƒะดัƒะฒะฐั‚ะธ ะฑะฐะทัƒ ะดะฐะฝะธั… ะท ะฒะธะบะพั€ะธัั‚ะฐะฝะฝัะผ -reindex ะดะปั ั‚ะพะณะพ, ั‰ะพะฑ ะทะผั–ะฝะธั‚ะธ -txindex</translation>
</message>
@@ -3296,10 +3292,6 @@
<translation>ะะบั‚ะธะฒะฐั†ั–ั ะฝะฐะนะบั€ะฐั‰ะพะณะพ ะปะฐะฝั†ัŽะถะบะฐ...</translation>
</message>
<message>
- <source>Always relay transactions received from whitelisted peers (default: %d)</source>
- <translation>ะ—ะฐะฒะถะดะธ ะฟะตั€ะตะดะฐะฒะฐะนั‚ะต ั‚ั€ะฐะฝะทะฐะบั†ั–ั— ะพั‚ั€ะธะผะฐะฝั– ะฒั–ะด ะฟั–ั€ั–ะฒ ะท ะฑั–ะปะพะณะพ ัะฟะธัะบัƒ (ั‚ะธะฟะพะฒะพ: %d)</translation>
- </message>
- <message>
<source>Attempt to recover private keys from a corrupt wallet.dat on startup</source>
<translation>ะกะฟะพั‡ะฐั‚ะบัƒ ัะฟั€ะพะฑัƒะนั‚ะต ะฒั–ะดะฝะพะฒะธั‚ะธ ะฟั€ะธะฒะฐั‚ะฝั– ะบะปัŽั‡ั– ะฒ ะฟะพัˆะบะพะดะถะตะฝะพะผัƒ wallet.dat </translation>
</message>
diff --git a/src/qt/locale/bitcoin_uz@Cyrl.ts b/src/qt/locale/bitcoin_uz@Cyrl.ts
index 86724564ff..a9f9af6683 100644
--- a/src/qt/locale/bitcoin_uz@Cyrl.ts
+++ b/src/qt/locale/bitcoin_uz@Cyrl.ts
@@ -1168,10 +1168,6 @@
<translation>ะัะพัะธะน</translation>
</message>
<message>
- <source>Using OpenSSL version</source>
- <translation>ะคะพะนะดะฐะปะฐะฝะธะปะฐั‘ั‚ะณะฐะฝ OpenSSL ะฒะตั€ัะธััะธ</translation>
- </message>
- <message>
<source>Using BerkeleyDB version</source>
<translation>ะคะพะนะดะฐะปะฐะฝะธะปะฐั‘ั‚ะณะฐะฝ BerkeleyDB ะฒะตั€ัะธััะธ</translation>
</message>
diff --git a/src/qt/locale/bitcoin_uz@Latn.ts b/src/qt/locale/bitcoin_uz@Latn.ts
new file mode 100644
index 0000000000..2e4dabb59f
--- /dev/null
+++ b/src/qt/locale/bitcoin_uz@Latn.ts
@@ -0,0 +1,169 @@
+<TS language="uz@Latn" version="2.1">
+<context>
+ <name>AddressBookPage</name>
+ <message>
+ <source>Create a new address</source>
+ <translation>Yangi manzil yaratish</translation>
+ </message>
+ <message>
+ <source>&amp;New</source>
+ <translation>&amp;Yangi</translation>
+ </message>
+ <message>
+ <source>&amp;Copy</source>
+ <translation>&amp;Nusxalash</translation>
+ </message>
+ <message>
+ <source>C&amp;lose</source>
+ <translation>Yo&amp;pish</translation>
+ </message>
+ <message>
+ <source>&amp;Copy Address</source>
+ <translation>&amp;Manzillarni nusxalash</translation>
+ </message>
+ <message>
+ <source>&amp;Delete</source>
+ <translation>&amp;O'chirish</translation>
+ </message>
+ </context>
+<context>
+ <name>AddressTableModel</name>
+ <message>
+ <source>Label</source>
+ <translation>Yorliq</translation>
+ </message>
+ <message>
+ <source>Address</source>
+ <translation>Manzil</translation>
+ </message>
+ </context>
+<context>
+ <name>AskPassphraseDialog</name>
+ </context>
+<context>
+ <name>BanTableModel</name>
+ </context>
+<context>
+ <name>BitcoinGUI</name>
+ </context>
+<context>
+ <name>ClientModel</name>
+ </context>
+<context>
+ <name>CoinControlDialog</name>
+ </context>
+<context>
+ <name>EditAddressDialog</name>
+ </context>
+<context>
+ <name>FreespaceChecker</name>
+ </context>
+<context>
+ <name>HelpMessageDialog</name>
+ </context>
+<context>
+ <name>Intro</name>
+ </context>
+<context>
+ <name>OpenURIDialog</name>
+ </context>
+<context>
+ <name>OptionsDialog</name>
+ </context>
+<context>
+ <name>OverviewPage</name>
+ </context>
+<context>
+ <name>PaymentServer</name>
+ </context>
+<context>
+ <name>PeerTableModel</name>
+ </context>
+<context>
+ <name>QObject</name>
+ </context>
+<context>
+ <name>QRImageWidget</name>
+ </context>
+<context>
+ <name>RPCConsole</name>
+ </context>
+<context>
+ <name>ReceiveCoinsDialog</name>
+ </context>
+<context>
+ <name>ReceiveRequestDialog</name>
+ <message>
+ <source>Address</source>
+ <translation>Manzil</translation>
+ </message>
+ <message>
+ <source>Label</source>
+ <translation>Yorliq</translation>
+ </message>
+ </context>
+<context>
+ <name>RecentRequestsTableModel</name>
+ <message>
+ <source>Label</source>
+ <translation>Yorliq</translation>
+ </message>
+ </context>
+<context>
+ <name>SendCoinsDialog</name>
+ </context>
+<context>
+ <name>SendCoinsEntry</name>
+ </context>
+<context>
+ <name>ShutdownWindow</name>
+ </context>
+<context>
+ <name>SignVerifyMessageDialog</name>
+ </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>
+ <message>
+ <source>Label</source>
+ <translation>Yorliq</translation>
+ </message>
+ </context>
+<context>
+ <name>TransactionView</name>
+ <message>
+ <source>Label</source>
+ <translation>Yorliq</translation>
+ </message>
+ <message>
+ <source>Address</source>
+ <translation>Manzil</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>
+ </context>
+</TS> \ No newline at end of file
diff --git a/src/qt/locale/bitcoin_zh_CN.ts b/src/qt/locale/bitcoin_zh_CN.ts
index 0ae2c95c62..cc1b033564 100644
--- a/src/qt/locale/bitcoin_zh_CN.ts
+++ b/src/qt/locale/bitcoin_zh_CN.ts
@@ -1474,10 +1474,6 @@
<translation>ๅธธ่ง„</translation>
</message>
<message>
- <source>Using OpenSSL version</source>
- <translation>ไฝฟ็”จ OpenSSL ็‰ˆๆœฌ</translation>
- </message>
- <message>
<source>Using BerkeleyDB version</source>
<translation>ไฝฟ็”จ็š„ BerkeleyDB ็‰ˆๆœฌ</translation>
</message>
@@ -2943,6 +2939,14 @@
<translation>ไฟฎๅ‰ชๅ€ผ่ขซ่ฎพ็ฝฎไธบไฝŽไบŽๆœ€ๅฐๅ€ผ%d MiB๏ผŒ่ฏทไฝฟ็”จๆ›ดๅคง็š„ๆ•ฐๅ€ผใ€‚</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>ไฟฎๅ‰ช๏ผšๆœ€ๅŽ็š„้’ฑๅŒ…ๅŒๆญฅ่ถ…่ฟ‡ไบ†ไฟฎๅ‰ช็š„ๆ•ฐๆฎใ€‚ไฝ ้œ€่ฆ้€š่ฟ‡ -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, &gt;%u = target size in MiB to use for block files)</source>
+ <translation>้€š่ฟ‡ไฟฎๅ‰ช(ๅˆ ้™ค)ๆ—งๆ•ฐๆฎๅ—ๅ‡ๅฐ‘ๅญ˜ๅ‚จ้œ€ๆฑ‚ใ€‚ๆญคๆจกๅผไธŽ -txindex ๅ’Œ -rescanไธๅ…ผๅฎนใ€‚่ญฆๅ‘Š๏ผš่ฟ˜ๅŽŸๆญค่ฎพ็ฝฎ้œ€่ฆ้‡ๆ–ฐไธ‹่ฝฝๆ•ดไธชๅŒบๅ—้“พใ€‚(้ป˜่ฎค: 0 = ็ฆ็”จไฟฎๅ‰ชๆ•ฐๆฎๅ—๏ผŒ &gt;%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>
@@ -2973,6 +2977,18 @@
<translation>ๆŽฅๅ—ๆฅ่‡ชๅค–้ƒจ็š„่ฟžๆŽฅ (็ผบ็œ: ๅฆ‚ๆžœไธๅธฆ -proxy or -connect ๅ‚ๆ•ฐ่ฎพ็ฝฎไธบ1)</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>
+ </message>
+ <message>
+ <source>A fee rate (in %s/kB) that will be used when fee estimation has insufficient data (default: %s)</source>
+ <translation>ๅฝ“่ดน็”จไผฐ่ฎกๆ•ฐๆฎ(default: %s)ไธ่ถณๆ—ถๅฐ†ไผšๅฏ็”จ็š„่ดน็Ž‡ (in %s/kB) </translation>
+ </message>
+ <message>
+ <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>
<translation>็ป‘ๅฎšๆŒ‡ๅฎš็š„IPๅœฐๅ€ๅผ€ๅง‹็›‘ๅฌใ€‚IPv6ๅœฐๅ€่ฏทไฝฟ็”จ[host]:port ๆ ผๅผ</translation>
</message>
@@ -2989,6 +3005,10 @@
<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, &lt;0 = leave that many cores free, default: %d)</source>
<translation>่ฎพ็ฝฎ่„šๆœฌ้ชŒ่ฏ็š„็จ‹ๅบ (%u ๅˆฐ %d, 0 = ่‡ชๅŠจ, &lt;0 = ไฟ็•™่‡ช็”ฑ็š„ๆ ธๅฟƒ, ้ป˜่ฎคๅ€ผ: %d)</translation>
</message>
@@ -3005,6 +3025,10 @@
<translation>ๆ— ๆณ• %s็š„็ป‘ๅฎšๅˆฐ็”ต่„‘ไธŠ๏ผŒๆฏ”็‰นๅธๆ ธๅฟƒ้’ฑๅŒ…ๅฏ่ƒฝๅทฒ็ปๅœจ่ฟ่กŒใ€‚</translation>
</message>
<message>
+ <source>Unsupported argument -whitelistalwaysrelay ignored, use -whitelistrelay and/or -whitelistforcerelay.</source>
+ <translation>ไธ€ไธชไธ่ขซๆ”ฏๆŒ็š„ๅ‚ๆ•ฐ -whitelistalwaysrelay ่ขซๅฟฝ็•ฅไบ†ใ€‚่ฏทไฝฟ็”จ -whitelistrelay ๆˆ–่€… -whitelistforcerelay.</translation>
+ </message>
+ <message>
<source>Use UPnP to map the listening port (default: 1 when listening and no -proxy)</source>
<translation>ไฝฟ็”จUPnPๆšด้œฒๆœฌๆœบ็›‘ๅฌ็ซฏๅฃ๏ผˆ้ป˜่ฎค๏ผš1 ๅฝ“ๆญฃๅœจ็›‘ๅฌไธ”ไธไฝฟ็”จไปฃ็†๏ผ‰</translation>
</message>
@@ -3021,6 +3045,10 @@
<translation>่ญฆๅ‘Š๏ผš็ฝ‘็ปœไผผไนŽๅนถไธๅฎŒๅ…จๅŒๆ„๏ผๆœ‰ไบ›็ŸฟๅทฅไผผไนŽ้‡ๅˆฐไบ†้—ฎ้ข˜ใ€‚</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: 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>
@@ -3041,6 +3069,10 @@
<translation>&lt;category&gt; ๅฏ่ƒฝๆ˜ฏ๏ผš</translation>
</message>
<message>
+ <source>Append comment to the user agent string</source>
+ <translation>ไธบ็”จๆˆทไปฃ็†ๅญ—็ฌฆไธฒ้™„ๅŠ ่ฏดๆ˜Ž</translation>
+ </message>
+ <message>
<source>Block creation options:</source>
<translation>ๆ•ฐๆฎๅ—ๅˆ›ๅปบ้€‰้กน๏ผš</translation>
</message>
@@ -3085,6 +3117,10 @@
<translation>ๅ…่ฎธๅœจ&lt;address&gt;ๅนฟๆ’ญๅŽŸๅง‹ไบคๆ˜“</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>
@@ -3121,10 +3157,22 @@
<translation>ๆ— ๆ•ˆ็š„ -onion ๅœฐๅ€๏ผšโ€œ%sโ€</translation>
</message>
<message>
+ <source>Invalid amount for -fallbackfee=&lt;amount&gt;: '%s'</source>
+ <translation>-fallbackfee ็š„ๆ— ๆ•ˆๆ•ฐ้ข=&lt;amount&gt;: '%s'</translation>
+ </message>
+ <message>
<source>Keep the transaction memory pool below &lt;n&gt; megabytes (default: %u)</source>
<translation>ไฟๆŒไบคๆ˜“ๅ†…ๅญ˜ๆฑ ๅคงๅฐไฝŽไบŽ&lt;n&gt;MB๏ผˆ้ป˜่ฎค๏ผš%u๏ผ‰</translation>
</message>
<message>
+ <source>Location of the auth cookie (default: data dir)</source>
+ <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>
@@ -3133,6 +3181,10 @@
<translation>ๅช่ฟžๆŽฅ &lt;net&gt;็ฝ‘็ปœไธญ็š„่Š‚็‚น (ipv4, ipv6 ๆˆ– onion) </translation>
</message>
<message>
+ <source>Print version and exit</source>
+ <translation>ๆ‰“ๅฐ็‰ˆๆœฌไฟกๆฏๅนถ้€€ๅ‡บ</translation>
+ </message>
+ <message>
<source>Prune cannot be configured with a negative value.</source>
<translation>ไฟฎๅ‰ชไธ่ƒฝ้…็ฝฎไธ€ไธช่ดŸๆ•ฐใ€‚</translation>
</message>
@@ -3169,6 +3221,10 @@
<translation>ไฝฟ็”จUPnpๆ˜ ๅฐ„็›‘ๅฌ็ซฏๅฃ (้ป˜่ฎค: %u) </translation>
</message>
<message>
+ <source>User Agent comment (%s) contains unsafe characters.</source>
+ <translation>็”จๆˆทไปฃ็†่ฏ„่ฎบ(%s)ๅŒ…ๅซไธๅฎ‰ๅ…จ็š„ๅญ—็ฌฆใ€‚</translation>
+ </message>
+ <message>
<source>Verifying blocks...</source>
<translation>ๆญฃๅœจ้ชŒ่ฏๆ•ฐๆฎๅบ“็š„ๅฎŒๆ•ดๆ€ง...</translation>
</message>
@@ -3185,10 +3241,6 @@
<translation>้’ฑๅŒ…้€‰้กน:</translation>
</message>
<message>
- <source>Warning: This version is obsolete; upgrade required!</source>
- <translation>่ญฆๅ‘Š๏ผšๆญค็‰ˆๆœฌๅทฒ่ฟ‡ๆ—ถ๏ผŒๅฟ…้กปๅ‡็บง๏ผ</translation>
- </message>
- <message>
<source>You need to rebuild the database using -reindex to change -txindex</source>
<translation>ๆ‚จ้œ€่ฆๅฐ† -reindex ๆ”นไธบ -txindex ไปฅ้‡ๅปบๆ•ฐๆฎๅบ“</translation>
</message>
@@ -3225,6 +3277,10 @@
<translation>ๅฝ“ๆ”ถๅˆฐ็›ธๅ…ณๆ้†’ๆˆ–่€…ๆˆ‘ไปฌ็œ‹ๅˆฐไธ€ไธช้•ฟๅˆ†ๅ‰ๆ—ถๆ‰ง่กŒๅ‘ฝไปค๏ผˆ%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>ไบคๆ˜“่ดน(in %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>ๅฆ‚ๆžœๆœช่ฎพ็ฝฎไบคๆ˜“่ดน็”จ๏ผŒ่‡ชๅŠจๆทปๅŠ ่ถณๅคŸ็š„ไบคๆ˜“่ดนไปฅ็กฎไฟไบคๆ˜“ๅœจๅนณๅ‡nไธชๆ•ฐๆฎๅ—ๅ†…่ขซ็กฎ่ฎค (้ป˜่ฎค: %u) </translation>
</message>
@@ -3281,6 +3337,14 @@
<translation>ๆญฃๅœจๆฟ€ๆดปๆœ€ไฝณๆ•ฐๆฎ้“พ...</translation>
</message>
<message>
+ <source>Attempt to recover private keys from a corrupt wallet.dat on startup</source>
+ <translation>ๅฐ่ฏ•ไปŽๅฏๅŠจ้กตไธŠ็š„ๆŸๅ้’ฑๅŒ…ๆ–‡ไปถไธญๆขๅค็ง้’ฅ</translation>
+ </message>
+ <message>
+ <source>Automatically create Tor hidden service (default: %d)</source>
+ <translation>่‡ชๅŠจๅปบ็ซ‹Tor้š่—ๆœๅŠก (้ป˜่ฎค:%d)</translation>
+ </message>
+ <message>
<source>Cannot resolve -whitebind address: '%s'</source>
<translation>ๆ— ๆณ•่งฃๆž -whitebind ๅœฐๅ€: '%s'</translation>
</message>
diff --git a/src/qt/locale/bitcoin_zh_HK.ts b/src/qt/locale/bitcoin_zh_HK.ts
new file mode 100644
index 0000000000..740a86e117
--- /dev/null
+++ b/src/qt/locale/bitcoin_zh_HK.ts
@@ -0,0 +1,521 @@
+<TS language="zh_HK" 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>&amp;New</source>
+ <translation>ๆ–ฐๅขž &amp;N</translation>
+ </message>
+ <message>
+ <source>Copy the currently selected address to the system clipboard</source>
+ <translation>่ค‡่ฃฝ็›ฎๅ‰้ธๆ“‡็š„ไฝๅ€ๅˆฐ็ณป็ตฑๅ‰ช่ฒผ็ฐฟ</translation>
+ </message>
+ <message>
+ <source>&amp;Copy</source>
+ <translation>่ค‡่ฃฝ &amp;C</translation>
+ </message>
+ <message>
+ <source>C&amp;lose</source>
+ <translation>้—œ้–‰ &amp;l</translation>
+ </message>
+ <message>
+ <source>&amp;Copy Address</source>
+ <translation>่ค‡่ฃฝไฝๅ€ &amp;C</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>&amp;Export</source>
+ <translation>ๅŒฏๅ‡บ &amp;E</translation>
+ </message>
+ <message>
+ <source>&amp;Delete</source>
+ <translation>ๅˆช้™ค &amp;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&amp;hoose</source>
+ <translation>้ธๅ– &amp;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>้€™ไบ›ๆ˜ฏไฝ ่ฆไป˜ๆฌพ้ŽๅŽป็š„ 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 &amp;Label</source>
+ <translation>่ค‡่ฃฝๆจ™่จ˜ &amp;L</translation>
+ </message>
+ <message>
+ <source>&amp;Edit</source>
+ <translation>็ทจ่ผฏ &amp;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>
+ <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>
+ <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>
+ <message>
+ <source>Warning: If you encrypt your wallet and lose your passphrase, you will &lt;b&gt;LOSE ALL OF YOUR BITCOINS&lt;/b&gt;!</source>
+ <translation>่ญฆๅ‘Š: ๅฆ‚ๆžœๆŠŠ้ŒขๅŒ…ๅŠ ๅฏ†ๅพŒๅˆๅฟ˜่จ˜ๅฏ†็ขผ๏ผŒไฝ ๅฐฑๆœƒ&lt;b&gt;ๅคฑๅŽปๆ‰€ๆœ‰ Bitcoin ไบ†&lt;/b&gt;๏ผ</translation>
+ </message>
+ <message>
+ <source>Are you sure you wish to encrypt your wallet?</source>
+ <translation>ไฝ ็ขบๅฎš่ฆๆŠŠ้ŒขๅŒ…ๅŠ ๅฏ†ๅ—Ž๏ผŸ</translation>
+ </message>
+ <message>
+ <source>Bitcoin Core 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>Bitcoin Core ็พๅœจ่ฆ้—œ้–‰ไปฅๅฎŒๆˆๅŠ ๅฏ†็จ‹ๅบใ€‚่ซ‹่จ˜ๅพ—ๅฐ‡้ŒขๅŒ…ๅŠ ๅฏ†ไธ่ƒฝๅฎŒๅ…จ้˜ฒๆญขไฝ ็š„ Bitcoin ็ถ“่ขซๅ…ฅไพต้›ป่…ฆ็š„ๆƒกๆ„็จ‹ๅผๅทๅ–ใ€‚</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>Warning: The Caps Lock key is on!</source>
+ <translation>่ญฆๅ‘Š: Caps Lock ๅทฒๅ•Ÿ็”จ๏ผ</translation>
+ </message>
+ <message>
+ <source>Wallet encrypted</source>
+ <translation>้ŒขๅŒ…ๅทฒๅŠ ๅฏ†</translation>
+ </message>
+ <message>
+ <source>Enter the new passphrase to the wallet.&lt;br/&gt;Please use a passphrase of &lt;b&gt;ten or more random characters&lt;/b&gt;, or &lt;b&gt;eight or more words&lt;/b&gt;.</source>
+ <translation>่ผธๅ…ฅ้ŒขๅŒ…็š„ๆ–ฐๅฏ†็ขผใ€‚&lt;br/&gt;ๅฏ†็ขผ่ซ‹็”จ&lt;b&gt;10 ๅ€‹ๆˆ–ไปฅไธŠ็š„้šจๆฉŸๅญ—ๅ…ƒ&lt;/b&gt;๏ผŒๆˆ–ๆ˜ฏ&lt;b&gt;8 ๅ€‹ๆˆ–ไปฅไธŠ็š„ๅญ—่ฉž&lt;/b&gt;ใ€‚</translation>
+ </message>
+ <message>
+ <source>Enter the old passphrase and new passphrase to the 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>
+</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 &amp;message...</source>
+ <translation>็ฐฝ็ฝฒ่จŠๆฏ... &amp;m</translation>
+ </message>
+ <message>
+ <source>Synchronizing with network...</source>
+ <translation>่ˆ‡็ถฒ็ตกๅŒๆญฅไธญ...</translation>
+ </message>
+ <message>
+ <source>&amp;Overview</source>
+ <translation>็ธฝ่ฆฝ &amp;O</translation>
+ </message>
+ <message>
+ <source>Node</source>
+ <translation>็ฏ€้ปž</translation>
+ </message>
+ <message>
+ <source>Show general overview of wallet</source>
+ <translation>้กฏ็คบ้ŒขๅŒ…ไธ€่ˆฌ็ธฝ่ฆฝ</translation>
+ </message>
+ <message>
+ <source>&amp;Transactions</source>
+ <translation>ไบคๆ˜“ &amp;T</translation>
+ </message>
+ <message>
+ <source>Browse transaction history</source>
+ <translation>็€่ฆฝไบคๆ˜“็ด€้Œ„</translation>
+ </message>
+ <message>
+ <source>E&amp;xit</source>
+ <translation>็ตๆŸ &amp;x</translation>
+ </message>
+ <message>
+ <source>Quit application</source>
+ <translation>็ตๆŸๆ‡‰็”จ็จ‹ๅผ</translation>
+ </message>
+ <message>
+ <source>About &amp;Qt</source>
+ <translation>้—œๆ–ผ Qt &amp;Q</translation>
+ </message>
+ <message>
+ <source>Show information about Qt</source>
+ <translation>้กฏ็คบ Qt ็›ธ้—œ่ณ‡่จŠ</translation>
+ </message>
+ <message>
+ <source>&amp;Options...</source>
+ <translation>้ธ้ …... &amp;O</translation>
+ </message>
+ <message>
+ <source>&amp;Encrypt Wallet...</source>
+ <translation>ๅŠ ๅฏ†้ŒขๅŒ…... &amp;E</translation>
+ </message>
+ <message>
+ <source>&amp;Backup Wallet...</source>
+ <translation>ๅ‚™ไปฝ้ŒขๅŒ…... &amp;B</translation>
+ </message>
+ <message>
+ <source>&amp;Change Passphrase...</source>
+ <translation>ๆ”น่ฎŠๅฏ†็ขผ... &amp;C</translation>
+ </message>
+ <message>
+ <source>&amp;Sending addresses...</source>
+ <translation>ไป˜ๆฌพไฝๅ€... &amp;S</translation>
+ </message>
+ <message>
+ <source>&amp;Receiving addresses...</source>
+ <translation>ๆ”ถๆฌพไฝๅ€... &amp;R</translation>
+ </message>
+ <message>
+ <source>Open &amp;URI...</source>
+ <translation>้–‹ๅ•“็ถฒๅ€... &amp;U</translation>
+ </message>
+ <message>
+ <source>Bitcoin Core client</source>
+ <translation>Bitcoin Core ๅฎขๆˆถ็ซฏ</translation>
+ </message>
+ <message>
+ <source>Importing blocks from disk...</source>
+ <translation>ๆญฃๅœจๅพž็ฃ็ขŸๅŒฏๅ…ฅๅ€ๅกŠ่ณ‡ๆ–™...</translation>
+ </message>
+ <message>
+ <source>Reindexing blocks on disk...</source>
+ <translation>ๆญฃๅœจ็‚บ็ฃ็ขŸๅ€ๅกŠ้‡ๅปบ็ดขๅผ•...</translation>
+ </message>
+ <message>
+ <source>Send coins to a Bitcoin address</source>
+ <translation>ไป˜ๆฌพ่‡ณไธ€ๅ€‹ Bitcoin ไฝๅ€</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>&amp;Debug window</source>
+ <translation>้™ค้Œฏ่ฆ–็ช— &amp;D</translation>
+ </message>
+ <message>
+ <source>Open debugging and diagnostic console</source>
+ <translation>้–‹ๅ•“้™ค้Œฏๅ’Œ่จบๆ–ทไธปๆŽงๅฐ</translation>
+ </message>
+ <message>
+ <source>&amp;Verify message...</source>
+ <translation>้ฉ—่ญ‰่จŠๆฏ... &amp;V</translation>
+ </message>
+ <message>
+ <source>Bitcoin</source>
+ <translation>Bitcoin</translation>
+ </message>
+ <message>
+ <source>Wallet</source>
+ <translation>้ŒขๅŒ…</translation>
+ </message>
+ <message>
+ <source>&amp;Send</source>
+ <translation>ไป˜ๆฌพ &amp;S</translation>
+ </message>
+ <message>
+ <source>&amp;Receive</source>
+ <translation>ๆ”ถๆฌพ &amp;R</translation>
+ </message>
+ <message>
+ <source>Show information about Bitcoin Core</source>
+ <translation>้กฏ็คบ Bitcoin Core ็š„็›ธ้—œ่ณ‡่จŠ</translation>
+ </message>
+ <message>
+ <source>&amp;Show / Hide</source>
+ <translation>้กฏ็คบ / ้šฑ่— &amp;S</translation>
+ </message>
+ <message>
+ <source>Show or hide the main Window</source>
+ <translation>้กฏ็คบๆˆ–้šฑ่—ไธป่ฆ–็ช—</translation>
+ </message>
+ </context>
+<context>
+ <name>ClientModel</name>
+ </context>
+<context>
+ <name>CoinControlDialog</name>
+ <message>
+ <source>(no label)</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>OpenURIDialog</name>
+ </context>
+<context>
+ <name>OptionsDialog</name>
+ </context>
+<context>
+ <name>OverviewPage</name>
+ </context>
+<context>
+ <name>PaymentServer</name>
+ </context>
+<context>
+ <name>PeerTableModel</name>
+ </context>
+<context>
+ <name>QObject</name>
+ </context>
+<context>
+ <name>QRImageWidget</name>
+ </context>
+<context>
+ <name>RPCConsole</name>
+ </context>
+<context>
+ <name>ReceiveCoinsDialog</name>
+ </context>
+<context>
+ <name>ReceiveRequestDialog</name>
+ <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>
+ <source>(no label)</source>
+ <translation>(็„กๆจ™่จ˜)</translation>
+ </message>
+ </context>
+<context>
+ <name>SendCoinsEntry</name>
+ </context>
+<context>
+ <name>ShutdownWindow</name>
+ </context>
+<context>
+ <name>SignVerifyMessageDialog</name>
+ </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>
+ <message>
+ <source>Label</source>
+ <translation>ๆจ™่จ˜</translation>
+ </message>
+ </context>
+<context>
+ <name>TransactionView</name>
+ <message>
+ <source>Exporting Failed</source>
+ <translation>ๅŒฏๅ‡บๅคฑๆ•—</translation>
+ </message>
+ <message>
+ <source>Comma separated file (*.csv)</source>
+ <translation>้€—่™Ÿๅˆ†้š”ๆช”(*.csv)</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>
+ <message>
+ <source>&amp;Export</source>
+ <translation>ๅŒฏๅ‡บ &amp;E</translation>
+ </message>
+ <message>
+ <source>Export the data in the current tab to a file</source>
+ <translation>ๆŠŠ็›ฎๅ‰ๅˆ†้ ็š„่ณ‡ๆ–™ๅŒฏๅ‡บ่‡ณๆช”ๆกˆ</translation>
+ </message>
+ </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 4026095928..107e7034e5 100644
--- a/src/qt/locale/bitcoin_zh_TW.ts
+++ b/src/qt/locale/bitcoin_zh_TW.ts
@@ -7,7 +7,7 @@
</message>
<message>
<source>Create a new address</source>
- <translation>ๆ–ฐๅขžๆ–ฐ็š„ไฝๅ€</translation>
+ <translation>็”ข็”Ÿไธ€ๅ€‹ๆ–ฐไฝๅ€</translation>
</message>
<message>
<source>&amp;New</source>
@@ -67,11 +67,11 @@
</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>
+ <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>
+ <translation>้€™ไบ›ๆ˜ฏไฝ ็”จไพ†ๆ”ถๆฌพ็š„ Bitcoin ไฝๅ€ใ€‚ๅปบ่ญฐๅœจๆฏๆฌกไบคๆ˜“ๆ™‚๏ผŒ้ƒฝไฝฟ็”จไธ€ๅ€‹ๆ–ฐ็š„ๆ”ถๆฌพไฝๅ€ใ€‚</translation>
</message>
<message>
<source>Copy &amp;Label</source>
@@ -161,7 +161,7 @@
</message>
<message>
<source>Warning: If you encrypt your wallet and lose your passphrase, you will &lt;b&gt;LOSE ALL OF YOUR BITCOINS&lt;/b&gt;!</source>
- <translation>่ญฆๅ‘Š: ๅฆ‚ๆžœๆŠŠ้ŒขๅŒ…ๅŠ ๅฏ†ๅพŒๅˆๅฟ˜่จ˜ๅฏ†็ขผ๏ผŒไฝ ๅฐฑๆœƒๅพžๆญค&lt;b&gt;ๅคฑๅŽปๅ…ถไธญๆ‰€ๆœ‰็š„ไฝๅ…ƒๅนฃไบ†&lt;/b&gt;๏ผ</translation>
+ <translation>่ญฆๅ‘Š: ๅฆ‚ๆžœๆŠŠ้ŒขๅŒ…ๅŠ ๅฏ†ๅพŒๅˆๅฟ˜่จ˜ๅฏ†็ขผ๏ผŒไฝ ๅฐฑๆœƒๅพžๆญค&lt;b&gt;ๅคฑๅŽปๅ…ถไธญๆ‰€ๆœ‰็š„ Bitcoin ไบ†&lt;/b&gt;๏ผ</translation>
</message>
<message>
<source>Are you sure you wish to encrypt your wallet?</source>
@@ -169,7 +169,7 @@
</message>
<message>
<source>Bitcoin Core 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>ไฝๅ…ƒๅนฃๆ ธๅฟƒ็พๅœจ่ฆ้—œ้–‰๏ผŒๅฅฝๅฎŒๆˆๅŠ ๅฏ†็จ‹ๅบใ€‚่ซ‹ๆณจๆ„๏ผŒๅŠ ๅฏ†้ŒขๅŒ…ไธ่ƒฝๅฎŒๅ…จ้˜ฒๆญขๅ…ฅไพตไฝ ็š„้›ป่…ฆ็š„ๆƒกๆ„็จ‹ๅผๅทๅ–ไฝๅ…ƒๅนฃใ€‚</translation>
+ <translation>Bitcoin Core ็พๅœจ่ฆ้—œ้–‰๏ผŒๅฅฝๅฎŒๆˆๅŠ ๅฏ†็จ‹ๅบใ€‚่ซ‹ๆณจๆ„๏ผŒๅŠ ๅฏ†้ŒขๅŒ…ไธ่ƒฝๅฎŒๅ…จ้˜ฒๆญขๅ…ฅไพตไฝ ็š„้›ป่…ฆ็š„ๆƒกๆ„็จ‹ๅผๅทๅ–้Œขๅนฃใ€‚</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>
@@ -307,7 +307,7 @@
</message>
<message>
<source>Bitcoin Core client</source>
- <translation>ไฝๅ…ƒๅนฃๆ ธๅฟƒๅฎขๆˆถ็ซฏ่ปŸ้ซ”</translation>
+ <translation>Bitcoin Core ๅฎขๆˆถ็ซฏ่ปŸ้ซ”</translation>
</message>
<message>
<source>Importing blocks from disk...</source>
@@ -319,7 +319,7 @@
</message>
<message>
<source>Send coins to a Bitcoin address</source>
- <translation>ไป˜้Œข็ตฆไธ€ๅ€‹ไฝๅ…ƒๅนฃไฝๅ€</translation>
+ <translation>ไป˜้Œข็ตฆไธ€ๅ€‹ Bitcoin ไฝๅ€</translation>
</message>
<message>
<source>Backup wallet to another location</source>
@@ -343,7 +343,7 @@
</message>
<message>
<source>Bitcoin</source>
- <translation>ไฝๅ…ƒๅนฃ</translation>
+ <translation>Bitcoin</translation>
</message>
<message>
<source>Wallet</source>
@@ -359,7 +359,7 @@
</message>
<message>
<source>Show information about Bitcoin Core</source>
- <translation>้กฏ็คบไฝๅ…ƒๅนฃๆ ธๅฟƒ็š„็›ธ้—œ่ณ‡่จŠ</translation>
+ <translation>้กฏ็คบ Bitcoin Core ็š„็›ธ้—œ่ณ‡่จŠ</translation>
</message>
<message>
<source>&amp;Show / Hide</source>
@@ -375,11 +375,11 @@
</message>
<message>
<source>Sign messages with your Bitcoin addresses to prove you own them</source>
- <translation>็”จไฝๅ…ƒๅนฃไฝๅ€็ฐฝ็ฝฒ่จŠๆฏไพ†่ญ‰ๆ˜Žไฝๅ€ๆ˜ฏไฝ ็š„</translation>
+ <translation>็”จ Bitcoin ไฝๅ€็ฐฝ็ฝฒ่จŠๆฏไพ†่ญ‰ๆ˜Žไฝๅ€ๆ˜ฏไฝ ็š„</translation>
</message>
<message>
<source>Verify messages to ensure they were signed with specified Bitcoin addresses</source>
- <translation>้ฉ—่ญ‰่จŠๆฏๆ˜ฏ็”จไพ†็ขบๅฎš่จŠๆฏๆ˜ฏ็”จๆŒ‡ๅฎš็š„ไฝๅ…ƒๅนฃไฝๅ€็ฐฝ็ฝฒ็š„</translation>
+ <translation>้ฉ—่ญ‰่จŠๆฏๆ˜ฏ็”จไพ†็ขบๅฎš่จŠๆฏๆ˜ฏ็”จๆŒ‡ๅฎš็š„ Bitcoin ไฝๅ€็ฐฝ็ฝฒ็š„</translation>
</message>
<message>
<source>&amp;File</source>
@@ -399,19 +399,19 @@
</message>
<message>
<source>Bitcoin Core</source>
- <translation>ไฝๅ…ƒๅนฃๆ ธๅฟƒ</translation>
+ <translation>Bitcoin Core</translation>
</message>
<message>
<source>Request payments (generates QR codes and bitcoin: URIs)</source>
- <translation>่ฆๆฑ‚ไป˜ๆฌพ(็”ข็”Ÿ QR Code ๅ’Œไฝๅ…ƒๅนฃไป˜ๆฌพๅ”่ญฐ็š„่ณ‡ๆบ่ญ˜ๅˆฅ็ขผ: URI)</translation>
+ <translation>่ฆๆฑ‚ไป˜ๆฌพ(็”ข็”Ÿ QR Code ๅ’Œ bitcoin ไป˜ๆฌพๅ”่ญฐ็š„่ณ‡ๆบ่ญ˜ๅˆฅ็ขผ: URI)</translation>
</message>
<message>
<source>&amp;About Bitcoin Core</source>
- <translation>้—œๆ–ผไฝๅ…ƒๅนฃๆ ธๅฟƒ</translation>
+ <translation>้—œๆ–ผ Bitcoin Core</translation>
</message>
<message>
<source>Modify configuration options for Bitcoin Core</source>
- <translation>ไฟฎๆ”นไฝๅ…ƒๅนฃๆ ธๅฟƒ็š„่จญๅฎš้ธ้ …</translation>
+ <translation>ไฟฎๆ”น Bitcoin Core ็š„่จญๅฎš้ธ้ …</translation>
</message>
<message>
<source>Show the list of used sending addresses and labels</source>
@@ -431,11 +431,11 @@
</message>
<message>
<source>Show the Bitcoin Core help message to get a list with possible Bitcoin command-line options</source>
- <translation>้กฏ็คบไฝๅ…ƒๅนฃๆ ธๅฟƒ็š„่ชชๆ˜Ž่จŠๆฏ๏ผŒไพ†ๅ–ๅพ—ๅฏ็”จๅ‘ฝไปคๅˆ—้ธ้ …็š„ๅˆ—่กจ</translation>
+ <translation>้กฏ็คบ Bitcoin Core ็š„่ชชๆ˜Ž่จŠๆฏ๏ผŒไพ†ๅ–ๅพ—ๅฏ็”จๅ‘ฝไปคๅˆ—้ธ้ …็š„ๅˆ—่กจ</translation>
</message>
<message numerus="yes">
<source>%n active connection(s) to Bitcoin network</source>
- <translation><numerusform>%n ๅ€‹้‹ไฝœไธญ็š„ไฝๅ…ƒๅนฃ็ถฒ่ทฏ้€ฃ็ทš</numerusform></translation>
+ <translation><numerusform>%n ๅ€‹้‹ไฝœไธญ็š„ Bitcoin ็ถฒ่ทฏ้€ฃ็ทš</numerusform></translation>
</message>
<message>
<source>No block source available...</source>
@@ -818,7 +818,7 @@
</message>
<message>
<source>The entered address "%1" is not a valid Bitcoin address.</source>
- <translation>่ผธๅ…ฅ็š„ไฝๅ€ %1 ไธฆไธๆ˜ฏๆœ‰ๆ•ˆ็š„ไฝๅ…ƒๅนฃไฝๅ€ใ€‚</translation>
+ <translation>่ผธๅ…ฅ็š„ไฝๅ€ %1 ไธฆไธๆ˜ฏๆœ‰ๆ•ˆ็š„ Bitcoin ไฝๅ€ใ€‚</translation>
</message>
<message>
<source>Could not unlock wallet.</source>
@@ -856,7 +856,7 @@
<name>HelpMessageDialog</name>
<message>
<source>Bitcoin Core</source>
- <translation>ไฝๅ…ƒๅนฃๆ ธๅฟƒ</translation>
+ <translation>Bitcoin Core</translation>
</message>
<message>
<source>version</source>
@@ -868,7 +868,7 @@
</message>
<message>
<source>About Bitcoin Core</source>
- <translation>้—œๆ–ผไฝๅ…ƒๅนฃๆ ธๅฟƒ</translation>
+ <translation>้—œๆ–ผ Bitcoin Core</translation>
</message>
<message>
<source>Command-line options</source>
@@ -919,15 +919,15 @@
</message>
<message>
<source>Welcome to Bitcoin Core.</source>
- <translation>ๆญก่ฟŽไฝฟ็”จไฝๅ…ƒๅนฃๆ ธๅฟƒ</translation>
+ <translation>ๆญก่ฟŽไฝฟ็”จ Bitcoin Core</translation>
</message>
<message>
<source>As this is the first time the program is launched, you can choose where Bitcoin Core will store its data.</source>
- <translation>ๅ› ็‚บ้€™ๆ˜ฏ็จ‹ๅผ็ฌฌไธ€ๆฌกๅ•“ๅ‹•๏ผŒไฝ ๅฏไปฅ้ธๆ“‡ไฝๅ…ƒๅนฃๆ ธๅฟƒๅ„ฒๅญ˜่ณ‡ๆ–™็š„ๅœฐๆ–นใ€‚</translation>
+ <translation>ๅ› ็‚บ้€™ๆ˜ฏ็จ‹ๅผ็ฌฌไธ€ๆฌกๅ•“ๅ‹•๏ผŒไฝ ๅฏไปฅ้ธๆ“‡ Bitcoin Core ๅ„ฒๅญ˜่ณ‡ๆ–™็š„ๅœฐๆ–นใ€‚</translation>
</message>
<message>
<source>Bitcoin Core will download and store a copy of the Bitcoin block chain. At least %1GB 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>ไฝๅ…ƒๅนฃๆ ธๅฟƒๆœƒไธ‹่ผ‰ไธฆๅ„ฒๅญ˜ไธ€ไปฝไฝๅ…ƒๅนฃๅ€ๅกŠ้ˆ็š„ๆ‹ท่ฒใ€‚่‡ณๅฐ‘ๆœ‰ %1GB ็š„่ณ‡ๆ–™ๆœƒๅ„ฒๅญ˜ๅˆฐ้€™ๅ€‹็›ฎ้Œ„ไธญ๏ผŒไธฆไธ”้‚„ๆœƒๆŒ็บŒๅขž้•ทใ€‚ๅฆๅค–้ŒขๅŒ…่ณ‡ๆ–™ไนŸๆœƒๅ„ฒๅญ˜ๅœจ้€™ๅ€‹็›ฎ้Œ„ใ€‚</translation>
+ <translation>Bitcoin Core ๆœƒไธ‹่ผ‰ไธฆๅ„ฒๅญ˜ไธ€ไปฝ Bitcoin ๅ€ๅกŠ้ˆ็š„ๆ‹ท่ฒใ€‚่‡ณๅฐ‘ๆœ‰ %1GB ็š„่ณ‡ๆ–™ๆœƒๅ„ฒๅญ˜ๅˆฐ้€™ๅ€‹็›ฎ้Œ„ไธญ๏ผŒไธฆไธ”้‚„ๆœƒๆŒ็บŒๅขž้•ทใ€‚ๅฆๅค–้ŒขๅŒ…่ณ‡ๆ–™ไนŸๆœƒๅ„ฒๅญ˜ๅœจ้€™ๅ€‹็›ฎ้Œ„ใ€‚</translation>
</message>
<message>
<source>Use the default data directory</source>
@@ -939,7 +939,7 @@
</message>
<message>
<source>Bitcoin Core</source>
- <translation>ไฝๅ…ƒๅนฃๆ ธๅฟƒ</translation>
+ <translation>Bitcoin Core</translation>
</message>
<message>
<source>Error: Specified data directory "%1" cannot be created.</source>
@@ -1021,7 +1021,7 @@
</message>
<message>
<source>The user interface language can be set here. This setting will take effect after restarting Bitcoin Core.</source>
- <translation>ๅฏไปฅๅœจ้€™่ฃก่จญๅฎšไฝฟ็”จ่€…ไป‹้ข็š„่ชž่จ€ใ€‚้€™ๅ€‹่จญๅฎšๅœจ้‡ๅ•“ไฝๅ…ƒๅนฃๆ ธๅฟƒๅพŒๆ‰ๆœƒ็”Ÿๆ•ˆใ€‚</translation>
+ <translation>ๅฏไปฅๅœจ้€™่ฃก่จญๅฎšไฝฟ็”จ่€…ไป‹้ข็š„่ชž่จ€ใ€‚้€™ๅ€‹่จญๅฎšๅœจ้‡ๅ•“ Bitcoin Core ๅพŒๆ‰ๆœƒ็”Ÿๆ•ˆใ€‚</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>
@@ -1049,11 +1049,11 @@
</message>
<message>
<source>Automatically start Bitcoin Core after logging in to the system.</source>
- <translation>ๅœจ็™ปๅ…ฅ็ณป็ตฑๅพŒ่‡ชๅ‹•ๅ•“ๅ‹•ไฝๅ…ƒๅนฃๆ ธๅฟƒใ€‚</translation>
+ <translation>ๅœจ็™ปๅ…ฅ็ณป็ตฑๅพŒ่‡ชๅ‹•ๅ•“ๅ‹• Bitcoin Coreใ€‚</translation>
</message>
<message>
<source>&amp;Start Bitcoin Core on system login</source>
- <translation>็ณป็ตฑ็™ปๅ…ฅๆ™‚ๅ•Ÿๅ‹•ไฝๅ…ƒๅนฃๆ ธๅฟƒ</translation>
+ <translation>็ณป็ตฑ็™ปๅ…ฅๆ™‚ๅ•Ÿๅ‹• Bitcoin Core</translation>
</message>
<message>
<source>(0 = auto, &lt;0 = leave that many cores free)</source>
@@ -1081,7 +1081,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>่‡ชๅ‹•ๅœจ่ทฏ็”ฑๅ™จไธŠ้–‹ๆ”พไฝๅ…ƒๅนฃ็š„ๅฎขๆˆถ็ซฏ้€š่จŠๅŸ ใ€‚ๅชๆœ‰ๅœจไฝ ็š„่ทฏ็”ฑๅ™จๆ”ฏๆดไธ”้–‹ๅ•“ใ€Œ้€š็”จๅณๆ’ๅณ็”จใ€ๅ”ๅฎš(UPnP)ๆ™‚ๆ‰ๆœ‰ไฝœ็”จใ€‚</translation>
+ <translation>่‡ชๅ‹•ๅœจ่ทฏ็”ฑๅ™จไธŠ้–‹ๆ”พ Bitcoin ็š„ๅฎขๆˆถ็ซฏ้€š่จŠๅŸ ใ€‚ๅชๆœ‰ๅœจไฝ ็š„่ทฏ็”ฑๅ™จๆ”ฏๆดไธ”้–‹ๅ•“ใ€Œ้€š็”จๅณๆ’ๅณ็”จใ€ๅ”ๅฎš(UPnP)ๆ™‚ๆ‰ๆœ‰ไฝœ็”จใ€‚</translation>
</message>
<message>
<source>Map port using &amp;UPnP</source>
@@ -1089,7 +1089,7 @@
</message>
<message>
<source>Connect to the Bitcoin network through a SOCKS5 proxy.</source>
- <translation>้€้Ž SOCKS5 ไปฃ็†ไผบๆœๅ™จไพ†้€ฃ็ทšๅˆฐไฝๅ…ƒๅนฃ็ถฒ่ทฏใ€‚</translation>
+ <translation>้€้Ž SOCKS5 ไปฃ็†ไผบๆœๅ™จไพ†้€ฃ็ทšๅˆฐ Bitcoin ็ถฒ่ทฏใ€‚</translation>
</message>
<message>
<source>&amp;Connect through SOCKS5 proxy (default proxy):</source>
@@ -1129,7 +1129,7 @@
</message>
<message>
<source>Connect to the Bitcoin network through a separate SOCKS5 proxy for Tor hidden services.</source>
- <translation>้€้Žๅฆๅค–็š„ SOCKS5 ไปฃ็†ไผบๆœๅ™จไพ†้€ฃ็ทšๅˆฐไฝๅ…ƒๅนฃ็ถฒ่ทฏไธญ็š„ Tor ้šฑ่—ๆœๅ‹™ใ€‚</translation>
+ <translation>้€้Žๅฆๅค–็š„ SOCKS5 ไปฃ็†ไผบๆœๅ™จไพ†้€ฃ็ทšๅˆฐ Bitcoin ็ถฒ่ทฏไธญ็š„ Tor ้šฑ่—ๆœๅ‹™ใ€‚</translation>
</message>
<message>
<source>Use separate SOCKS5 proxy to reach peers via Tor hidden services:</source>
@@ -1216,7 +1216,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>้กฏ็คบ็š„่ณ‡่จŠๅฏ่ƒฝๆ˜ฏ้ŽๆœŸ็š„ใ€‚่ทŸ Bitcoin ็ถฒ่ทฏ็š„้€ฃ็ทšๅปบ็ซ‹ๅพŒ๏ผŒไฝ ็š„้ŒขๅŒ…ๆœƒ่‡ชๅ‹•ๅ’Œ็ถฒ่ทฏๅŒๆญฅ๏ผŒไฝ†ๆ˜ฏ้€™ๅ€‹ๆญฅ้ฉŸ้‚„ๆฒ’ๅฎŒๆˆใ€‚</translation>
</message>
<message>
<source>Watch-only:</source>
@@ -1323,7 +1323,7 @@
</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>
+ <translation>ๆฒ’่พฆๆณ•่งฃๆž่ณ‡ๆบ่ญ˜ๅˆฅ็ขผ(URI)๏ผๅฏ่ƒฝๆ˜ฏๅ› ็‚บ Bitcoin ไฝๅ€็„กๆ•ˆ๏ผŒๆˆ–ๆ˜ฏ URI ๅƒๆ•ธๆ ผๅผ้Œฏ่ชคใ€‚</translation>
</message>
<message>
<source>Payment request file handling</source>
@@ -1397,7 +1397,7 @@
</message>
<message>
<source>Enter a Bitcoin address (e.g. %1)</source>
- <translation>่ผธๅ…ฅไฝๅ…ƒๅนฃไฝๅ€ (ๆฏ”ๅฆ‚่ชช %1)</translation>
+ <translation>่ผธๅ…ฅ Bitcoin ไฝๅ€ (ๆฏ”ๅฆ‚่ชช %1)</translation>
</message>
<message>
<source>%1 d</source>
@@ -1474,10 +1474,6 @@
<translation>ๆ™ฎ้€š</translation>
</message>
<message>
- <source>Using OpenSSL version</source>
- <translation>ไฝฟ็”จ็š„ OpenSSL ็‰ˆๆœฌ</translation>
- </message>
- <message>
<source>Using BerkeleyDB version</source>
<translation>ไฝฟ็”จ BerkeleyDB ็‰ˆๆœฌ</translation>
</message>
@@ -1519,7 +1515,7 @@
</message>
<message>
<source>Open the Bitcoin Core debug log file from the current data directory. This can take a few seconds for large log files.</source>
- <translation>ๅพž็›ฎๅ‰็š„่ณ‡ๆ–™็›ฎ้Œ„ไธ‹้–‹ๅ•“ไฝๅ…ƒๅนฃๆ ธๅฟƒ็š„้™ค้Œฏ็ด€้Œ„ๆช”ใ€‚็•ถ็ด€้Œ„ๆช”ๅพˆๅคงๆ™‚๏ผŒๅฏ่ƒฝๆœƒ่Šฑๅฅฝๅนพ็ง’็š„ๆ™‚้–“ใ€‚</translation>
+ <translation>ๅพž็›ฎๅ‰็š„่ณ‡ๆ–™็›ฎ้Œ„ไธ‹้–‹ๅ•“ Bitcoin Core ็š„้™ค้Œฏ็ด€้Œ„ๆช”ใ€‚็•ถ็ด€้Œ„ๆช”ๅพˆๅคงๆ™‚๏ผŒๅฏ่ƒฝๆœƒ่Šฑๅฅฝๅนพ็ง’็š„ๆ™‚้–“ใ€‚</translation>
</message>
<message>
<source>Received</source>
@@ -1679,7 +1675,7 @@
</message>
<message>
<source>Welcome to the Bitcoin Core RPC console.</source>
- <translation>ๆญก่ฟŽไฝฟ็”จไฝๅ…ƒๅนฃๆ ธๅฟƒ RPC ไธปๆŽงๅฐใ€‚</translation>
+ <translation>ๆญก่ฟŽไฝฟ็”จ Bitcoin Core ็š„ RPC ไธปๆŽงๅฐใ€‚</translation>
</message>
<message>
<source>Use up and down arrows to navigate history, and &lt;b&gt;Ctrl-L&lt;/b&gt; to clear screen.</source>
@@ -1762,7 +1758,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>้™„ๅŠ ๅœจไป˜ๆฌพ่ฆๆฑ‚ไธญ็š„่จŠๆฏ๏ผŒๅฏไปฅไธๅกซ๏ผŒๆ‰“้–‹่ฆๆฑ‚ๅ…งๅฎนๆ™‚ๆœƒ้กฏ็คบใ€‚ๆณจๆ„: ้€™ๅ€‹่จŠๆฏไธๆœƒ้šจ่‘—ไป˜ๆฌพ้€ๅˆฐไฝๅ…ƒๅนฃ็ถฒ่ทฏไธŠใ€‚</translation>
+ <translation>้™„ๅŠ ๅœจไป˜ๆฌพ่ฆๆฑ‚ไธญ็š„่จŠๆฏ๏ผŒๅฏไปฅไธๅกซ๏ผŒๆ‰“้–‹่ฆๆฑ‚ๅ…งๅฎนๆ™‚ๆœƒ้กฏ็คบใ€‚ๆณจๆ„: ้€™ๅ€‹่จŠๆฏไธๆœƒ้šจ่‘—ไป˜ๆฌพ้€ๅˆฐ Bitcoin ็ถฒ่ทฏไธŠใ€‚</translation>
</message>
<message>
<source>An optional label to associate with the new receiving address.</source>
@@ -2155,7 +2151,7 @@
</message>
<message>
<source>Warning: Invalid Bitcoin address</source>
- <translation>่ญฆๅ‘Š: ไฝๅ…ƒๅนฃไฝๅ€็„กๆ•ˆ</translation>
+ <translation>่ญฆๅ‘Š: Bitcoin ไฝๅ€็„กๆ•ˆ</translation>
</message>
<message>
<source>(no label)</source>
@@ -2206,7 +2202,7 @@
</message>
<message>
<source>The Bitcoin address to send the payment to</source>
- <translation>ๆŽฅๆ”ถไป˜ๆฌพ็š„ไฝๅ…ƒๅนฃไฝๅ€</translation>
+ <translation>ๆŽฅๆ”ถไป˜ๆฌพ็š„ Bitcoin ไฝๅ€</translation>
</message>
<message>
<source>Alt+A</source>
@@ -2226,7 +2222,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>ๆ‰‹็บŒ่ฒปๆœƒๅพž่ฆไป˜ๆฌพๅ‡บๅŽป็š„้‡‘้กไธญๆ‰ฃๆŽ‰ใ€‚ๅ› ๆญคๆ”ถๆฌพไบบๆœƒๆ”ถๅˆฐๆฏ”่ผธๅ…ฅ็š„้‡‘้ก้‚„่ฆๅฐ‘็š„ไฝๅ…ƒๅนฃใ€‚ๅฆ‚ๆžœๆœ‰ๅคšๅ€‹ๆ”ถๆฌพไบบ็š„่ฉฑ๏ผŒๆ‰‹็บŒ่ฒปๆœƒๅนณๅ‡ๅˆ†้…ไพ†ๆ‰ฃ้™คใ€‚</translation>
+ <translation>ๆ‰‹็บŒ่ฒปๆœƒๅพž่ฆไป˜ๆฌพๅ‡บๅŽป็š„้‡‘้กไธญๆ‰ฃๆŽ‰ใ€‚ๅ› ๆญคๆ”ถๆฌพไบบๆœƒๆ”ถๅˆฐๆฏ”่ผธๅ…ฅ็š„้‡‘้ก้‚„่ฆๅฐ‘็š„ bitcoinใ€‚ๅฆ‚ๆžœๆœ‰ๅคšๅ€‹ๆ”ถๆฌพไบบ็š„่ฉฑ๏ผŒๆ‰‹็บŒ่ฒปๆœƒๅนณๅ‡ๅˆ†้…ไพ†ๆ‰ฃ้™คใ€‚</translation>
</message>
<message>
<source>S&amp;ubtract fee from amount</source>
@@ -2250,7 +2246,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>้™„ๅŠ ๅœจไฝๅ…ƒๅนฃไป˜ๆฌพๅ”่ญฐ็š„่ณ‡ๆบ่ญ˜ๅˆฅ็ขผ(URI)ไธญ็š„่จŠๆฏ๏ผŒๆœƒๅ’Œไบคๆ˜“ๅ…งๅฎนไธ€่ตทๅญ˜่ตทไพ†๏ผŒ็ตฆไฝ ่‡ชๅทฑๅšๅƒ่€ƒใ€‚ๆณจๆ„: ้€™ๅ€‹่จŠๆฏไธๆœƒ้€ๅˆฐไฝๅ…ƒๅนฃ็ถฒ่ทฏไธŠใ€‚</translation>
+ <translation>้™„ๅŠ ๅœจ Bitcoin ไป˜ๆฌพๅ”่ญฐ็š„่ณ‡ๆบ่ญ˜ๅˆฅ็ขผ(URI)ไธญ็š„่จŠๆฏ๏ผŒๆœƒๅ’Œไบคๆ˜“ๅ…งๅฎนไธ€่ตทๅญ˜่ตทไพ†๏ผŒ็ตฆไฝ ่‡ชๅทฑๅšๅƒ่€ƒใ€‚ๆณจๆ„: ้€™ๅ€‹่จŠๆฏไธๆœƒ้€ๅˆฐ Bitcoin ็ถฒ่ทฏไธŠใ€‚</translation>
</message>
<message>
<source>Pay To:</source>
@@ -2265,7 +2261,7 @@
<name>ShutdownWindow</name>
<message>
<source>Bitcoin Core is shutting down...</source>
- <translation>ๆญฃๅœจ้—œ้–‰ไฝๅ…ƒๅนฃๆ ธๅฟƒไธญ...</translation>
+ <translation>ๆญฃๅœจ้—œ้–‰ Bitcoin Core ไธญ...</translation>
</message>
<message>
<source>Do not shut down the computer until this window disappears.</source>
@@ -2288,7 +2284,7 @@
</message>
<message>
<source>The Bitcoin address to sign the message with</source>
- <translation>็”จไพ†็ฐฝ็ฝฒ่จŠๆฏ็š„ไฝๅ…ƒๅนฃไฝๅ€</translation>
+ <translation>็”จไพ†็ฐฝ็ฝฒ่จŠๆฏ็š„ Bitcoin ไฝๅ€</translation>
</message>
<message>
<source>Choose previously used address</source>
@@ -2320,7 +2316,7 @@
</message>
<message>
<source>Sign the message to prove you own this Bitcoin address</source>
- <translation>็ฐฝ็ฝฒ้€™ๅ€‹่จŠๆฏไพ†่ญ‰ๆ˜Ž้€™ๅ€‹ไฝๅ…ƒๅนฃไฝๅ€ๆ˜ฏไฝ ็š„</translation>
+ <translation>็ฐฝ็ฝฒ้€™ๅ€‹่จŠๆฏไพ†่ญ‰ๆ˜Ž้€™ๅ€‹ Bitcoin ไฝๅ€ๆ˜ฏไฝ ็š„</translation>
</message>
<message>
<source>Sign &amp;Message</source>
@@ -2344,11 +2340,11 @@
</message>
<message>
<source>The Bitcoin address the message was signed with</source>
- <translation>็ฐฝ็ฝฒ้€™ๅ€‹่จŠๆฏ็š„ไฝๅ…ƒๅนฃไฝๅ€</translation>
+ <translation>็ฐฝ็ฝฒ้€™ๅ€‹่จŠๆฏ็š„ Bitcoin ไฝๅ€</translation>
</message>
<message>
<source>Verify the message to ensure it was signed with the specified Bitcoin address</source>
- <translation>้ฉ—่ญ‰้€™ๅ€‹่จŠๆฏไพ†็ขบๅฎšๆ˜ฏ็”จๆŒ‡ๅฎš็š„ไฝๅ…ƒๅนฃไฝๅ€็ฐฝ็ฝฒ็š„</translation>
+ <translation>้ฉ—่ญ‰้€™ๅ€‹่จŠๆฏไพ†็ขบๅฎšๆ˜ฏ็”จๆŒ‡ๅฎš็š„ Bitcoin ไฝๅ€็ฐฝ็ฝฒ็š„</translation>
</message>
<message>
<source>Verify &amp;Message</source>
@@ -2415,11 +2411,11 @@
<name>SplashScreen</name>
<message>
<source>Bitcoin Core</source>
- <translation>ไฝๅ…ƒๅนฃๆ ธๅฟƒ</translation>
+ <translation>Bitcoin Core</translation>
</message>
<message>
<source>The Bitcoin Core developers</source>
- <translation>ไฝๅ…ƒๅนฃๆ ธๅฟƒ้–‹็™ผไบบๅ“ก</translation>
+ <translation>Bitcoin Core ้–‹็™ผไบบๅ“ก</translation>
</message>
<message>
<source>[testnet]</source>
@@ -2938,7 +2934,7 @@
</message>
<message>
<source>Please check that your computer's date and time are correct! If your clock is wrong Bitcoin Core will not work properly.</source>
- <translation>่ซ‹ๆชขๆŸฅ้›ป่…ฆๆ—ฅๆœŸๅ’Œๆ™‚้–“ๆ˜ฏๅฆๆญฃ็ขบ๏ผไฝๅ…ƒๅนฃๆ ธๅฟƒๆฒ’่พฆๆณ•ๅœจๆ™‚้˜ไธๆบ–็š„ๆƒ…ๆณไธ‹ๆญฃๅธธ้‹ไฝœใ€‚</translation>
+ <translation>่ซ‹ๆชขๆŸฅ้›ป่…ฆๆ—ฅๆœŸๅ’Œๆ™‚้–“ๆ˜ฏๅฆๆญฃ็ขบ๏ผBitcoin Core ๆฒ’่พฆๆณ•ๅœจๆ™‚้˜ไธๆบ–็š„ๆƒ…ๆณไธ‹ๆญฃๅธธ้‹ไฝœใ€‚</translation>
</message>
<message>
<source>Prune configured below the minimum of %d MiB. Please use a higher number.</source>
@@ -2970,7 +2966,7 @@
</message>
<message>
<source>Run in the background as a daemon and accept commands</source>
- <translation>็”จ่ญท้ˆๆจกๅผๅœจ่ƒŒๅพŒๅŸท่กŒไธฆๆŽฅๅ—ๆŒ‡ไปค</translation>
+ <translation>็”จ่ญท้ˆๆจกๅผๅœจ่ƒŒๆ™ฏๅŸท่กŒไธฆๆŽฅๅ—ๆŒ‡ไปค</translation>
</message>
<message>
<source>Unable to start HTTP server. See debug log for details.</source>
@@ -2981,6 +2977,18 @@
<translation>ๆ˜ฏๅฆๆŽฅๅ—ๅค–ไพ†้€ฃ็ทš(้ ่จญๅ€ผ: ็•ถๆฒ’ๆœ‰ -proxy ๆˆ– -connect ๆ™‚็‚บ 1)</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>
+ <message>
+ <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>
<translation>ๅ’ŒๆŒ‡ๅฎš็š„ไฝๅ€็นซ็ต๏ผŒไธฆไธ”ไธ€็›ดๅœจๆŒ‡ๅฎšไฝๅ€่ฝๅ€™้€ฃ็ทšใ€‚IPv6 ่ซ‹็”จ [ไธปๆฉŸ]:้€š่จŠๅŸ  ้€™็จฎๆ ผๅผ</translation>
</message>
@@ -2997,6 +3005,10 @@
<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, &lt;0 = leave that many cores free, default: %d)</source>
<translation>่จญๅฎšๆŒ‡ไปค็ขผ้ฉ—่ญ‰็š„ๅŸท่กŒ็ท’ๆ•ธ็›ฎ (%u ๅˆฐ %d๏ผŒ0 ่กจ็คบ็จ‹ๅผ่‡ชๅ‹•ๆฑบๅฎš๏ผŒๅฐๆ–ผ 0 ่กจ็คบไฟ็•™่™•็†ๅ™จๆ ธๅฟƒไธ็”จ็š„ๆ•ธ็›ฎ๏ผŒ้ ่จญๅ€ผ: %d)</translation>
</message>
@@ -3010,7 +3022,11 @@
</message>
<message>
<source>Unable to bind to %s on this computer. Bitcoin Core is probably already running.</source>
- <translation>ๆฒ’่พฆๆณ•็นซ็ตๅœจ้€™ๅฐ้›ป่…ฆไธŠ็š„ %s ใ€‚ไฝๅ…ƒๅนฃๆ ธๅฟƒๅฏ่ƒฝๅทฒ็ถ“ๅœจๅŸท่กŒไบ†ใ€‚</translation>
+ <translation>ๆฒ’่พฆๆณ•็นซ็ตๅœจ้€™ๅฐ้›ป่…ฆไธŠ็š„ %s ใ€‚Bitcoin Core ๅฏ่ƒฝๅทฒ็ถ“ๅœจๅŸท่กŒไบ†ใ€‚</translation>
+ </message>
+ <message>
+ <source>Unsupported argument -whitelistalwaysrelay ignored, use -whitelistrelay and/or -whitelistforcerelay.</source>
+ <translation>ๅฟฝ็•ฅไธๆ”ฏๆด็š„ๅƒๆ•ธ -whitelistalwaysrelay๏ผŒ่ซ‹ๆ”น็”จ -whitelistrelay ๅ’Œ -whitelistforcerelayโ€‹ ็š„็ต„ๅˆใ€‚</translation>
</message>
<message>
<source>Use UPnP to map the listening port (default: 1 when listening and no -proxy)</source>
@@ -3026,7 +3042,11 @@
</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: Unknown block versions being mined! It's possible unknown rules are in effect</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>
@@ -3049,6 +3069,10 @@
<translation>&lt;category&gt; ๅฏไปฅๆ˜ฏ:</translation>
</message>
<message>
+ <source>Append comment to the user agent string</source>
+ <translation>ๅฐไฝฟ็”จ่€…ไปฃ็†ๅญ—ไธฒๆทปๅŠ ่จป่งฃ</translation>
+ </message>
+ <message>
<source>Block creation options:</source>
<translation>ๅ€ๅกŠ่ฃฝ้€ ้ธ้ …:</translation>
</message>
@@ -3093,6 +3117,10 @@
<translation>้–‹ๅ•Ÿๅ‚ณ้€ไบคๆ˜“ๅŽŸๅง‹่ณ‡ๆ–™ๅˆฐ็›ฎๆจ™ ZeroMQ ไฝๅ€ &lt;address&gt; ๅŽป</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>
@@ -3129,10 +3157,22 @@
<translation>็„กๆ•ˆ็š„ -onion ไฝๅ€: '%s'</translation>
</message>
<message>
+ <source>Invalid amount for -fallbackfee=&lt;amount&gt;: '%s'</source>
+ <translation>่จญๅฎš -fallbackfee=&lt;้‡‘้ก&gt; ็š„้‡‘้ก็„กๆ•ˆ: '%s'</translation>
+ </message>
+ <message>
<source>Keep the transaction memory pool below &lt;n&gt; megabytes (default: %u)</source>
<translation>ๅœจ่จ˜ๆ†ถ้ซ”ๆšซๅญ˜ๆฑ ไธญไฟๆŒๆœ€ๅคš &lt;n&gt; ๅ€‹็™พ่ฌไฝๅ…ƒ็ต„็š„ไบคๆ˜“(้ ่จญๅ€ผ: %u)</translation>
</message>
<message>
+ <source>Location of the auth cookie (default: data dir)</source>
+ <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>
@@ -3141,6 +3181,10 @@
<translation>ๅชๅ’Œ &lt;net&gt; ็ถฒ่ทฏไธŠ็š„็ฏ€้ปž้€ฃ็ทš(ipv4, ipv6, ๆˆ– onion)</translation>
</message>
<message>
+ <source>Print version and exit</source>
+ <translation>้กฏ็คบ็‰ˆๆœฌๅพŒ็ตๆŸ</translation>
+ </message>
+ <message>
<source>Prune cannot be configured with a negative value.</source>
<translation>ไฟฎๅ‰ชๅ€ผไธ่ƒฝ่จญๅฎš็‚บ่ฒ ็š„ใ€‚</translation>
</message>
@@ -3197,10 +3241,6 @@
<translation>้ŒขๅŒ…้ธ้ …:</translation>
</message>
<message>
- <source>Warning: This version is obsolete; upgrade required!</source>
- <translation>่ญฆๅ‘Š: ้€™ๅ€‹็‰ˆๆœฌๅทฒ็ถ“่ขซๆท˜ๆฑฐไบ†๏ผ›ๅฟ…้ ˆ่ฆๅ‡็ดš๏ผ</translation>
- </message>
- <message>
<source>You need to rebuild the database using -reindex to change -txindex</source>
<translation>ๆ”น่ฎŠ -txindex ๅƒๆ•ธๅพŒ๏ผŒๅฟ…้ ˆ่ฆ็”จ -reindex ๅƒๆ•ธไพ†้‡ๅปบ่ณ‡ๆ–™ๅบซ</translation>
</message>
@@ -3218,7 +3258,7 @@
</message>
<message>
<source>Cannot obtain a lock on data directory %s. Bitcoin Core is probably already running.</source>
- <translation>ๆฒ’่พฆๆณ•้Ž–ๅฎš่ณ‡ๆ–™็›ฎ้Œ„ %sใ€‚ไฝๅ…ƒๅนฃๆ ธๅฟƒๅฏ่ƒฝๅทฒ็ถ“ๅœจๅŸท่กŒไบ†ใ€‚</translation>
+ <translation>ๆฒ’่พฆๆณ•้Ž–ๅฎš่ณ‡ๆ–™็›ฎ้Œ„ %sใ€‚Bitcoin Core ๅฏ่ƒฝๅทฒ็ถ“ๅœจๅŸท่กŒไบ†ใ€‚</translation>
</message>
<message>
<source>Create new files with system default permissions, instead of umask 077 (only effective with disabled wallet functionality)</source>
@@ -3297,10 +3337,6 @@
<translation>ๅ•Ÿ็”จๆœ€ไฝณ้ˆ็ต...</translation>
</message>
<message>
- <source>Always relay transactions received from whitelisted peers (default: %d)</source>
- <translation>็„กๆขไปถ่ฝ‰็™ผๅพž็™ฝๅ้ปž็ฏ€้ปžๆ”ถๅˆฐ็š„ไบคๆ˜“(้ ่จญๅ€ผ: %d)</translation>
- </message>
- <message>
<source>Attempt to recover private keys from a corrupt wallet.dat on startup</source>
<translation>ๅ•Ÿๅ‹•ๆ™‚ๅ˜—่ฉฆๅพžๅฃžๆŽ‰็š„้ŒขๅŒ…ๆช” wallet.dat ๅพฉๅŽŸๅฏ†้‘ฐ</translation>
</message>
@@ -3318,11 +3354,11 @@
</message>
<message>
<source>Copyright (C) 2009-%i The Bitcoin Core Developers</source>
- <translation>็‰ˆๆฌŠ็‚บไฝๅ…ƒๅนฃๆ ธๅฟƒ้–‹็™ผไบบๅ“ก่‡ช่ฅฟๅ…ƒ 2009 ่‡ณ %i ๅนด่ตทๆ‰€ๆœ‰</translation>
+ <translation>็‰ˆๆฌŠ็‚บ Bitcoin Core ้–‹็™ผไบบๅ“ก่‡ช่ฅฟๅ…ƒ 2009 ่‡ณ %i ๅนด่ตทๆ‰€ๆœ‰</translation>
</message>
<message>
<source>Error loading wallet.dat: Wallet requires newer version of Bitcoin Core</source>
- <translation>่ผ‰ๅ…ฅ wallet.dat ๆช”ๆกˆๆ™‚็™ผ็”Ÿ้Œฏ่ชค: ้€™ๅ€‹้ŒขๅŒ…้œ€่ฆๆ–ฐ็‰ˆ็š„ไฝๅ…ƒๅนฃๆ ธๅฟƒ</translation>
+ <translation>่ผ‰ๅ…ฅ wallet.dat ๆช”ๆกˆๆ™‚็™ผ็”Ÿ้Œฏ่ชค: ้€™ๅ€‹้ŒขๅŒ…้œ€่ฆๆ–ฐ็‰ˆ็š„ Bitcoin Core</translation>
</message>
<message>
<source>Error reading from database, shutting down.</source>
@@ -3338,7 +3374,7 @@
</message>
<message>
<source>Initialization sanity check failed. Bitcoin Core is shutting down.</source>
- <translation>ๅˆๅง‹ๅŒ–ๆ™‚็š„ๅŸบๆœฌๆชขๆŸฅๅคฑๆ•—ไบ†ใ€‚ไฝๅ…ƒๅนฃๆ ธๅฟƒๅฐฑ่ฆ้—œ้–‰ไบ†ใ€‚</translation>
+ <translation>ๅˆๅง‹ๅŒ–ๆ™‚็š„ๅŸบๆœฌๆชขๆŸฅๅคฑๆ•—ไบ†ใ€‚Bitcoin Core ๅฐฑ่ฆ้—œ้–‰ไบ†ใ€‚</translation>
</message>
<message>
<source>Invalid amount for -maxtxfee=&lt;amount&gt;: '%s'</source>
@@ -3458,13 +3494,17 @@
</message>
<message>
<source>Wallet needed to be rewritten: restart Bitcoin Core to complete</source>
- <translation>้ŒขๅŒ…้œ€่ฆ้‡ๅฏซ: ่ซ‹้‡ๆ–ฐๅ•“ๅ‹•ไฝๅ…ƒๅนฃๆ ธๅฟƒไพ†ๅฎŒๆˆ</translation>
+ <translation>้ŒขๅŒ…้œ€่ฆ้‡ๅฏซ: ่ซ‹้‡ๆ–ฐๅ•“ๅ‹• Bitcoin Core ไพ†ๅฎŒๆˆ</translation>
</message>
<message>
<source>Warning</source>
<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>
@@ -3582,7 +3622,7 @@
</message>
<message>
<source>Generate coins (default: %u)</source>
- <translation>็”Ÿ็”ขไฝๅ…ƒๅนฃ(้ ่จญๅ€ผ: %u)</translation>
+ <translation>็”Ÿ็”ข้Œขๅนฃ(้ ่จญๅ€ผ: %u)</translation>
</message>
<message>
<source>How many blocks to check at startup (default: %u, 0 = all)</source>
diff --git a/src/qt/splashscreen.cpp b/src/qt/splashscreen.cpp
index b46321fa86..e36d86fddd 100644
--- a/src/qt/splashscreen.cpp
+++ b/src/qt/splashscreen.cpp
@@ -141,6 +141,11 @@ SplashScreen::~SplashScreen()
void SplashScreen::slotFinish(QWidget *mainWin)
{
Q_UNUSED(mainWin);
+
+ /* If the window is minimized, hide() will be ignored. */
+ /* Make sure we de-minimize the splashscreen window before hiding */
+ if (isMinimized())
+ showNormal();
hide();
}
diff --git a/src/qt/winshutdownmonitor.cpp b/src/qt/winshutdownmonitor.cpp
index 1bc4f77959..a11da50588 100644
--- a/src/qt/winshutdownmonitor.cpp
+++ b/src/qt/winshutdownmonitor.cpp
@@ -27,7 +27,7 @@ bool WinShutdownMonitor::nativeEventFilter(const QByteArray &eventType, void *pM
// Warn only once as this is performance-critical
static bool warned = false;
if (!warned) {
- LogPrint("%s: OpenSSL RAND_event() failed to seed OpenSSL PRNG with enough data.\n", __func__);
+ LogPrintf("%s: OpenSSL RAND_event() failed to seed OpenSSL PRNG with enough data.\n", __func__);
warned = true;
}
}
diff --git a/src/rpc/net.cpp b/src/rpc/net.cpp
index cae964e46d..b85c7b2e1a 100644
--- a/src/rpc/net.cpp
+++ b/src/rpc/net.cpp
@@ -271,25 +271,22 @@ UniValue getaddednodeinfo(const UniValue& params, bool fHelp)
{
if (fHelp || params.size() < 1 || params.size() > 2)
throw runtime_error(
- "getaddednodeinfo dns ( \"node\" )\n"
+ "getaddednodeinfo dummy ( \"node\" )\n"
"\nReturns information about the given added node, or all added nodes\n"
"(note that onetry addnodes are not listed here)\n"
- "If dns is false, only a list of added nodes will be provided,\n"
- "otherwise connected information will also be available.\n"
"\nArguments:\n"
- "1. dns (boolean, required) If false, only a list of added nodes will be provided, otherwise connected information will also be available.\n"
+ "1. dummy (boolean, required) Kept for historical purposes but ignored\n"
"2. \"node\" (string, optional) If provided, return information about this specific node, otherwise all nodes are returned.\n"
"\nResult:\n"
"[\n"
" {\n"
- " \"addednode\" : \"192.168.0.201\", (string) The node ip address\n"
+ " \"addednode\" : \"192.168.0.201\", (string) The node ip address or name (as provided to addnode)\n"
" \"connected\" : true|false, (boolean) If connected\n"
- " \"addresses\" : [\n"
+ " \"addresses\" : [ (list of objects) Only when connected = true\n"
" {\n"
- " \"address\" : \"192.168.0.201:8333\", (string) The bitcoin server host and port\n"
+ " \"address\" : \"192.168.0.201:8333\", (string) The bitcoin server IP and port we're connected to\n"
" \"connected\" : \"outbound\" (string) connection, inbound or outbound\n"
" }\n"
- " ,...\n"
" ]\n"
" }\n"
" ,...\n"
@@ -300,83 +297,35 @@ UniValue getaddednodeinfo(const UniValue& params, bool fHelp)
+ HelpExampleRpc("getaddednodeinfo", "true, \"192.168.0.201\"")
);
- bool fDns = params[0].get_bool();
+ std::vector<AddedNodeInfo> vInfo = GetAddedNodeInfo();
- list<string> laddedNodes(0);
- if (params.size() == 1)
- {
- LOCK(cs_vAddedNodes);
- BOOST_FOREACH(const std::string& strAddNode, vAddedNodes)
- laddedNodes.push_back(strAddNode);
- }
- else
- {
- string strNode = params[1].get_str();
- LOCK(cs_vAddedNodes);
- BOOST_FOREACH(const std::string& strAddNode, vAddedNodes) {
- if (strAddNode == strNode)
- {
- laddedNodes.push_back(strAddNode);
+ if (params.size() == 2) {
+ bool found = false;
+ for (const AddedNodeInfo& info : vInfo) {
+ if (info.strAddedNode == params[1].get_str()) {
+ vInfo.assign(1, info);
+ found = true;
break;
}
}
- if (laddedNodes.size() == 0)
+ if (!found) {
throw JSONRPCError(RPC_CLIENT_NODE_NOT_ADDED, "Error: Node has not been added.");
- }
-
- UniValue ret(UniValue::VARR);
- if (!fDns)
- {
- BOOST_FOREACH (const std::string& strAddNode, laddedNodes) {
- UniValue obj(UniValue::VOBJ);
- obj.push_back(Pair("addednode", strAddNode));
- ret.push_back(obj);
}
- return ret;
}
- list<pair<string, vector<CService> > > laddedAddreses(0);
- BOOST_FOREACH(const std::string& strAddNode, laddedNodes) {
- vector<CService> vservNode(0);
- if(Lookup(strAddNode.c_str(), vservNode, Params().GetDefaultPort(), fNameLookup, 0))
- laddedAddreses.push_back(make_pair(strAddNode, vservNode));
- else
- {
- UniValue obj(UniValue::VOBJ);
- obj.push_back(Pair("addednode", strAddNode));
- obj.push_back(Pair("connected", false));
- UniValue addresses(UniValue::VARR);
- obj.push_back(Pair("addresses", addresses));
- ret.push_back(obj);
- }
- }
+ UniValue ret(UniValue::VARR);
- LOCK(cs_vNodes);
- for (list<pair<string, vector<CService> > >::iterator it = laddedAddreses.begin(); it != laddedAddreses.end(); it++)
- {
+ for (const AddedNodeInfo& info : vInfo) {
UniValue obj(UniValue::VOBJ);
- obj.push_back(Pair("addednode", it->first));
-
+ obj.push_back(Pair("addednode", info.strAddedNode));
+ obj.push_back(Pair("connected", info.fConnected));
UniValue addresses(UniValue::VARR);
- bool fConnected = false;
- BOOST_FOREACH(const CService& addrNode, it->second) {
- bool fFound = false;
- UniValue node(UniValue::VOBJ);
- node.push_back(Pair("address", addrNode.ToString()));
- BOOST_FOREACH(CNode* pnode, vNodes) {
- if (pnode->addr == addrNode)
- {
- fFound = true;
- fConnected = true;
- node.push_back(Pair("connected", pnode->fInbound ? "inbound" : "outbound"));
- break;
- }
- }
- if (!fFound)
- node.push_back(Pair("connected", "false"));
- addresses.push_back(node);
+ if (info.fConnected) {
+ UniValue address(UniValue::VOBJ);
+ address.push_back(Pair("address", info.resolvedAddress.ToString()));
+ address.push_back(Pair("connected", info.fInbound ? "inbound" : "outbound"));
+ addresses.push_back(address);
}
- obj.push_back(Pair("connected", fConnected));
obj.push_back(Pair("addresses", addresses));
ret.push_back(obj);
}
diff --git a/src/rpc/rawtransaction.cpp b/src/rpc/rawtransaction.cpp
index 992914f88c..9723e394d6 100644
--- a/src/rpc/rawtransaction.cpp
+++ b/src/rpc/rawtransaction.cpp
@@ -388,8 +388,13 @@ UniValue createrawtransaction(const UniValue& params, bool fHelp)
// set the sequence number if passed in the parameters object
const UniValue& sequenceObj = find_value(o, "sequence");
- if (sequenceObj.isNum())
- nSequence = sequenceObj.get_int();
+ if (sequenceObj.isNum()) {
+ int64_t seqNr64 = sequenceObj.get_int64();
+ if (seqNr64 < 0 || seqNr64 > std::numeric_limits<uint32_t>::max())
+ throw JSONRPCError(RPC_INVALID_PARAMETER, "Invalid parameter, sequence number is out of range");
+ else
+ nSequence = (uint32_t)seqNr64;
+ }
CTxIn in(COutPoint(txid, nOutput), CScript(), nSequence);
diff --git a/src/serialize.h b/src/serialize.h
index 5c2db9d332..378ed39074 100644
--- a/src/serialize.h
+++ b/src/serialize.h
@@ -373,6 +373,7 @@ I ReadVarInt(Stream& is)
#define FLATDATA(obj) REF(CFlatData((char*)&(obj), (char*)&(obj) + sizeof(obj)))
#define VARINT(obj) REF(WrapVarInt(REF(obj)))
+#define COMPACTSIZE(obj) REF(CCompactSize(REF(obj)))
#define LIMITED_STRING(obj,n) REF(LimitedString< n >(REF(obj)))
/**
@@ -443,6 +444,28 @@ public:
}
};
+class CCompactSize
+{
+protected:
+ uint64_t &n;
+public:
+ CCompactSize(uint64_t& nIn) : n(nIn) { }
+
+ unsigned int GetSerializeSize(int, int) const {
+ return GetSizeOfCompactSize(n);
+ }
+
+ template<typename Stream>
+ void Serialize(Stream &s, int, int) const {
+ WriteCompactSize<Stream>(s, n);
+ }
+
+ template<typename Stream>
+ void Unserialize(Stream& s, int, int) {
+ n = ReadCompactSize<Stream>(s);
+ }
+};
+
template<size_t Limit>
class LimitedString
{
diff --git a/src/test/DoS_tests.cpp b/src/test/DoS_tests.cpp
index 4a373fc60b..93f7ae09da 100644
--- a/src/test/DoS_tests.cpp
+++ b/src/test/DoS_tests.cpp
@@ -162,7 +162,7 @@ BOOST_AUTO_TEST_CASE(DoS_mapOrphans)
tx.vout.resize(1);
tx.vout[0].nValue = 1*CENT;
tx.vout[0].scriptPubKey = GetScriptForDestination(key.GetPubKey().GetID());
- tx.vin.resize(500);
+ tx.vin.resize(2777);
for (unsigned int j = 0; j < tx.vin.size(); j++)
{
tx.vin[j].prevout.n = j;
diff --git a/src/test/blockencodings_tests.cpp b/src/test/blockencodings_tests.cpp
new file mode 100644
index 0000000000..3884bf3fe3
--- /dev/null
+++ b/src/test/blockencodings_tests.cpp
@@ -0,0 +1,315 @@
+// Copyright (c) 2011-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 "blockencodings.h"
+#include "consensus/merkle.h"
+#include "chainparams.h"
+#include "random.h"
+
+#include "test/test_bitcoin.h"
+
+#include <boost/test/unit_test.hpp>
+
+struct RegtestingSetup : public TestingSetup {
+ RegtestingSetup() : TestingSetup(CBaseChainParams::REGTEST) {}
+};
+
+BOOST_FIXTURE_TEST_SUITE(blockencodings_tests, RegtestingSetup)
+
+static CBlock BuildBlockTestCase() {
+ CBlock block;
+ CMutableTransaction tx;
+ tx.vin.resize(1);
+ tx.vin[0].scriptSig.resize(10);
+ tx.vout.resize(1);
+ tx.vout[0].nValue = 42;
+
+ block.vtx.resize(3);
+ block.vtx[0] = tx;
+ block.nVersion = 42;
+ block.hashPrevBlock = GetRandHash();
+ block.nBits = 0x207fffff;
+
+ tx.vin[0].prevout.hash = GetRandHash();
+ tx.vin[0].prevout.n = 0;
+ block.vtx[1] = tx;
+
+ tx.vin.resize(10);
+ for (size_t i = 0; i < tx.vin.size(); i++) {
+ tx.vin[i].prevout.hash = GetRandHash();
+ tx.vin[i].prevout.n = 0;
+ }
+ block.vtx[2] = tx;
+
+ bool mutated;
+ block.hashMerkleRoot = BlockMerkleRoot(block, &mutated);
+ assert(!mutated);
+ while (!CheckProofOfWork(block.GetHash(), block.nBits, Params().GetConsensus())) ++block.nNonce;
+ return block;
+}
+
+// Number of shared use_counts we expect for a tx we havent touched
+// == 2 (mempool + our copy from the GetSharedTx call)
+#define SHARED_TX_OFFSET 2
+
+BOOST_AUTO_TEST_CASE(SimpleRoundTripTest)
+{
+ CTxMemPool pool(CFeeRate(0));
+ TestMemPoolEntryHelper entry;
+ CBlock block(BuildBlockTestCase());
+
+ pool.addUnchecked(block.vtx[2].GetHash(), entry.FromTx(block.vtx[2]));
+ BOOST_CHECK_EQUAL(pool.mapTx.find(block.vtx[2].GetHash())->GetSharedTx().use_count(), SHARED_TX_OFFSET + 0);
+
+ // Do a simple ShortTxIDs RT
+ {
+ CBlockHeaderAndShortTxIDs shortIDs(block);
+
+ CDataStream stream(SER_NETWORK, PROTOCOL_VERSION);
+ stream << shortIDs;
+
+ CBlockHeaderAndShortTxIDs shortIDs2;
+ stream >> shortIDs2;
+
+ PartiallyDownloadedBlock partialBlock(&pool);
+ BOOST_CHECK(partialBlock.InitData(shortIDs2) == READ_STATUS_OK);
+ BOOST_CHECK( partialBlock.IsTxAvailable(0));
+ BOOST_CHECK(!partialBlock.IsTxAvailable(1));
+ BOOST_CHECK( partialBlock.IsTxAvailable(2));
+
+ BOOST_CHECK_EQUAL(pool.mapTx.find(block.vtx[2].GetHash())->GetSharedTx().use_count(), SHARED_TX_OFFSET + 1);
+
+ std::list<CTransaction> removed;
+ pool.removeRecursive(block.vtx[2], removed);
+ BOOST_CHECK_EQUAL(removed.size(), 1);
+
+ CBlock block2;
+ std::vector<CTransaction> vtx_missing;
+ BOOST_CHECK(partialBlock.FillBlock(block2, vtx_missing) == READ_STATUS_INVALID); // No transactions
+
+ vtx_missing.push_back(block.vtx[2]); // Wrong transaction
+ partialBlock.FillBlock(block2, vtx_missing); // Current implementation doesn't check txn here, but don't require that
+ bool mutated;
+ BOOST_CHECK(block.hashMerkleRoot != BlockMerkleRoot(block2, &mutated));
+
+ vtx_missing[0] = block.vtx[1];
+ CBlock block3;
+ BOOST_CHECK(partialBlock.FillBlock(block3, vtx_missing) == READ_STATUS_OK);
+ BOOST_CHECK_EQUAL(block.GetHash().ToString(), block3.GetHash().ToString());
+ BOOST_CHECK_EQUAL(block.hashMerkleRoot.ToString(), BlockMerkleRoot(block3, &mutated).ToString());
+ BOOST_CHECK(!mutated);
+ }
+}
+
+class TestHeaderAndShortIDs {
+ // Utility to encode custom CBlockHeaderAndShortTxIDs
+public:
+ CBlockHeader header;
+ uint64_t nonce;
+ std::vector<uint64_t> shorttxids;
+ std::vector<PrefilledTransaction> prefilledtxn;
+
+ TestHeaderAndShortIDs(const CBlockHeaderAndShortTxIDs& orig) {
+ CDataStream stream(SER_NETWORK, PROTOCOL_VERSION);
+ stream << orig;
+ stream >> *this;
+ }
+ TestHeaderAndShortIDs(const CBlock& block) :
+ TestHeaderAndShortIDs(CBlockHeaderAndShortTxIDs(block)) {}
+
+ uint64_t GetShortID(const uint256& txhash) const {
+ CDataStream stream(SER_NETWORK, PROTOCOL_VERSION);
+ stream << *this;
+ CBlockHeaderAndShortTxIDs base;
+ stream >> base;
+ return base.GetShortID(txhash);
+ }
+
+ ADD_SERIALIZE_METHODS;
+
+ template <typename Stream, typename Operation>
+ inline void SerializationOp(Stream& s, Operation ser_action, int nType, int nVersion) {
+ READWRITE(header);
+ READWRITE(nonce);
+ size_t shorttxids_size = shorttxids.size();
+ READWRITE(VARINT(shorttxids_size));
+ shorttxids.resize(shorttxids_size);
+ for (size_t i = 0; i < shorttxids.size(); i++) {
+ uint32_t lsb = shorttxids[i] & 0xffffffff;
+ uint16_t msb = (shorttxids[i] >> 32) & 0xffff;
+ READWRITE(lsb);
+ READWRITE(msb);
+ shorttxids[i] = (uint64_t(msb) << 32) | uint64_t(lsb);
+ }
+ READWRITE(prefilledtxn);
+ }
+};
+
+BOOST_AUTO_TEST_CASE(NonCoinbasePreforwardRTTest)
+{
+ CTxMemPool pool(CFeeRate(0));
+ TestMemPoolEntryHelper entry;
+ CBlock block(BuildBlockTestCase());
+
+ pool.addUnchecked(block.vtx[2].GetHash(), entry.FromTx(block.vtx[2]));
+ BOOST_CHECK_EQUAL(pool.mapTx.find(block.vtx[2].GetHash())->GetSharedTx().use_count(), SHARED_TX_OFFSET + 0);
+
+ // Test with pre-forwarding tx 1, but not coinbase
+ {
+ TestHeaderAndShortIDs shortIDs(block);
+ shortIDs.prefilledtxn.resize(1);
+ shortIDs.prefilledtxn[0] = {1, block.vtx[1]};
+ shortIDs.shorttxids.resize(2);
+ shortIDs.shorttxids[0] = shortIDs.GetShortID(block.vtx[0].GetHash());
+ shortIDs.shorttxids[1] = shortIDs.GetShortID(block.vtx[2].GetHash());
+
+ CDataStream stream(SER_NETWORK, PROTOCOL_VERSION);
+ stream << shortIDs;
+
+ CBlockHeaderAndShortTxIDs shortIDs2;
+ stream >> shortIDs2;
+
+ PartiallyDownloadedBlock partialBlock(&pool);
+ BOOST_CHECK(partialBlock.InitData(shortIDs2) == READ_STATUS_OK);
+ BOOST_CHECK(!partialBlock.IsTxAvailable(0));
+ BOOST_CHECK( partialBlock.IsTxAvailable(1));
+ BOOST_CHECK( partialBlock.IsTxAvailable(2));
+
+ BOOST_CHECK_EQUAL(pool.mapTx.find(block.vtx[2].GetHash())->GetSharedTx().use_count(), SHARED_TX_OFFSET + 1);
+
+ CBlock block2;
+ std::vector<CTransaction> vtx_missing;
+ BOOST_CHECK(partialBlock.FillBlock(block2, vtx_missing) == READ_STATUS_INVALID); // No transactions
+
+ vtx_missing.push_back(block.vtx[1]); // Wrong transaction
+ partialBlock.FillBlock(block2, vtx_missing); // Current implementation doesn't check txn here, but don't require that
+ bool mutated;
+ BOOST_CHECK(block.hashMerkleRoot != BlockMerkleRoot(block2, &mutated));
+
+ vtx_missing[0] = block.vtx[0];
+ CBlock block3;
+ BOOST_CHECK(partialBlock.FillBlock(block3, vtx_missing) == READ_STATUS_OK);
+ BOOST_CHECK_EQUAL(block.GetHash().ToString(), block3.GetHash().ToString());
+ BOOST_CHECK_EQUAL(block.hashMerkleRoot.ToString(), BlockMerkleRoot(block3, &mutated).ToString());
+ BOOST_CHECK(!mutated);
+
+ BOOST_CHECK_EQUAL(pool.mapTx.find(block.vtx[2].GetHash())->GetSharedTx().use_count(), SHARED_TX_OFFSET + 1);
+ }
+ BOOST_CHECK_EQUAL(pool.mapTx.find(block.vtx[2].GetHash())->GetSharedTx().use_count(), SHARED_TX_OFFSET + 0);
+}
+
+BOOST_AUTO_TEST_CASE(SufficientPreforwardRTTest)
+{
+ CTxMemPool pool(CFeeRate(0));
+ TestMemPoolEntryHelper entry;
+ CBlock block(BuildBlockTestCase());
+
+ pool.addUnchecked(block.vtx[1].GetHash(), entry.FromTx(block.vtx[1]));
+ BOOST_CHECK_EQUAL(pool.mapTx.find(block.vtx[1].GetHash())->GetSharedTx().use_count(), SHARED_TX_OFFSET + 0);
+
+ // Test with pre-forwarding coinbase + tx 2 with tx 1 in mempool
+ {
+ TestHeaderAndShortIDs shortIDs(block);
+ shortIDs.prefilledtxn.resize(2);
+ shortIDs.prefilledtxn[0] = {0, block.vtx[0]};
+ shortIDs.prefilledtxn[1] = {1, block.vtx[2]}; // id == 1 as it is 1 after index 1
+ shortIDs.shorttxids.resize(1);
+ shortIDs.shorttxids[0] = shortIDs.GetShortID(block.vtx[1].GetHash());
+
+ CDataStream stream(SER_NETWORK, PROTOCOL_VERSION);
+ stream << shortIDs;
+
+ CBlockHeaderAndShortTxIDs shortIDs2;
+ stream >> shortIDs2;
+
+ PartiallyDownloadedBlock partialBlock(&pool);
+ BOOST_CHECK(partialBlock.InitData(shortIDs2) == READ_STATUS_OK);
+ BOOST_CHECK( partialBlock.IsTxAvailable(0));
+ BOOST_CHECK( partialBlock.IsTxAvailable(1));
+ BOOST_CHECK( partialBlock.IsTxAvailable(2));
+
+ BOOST_CHECK_EQUAL(pool.mapTx.find(block.vtx[1].GetHash())->GetSharedTx().use_count(), SHARED_TX_OFFSET + 1);
+
+ CBlock block2;
+ std::vector<CTransaction> vtx_missing;
+ BOOST_CHECK(partialBlock.FillBlock(block2, vtx_missing) == READ_STATUS_OK);
+ BOOST_CHECK_EQUAL(block.GetHash().ToString(), block2.GetHash().ToString());
+ bool mutated;
+ BOOST_CHECK_EQUAL(block.hashMerkleRoot.ToString(), BlockMerkleRoot(block2, &mutated).ToString());
+ BOOST_CHECK(!mutated);
+
+ BOOST_CHECK_EQUAL(pool.mapTx.find(block.vtx[1].GetHash())->GetSharedTx().use_count(), SHARED_TX_OFFSET + 1);
+ }
+ BOOST_CHECK_EQUAL(pool.mapTx.find(block.vtx[1].GetHash())->GetSharedTx().use_count(), SHARED_TX_OFFSET + 0);
+}
+
+BOOST_AUTO_TEST_CASE(EmptyBlockRoundTripTest)
+{
+ CTxMemPool pool(CFeeRate(0));
+ CMutableTransaction coinbase;
+ coinbase.vin.resize(1);
+ coinbase.vin[0].scriptSig.resize(10);
+ coinbase.vout.resize(1);
+ coinbase.vout[0].nValue = 42;
+
+ CBlock block;
+ block.vtx.resize(1);
+ block.vtx[0] = coinbase;
+ block.nVersion = 42;
+ block.hashPrevBlock = GetRandHash();
+ block.nBits = 0x207fffff;
+
+ bool mutated;
+ block.hashMerkleRoot = BlockMerkleRoot(block, &mutated);
+ assert(!mutated);
+ while (!CheckProofOfWork(block.GetHash(), block.nBits, Params().GetConsensus())) ++block.nNonce;
+
+ // Test simple header round-trip with only coinbase
+ {
+ CBlockHeaderAndShortTxIDs shortIDs(block);
+
+ CDataStream stream(SER_NETWORK, PROTOCOL_VERSION);
+ stream << shortIDs;
+
+ CBlockHeaderAndShortTxIDs shortIDs2;
+ stream >> shortIDs2;
+
+ PartiallyDownloadedBlock partialBlock(&pool);
+ BOOST_CHECK(partialBlock.InitData(shortIDs2) == READ_STATUS_OK);
+ BOOST_CHECK(partialBlock.IsTxAvailable(0));
+
+ CBlock block2;
+ std::vector<CTransaction> vtx_missing;
+ BOOST_CHECK(partialBlock.FillBlock(block2, vtx_missing) == READ_STATUS_OK);
+ BOOST_CHECK_EQUAL(block.GetHash().ToString(), block2.GetHash().ToString());
+ bool mutated;
+ BOOST_CHECK_EQUAL(block.hashMerkleRoot.ToString(), BlockMerkleRoot(block2, &mutated).ToString());
+ BOOST_CHECK(!mutated);
+ }
+}
+
+BOOST_AUTO_TEST_CASE(TransactionsRequestSerializationTest) {
+ BlockTransactionsRequest req1;
+ req1.blockhash = GetRandHash();
+ req1.indexes.resize(4);
+ req1.indexes[0] = 0;
+ req1.indexes[1] = 1;
+ req1.indexes[2] = 3;
+ req1.indexes[3] = 4;
+
+ CDataStream stream(SER_NETWORK, PROTOCOL_VERSION);
+ stream << req1;
+
+ BlockTransactionsRequest req2;
+ stream >> req2;
+
+ BOOST_CHECK_EQUAL(req1.blockhash.ToString(), req2.blockhash.ToString());
+ BOOST_CHECK_EQUAL(req1.indexes.size(), req2.indexes.size());
+ BOOST_CHECK_EQUAL(req1.indexes[0], req2.indexes[0]);
+ BOOST_CHECK_EQUAL(req1.indexes[1], req2.indexes[1]);
+ BOOST_CHECK_EQUAL(req1.indexes[2], req2.indexes[2]);
+ BOOST_CHECK_EQUAL(req1.indexes[3], req2.indexes[3]);
+}
+
+BOOST_AUTO_TEST_SUITE_END()
diff --git a/src/test/miner_tests.cpp b/src/test/miner_tests.cpp
index 3fb7967881..ca8d6d2e05 100644
--- a/src/test/miner_tests.cpp
+++ b/src/test/miner_tests.cpp
@@ -71,6 +71,113 @@ bool TestSequenceLocks(const CTransaction &tx, int flags)
return CheckSequenceLocks(tx, 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<CTransaction *>& txFirst)
+{
+ // Test the ancestor feerate transaction selection.
+ TestMemPoolEntryHelper entry;
+
+ // Test that a medium fee transaction will be selected after a higher fee
+ // rate package with a low fee rate parent.
+ CMutableTransaction tx;
+ tx.vin.resize(1);
+ tx.vin[0].scriptSig = CScript() << OP_1;
+ tx.vin[0].prevout.hash = txFirst[0]->GetHash();
+ tx.vin[0].prevout.n = 0;
+ tx.vout.resize(1);
+ tx.vout[0].nValue = 5000000000LL - 1000;
+ // This tx has a low fee: 1000 satoshis
+ uint256 hashParentTx = tx.GetHash(); // save this txid for later use
+ mempool.addUnchecked(hashParentTx, entry.Fee(1000).Time(GetTime()).SpendsCoinbase(true).FromTx(tx));
+
+ // This tx has a medium fee: 10000 satoshis
+ tx.vin[0].prevout.hash = txFirst[1]->GetHash();
+ tx.vout[0].nValue = 5000000000LL - 10000;
+ uint256 hashMediumFeeTx = tx.GetHash();
+ mempool.addUnchecked(hashMediumFeeTx, entry.Fee(10000).Time(GetTime()).SpendsCoinbase(true).FromTx(tx));
+
+ // This tx has a high fee, but depends on the first transaction
+ tx.vin[0].prevout.hash = hashParentTx;
+ tx.vout[0].nValue = 5000000000LL - 1000 - 50000; // 50k satoshi fee
+ uint256 hashHighFeeTx = tx.GetHash();
+ mempool.addUnchecked(hashHighFeeTx, entry.Fee(50000).Time(GetTime()).SpendsCoinbase(false).FromTx(tx));
+
+ CBlockTemplate *pblocktemplate = BlockAssembler(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
+ tx.vin[0].prevout.hash = hashHighFeeTx;
+ tx.vout[0].nValue = 5000000000LL - 1000 - 50000; // 0 fee
+ uint256 hashFreeTx = tx.GetHash();
+ mempool.addUnchecked(hashFreeTx, entry.Fee(0).FromTx(tx));
+ 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;
+
+ 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);
+ // 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);
+ BOOST_CHECK(pblocktemplate->block.vtx[i].GetHash() != hashLowFeeTx);
+ }
+
+ // Test that packages above the min relay fee do get included, even if one
+ // of the transactions is below the min relay fee
+ // Remove the low fee transaction and replace with a higher fee transaction
+ std::list<CTransaction> dummy;
+ mempool.removeRecursive(tx, dummy);
+ 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);
+ BOOST_CHECK(pblocktemplate->block.vtx[4].GetHash() == hashFreeTx);
+ BOOST_CHECK(pblocktemplate->block.vtx[5].GetHash() == hashLowFeeTx);
+
+ // Test that transaction selection properly updates ancestor fee
+ // calculations as ancestor transactions get included in a block.
+ // Add a 0-fee transaction that has 2 outputs.
+ tx.vin[0].prevout.hash = txFirst[2]->GetHash();
+ tx.vout.resize(2);
+ tx.vout[0].nValue = 5000000000LL - 100000000;
+ tx.vout[1].nValue = 100000000; // 1BTC output
+ uint256 hashFreeTx2 = tx.GetHash();
+ mempool.addUnchecked(hashFreeTx2, entry.Fee(0).SpendsCoinbase(true).FromTx(tx));
+
+ // This tx can't be mined by itself
+ tx.vin[0].prevout.hash = hashFreeTx2;
+ tx.vout.resize(1);
+ feeToUse = minRelayTxFee.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);
+
+ // Verify that this tx isn't selected.
+ for (size_t i=0; i<pblocktemplate->block.vtx.size(); ++i) {
+ BOOST_CHECK(pblocktemplate->block.vtx[i].GetHash() != hashFreeTx2);
+ BOOST_CHECK(pblocktemplate->block.vtx[i].GetHash() != hashLowFeeTx2);
+ }
+
+ // This tx will be mineable, and should cause hashLowFeeTx2 to be selected
+ // as well.
+ tx.vin[0].prevout.n = 1;
+ tx.vout[0].nValue = 100000000 - 10000; // 10k satoshi fee
+ mempool.addUnchecked(tx.GetHash(), entry.Fee(10000).FromTx(tx));
+ pblocktemplate = BlockAssembler(chainparams).CreateNewBlock(scriptPubKey);
+ BOOST_CHECK(pblocktemplate->block.vtx[8].GetHash() == hashLowFeeTx2);
+}
+
// NOTE: These tests rely on CreateNewBlock doing its own self-validation!
BOOST_AUTO_TEST_CASE(CreateNewBlock_validity)
{
@@ -385,6 +492,8 @@ BOOST_AUTO_TEST_CASE(CreateNewBlock_validity)
SetMockTime(0);
mempool.clear();
+ TestPackageSelection(chainparams, scriptPubKey, txFirst);
+
BOOST_FOREACH(CTransaction *_tx, txFirst)
delete _tx;
diff --git a/src/test/test_bitcoin.cpp b/src/test/test_bitcoin.cpp
index c68320ba8b..1f3b198800 100644
--- a/src/test/test_bitcoin.cpp
+++ b/src/test/test_bitcoin.cpp
@@ -55,6 +55,7 @@ TestingSetup::TestingSetup(const std::string& chainName) : BasicTestingSetup(cha
pathTemp = GetTempPath() / strprintf("test_bitcoin_%lu_%i", (unsigned long)GetTime(), (int)(GetRand(100000)));
boost::filesystem::create_directories(pathTemp);
mapArgs["-datadir"] = pathTemp.string();
+ mempool.setSanityCheck(1.0);
pblocktree = new CBlockTreeDB(1 << 20, true);
pcoinsdbview = new CCoinsViewDB(1 << 23, true);
pcoinsTip = new CCoinsViewCache(pcoinsdbview);
@@ -126,7 +127,11 @@ TestChain100Setup::~TestChain100Setup()
CTxMemPoolEntry TestMemPoolEntryHelper::FromTx(CMutableTransaction &tx, CTxMemPool *pool) {
CTransaction txn(tx);
- bool hasNoDependencies = pool ? pool->HasNoInputsOf(tx) : hadNoDependencies;
+ return FromTx(txn, pool);
+}
+
+CTxMemPoolEntry TestMemPoolEntryHelper::FromTx(CTransaction &txn, CTxMemPool *pool) {
+ bool hasNoDependencies = pool ? pool->HasNoInputsOf(txn) : hadNoDependencies;
// Hack to assume either its completely dependent on other mempool txs or not at all
CAmount inChainValue = hasNoDependencies ? txn.GetValueOut() : 0;
diff --git a/src/test/test_bitcoin.h b/src/test/test_bitcoin.h
index 57f66f6c6d..78b87e7109 100644
--- a/src/test/test_bitcoin.h
+++ b/src/test/test_bitcoin.h
@@ -78,6 +78,7 @@ struct TestMemPoolEntryHelper
hadNoDependencies(false), spendsCoinbase(false), sigOpCount(1) { }
CTxMemPoolEntry FromTx(CMutableTransaction &tx, CTxMemPool *pool = NULL);
+ CTxMemPoolEntry FromTx(CTransaction &tx, CTxMemPool *pool = NULL);
// Change the default value
TestMemPoolEntryHelper &Fee(CAmount _fee) { nFee = _fee; return *this; }
diff --git a/src/txmempool.cpp b/src/txmempool.cpp
index 205ffd6379..ead28546de 100644
--- a/src/txmempool.cpp
+++ b/src/txmempool.cpp
@@ -438,6 +438,9 @@ bool CTxMemPool::addUnchecked(const uint256& hash, const CTxMemPoolEntry &entry,
totalTxSize += entry.GetTxSize();
minerPolicyEstimator->processTransaction(entry, fCurrentEstimate);
+ vTxHashes.emplace_back(hash, newit);
+ newit->vTxHashesIdx = vTxHashes.size() - 1;
+
return true;
}
@@ -447,6 +450,15 @@ void CTxMemPool::removeUnchecked(txiter it)
BOOST_FOREACH(const CTxIn& txin, it->GetTx().vin)
mapNextTx.erase(txin.prevout);
+ if (vTxHashes.size() > 1) {
+ vTxHashes[it->vTxHashesIdx] = std::move(vTxHashes.back());
+ vTxHashes[it->vTxHashesIdx].second->vTxHashesIdx = it->vTxHashesIdx;
+ vTxHashes.pop_back();
+ if (vTxHashes.size() * 2 < vTxHashes.capacity())
+ vTxHashes.shrink_to_fit();
+ } else
+ vTxHashes.clear();
+
totalTxSize -= it->GetTxSize();
cachedInnerUsage -= it->DynamicMemoryUsage();
cachedInnerUsage -= memusage::DynamicUsage(mapLinks[it].parents) + memusage::DynamicUsage(mapLinks[it].children);
@@ -965,7 +977,7 @@ bool CCoinsViewMemPool::HaveCoins(const uint256 &txid) const {
size_t CTxMemPool::DynamicMemoryUsage() const {
LOCK(cs);
// Estimate the overhead of mapTx to be 15 pointers + an allocation, as no exact formula for boost::multi_index_contained is implemented.
- return memusage::MallocUsage(sizeof(CTxMemPoolEntry) + 15 * sizeof(void*)) * mapTx.size() + memusage::DynamicUsage(mapNextTx) + memusage::DynamicUsage(mapDeltas) + memusage::DynamicUsage(mapLinks) + cachedInnerUsage;
+ 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) {
@@ -1075,7 +1087,7 @@ void CTxMemPool::TrimToSize(size_t sizelimit, std::vector<uint256>* pvNoSpendsRe
unsigned nTxnRemoved = 0;
CFeeRate maxFeeRateRemoved(0);
- while (DynamicMemoryUsage() > sizelimit) {
+ while (!mapTx.empty() && DynamicMemoryUsage() > sizelimit) {
indexed_transaction_set::index<descendant_score>::type::iterator it = mapTx.get<descendant_score>().begin();
// We set the new mempool min fee to the feerate of the removed set, plus the
diff --git a/src/txmempool.h b/src/txmempool.h
index f0e9b2e2c6..d6d0d72ff5 100644
--- a/src/txmempool.h
+++ b/src/txmempool.h
@@ -150,6 +150,8 @@ public:
uint64_t GetSizeWithAncestors() const { return nSizeWithAncestors; }
CAmount GetModFeesWithAncestors() const { return nModFeesWithAncestors; }
unsigned int GetSigOpCountWithAncestors() const { return nSigOpCountWithAncestors; }
+
+ mutable size_t vTxHashesIdx; //!< Index in mempool's vTxHashes
};
// Helpers for modifying CTxMemPool::mapTx, which is a boost multi_index.
@@ -457,7 +459,10 @@ public:
mutable CCriticalSection cs;
indexed_transaction_set mapTx;
+
typedef indexed_transaction_set::nth_index<0>::type::iterator txiter;
+ std::vector<std::pair<uint256, txiter> > vTxHashes; //!< All tx hashes/entries in mapTx, in random order
+
struct CompareIteratorByHash {
bool operator()(const txiter &a, const txiter &b) const {
return a->GetTx().GetHash() < b->GetTx().GetHash();
diff --git a/src/univalue/Makefile.am b/src/univalue/Makefile.am
index 34fe9e3f13..6c1ec81e63 100644
--- a/src/univalue/Makefile.am
+++ b/src/univalue/Makefile.am
@@ -3,7 +3,7 @@ ACLOCAL_AMFLAGS = -I build-aux/m4
.INTERMEDIATE: $(GENBIN)
include_HEADERS = include/univalue.h
-noinst_HEADERS = lib/univalue_escapes.h
+noinst_HEADERS = lib/univalue_escapes.h lib/univalue_utffilter.h
lib_LTLIBRARIES = libunivalue.la
@@ -73,6 +73,10 @@ TEST_FILES = \
$(TEST_DATA_DIR)/fail35.json \
$(TEST_DATA_DIR)/fail36.json \
$(TEST_DATA_DIR)/fail37.json \
+ $(TEST_DATA_DIR)/fail38.json \
+ $(TEST_DATA_DIR)/fail39.json \
+ $(TEST_DATA_DIR)/fail40.json \
+ $(TEST_DATA_DIR)/fail41.json \
$(TEST_DATA_DIR)/fail3.json \
$(TEST_DATA_DIR)/fail4.json \
$(TEST_DATA_DIR)/fail5.json \
@@ -83,6 +87,7 @@ TEST_FILES = \
$(TEST_DATA_DIR)/pass1.json \
$(TEST_DATA_DIR)/pass2.json \
$(TEST_DATA_DIR)/pass3.json \
- $(TEST_DATA_DIR)/round1.json
+ $(TEST_DATA_DIR)/round1.json \
+ $(TEST_DATA_DIR)/round2.json
EXTRA_DIST=$(TEST_FILES) $(GEN_SRCS)
diff --git a/src/univalue/configure.ac b/src/univalue/configure.ac
index 0515b632bd..93d3ba945d 100644
--- a/src/univalue/configure.ac
+++ b/src/univalue/configure.ac
@@ -1,7 +1,7 @@
m4_define([libunivalue_major_version], [1])
m4_define([libunivalue_minor_version], [1])
-m4_define([libunivalue_micro_version], [1])
-m4_define([libunivalue_interface_age], [1])
+m4_define([libunivalue_micro_version], [2])
+m4_define([libunivalue_interface_age], [2])
# If you need a modifier for the version number.
# Normally empty, but can be used to make "fixup" releases.
m4_define([libunivalue_extraversion], [])
@@ -14,7 +14,7 @@ m4_define([libunivalue_age], [m4_eval(libunivalue_binary_age - libunivalue_inter
m4_define([libunivalue_version], [libunivalue_major_version().libunivalue_minor_version().libunivalue_micro_version()libunivalue_extraversion()])
-AC_INIT([univalue], [1.0.1],
+AC_INIT([univalue], [1.0.2],
[http://github.com/jgarzik/univalue/])
dnl make the compilation flags quiet unless V=1 is used
diff --git a/src/univalue/lib/univalue_read.cpp b/src/univalue/lib/univalue_read.cpp
index c7516b9628..95bac6958d 100644
--- a/src/univalue/lib/univalue_read.cpp
+++ b/src/univalue/lib/univalue_read.cpp
@@ -6,6 +6,7 @@
#include <vector>
#include <stdio.h>
#include "univalue.h"
+#include "univalue_utffilter.h"
using namespace std;
@@ -174,41 +175,31 @@ enum jtokentype getJsonToken(string& tokenVal, unsigned int& consumed,
raw++; // skip "
string valStr;
+ JSONUTF8StringFilter writer(valStr);
while (*raw) {
- if (*raw < 0x20)
+ if ((unsigned char)*raw < 0x20)
return JTOK_ERR;
else if (*raw == '\\') {
raw++; // skip backslash
switch (*raw) {
- case '"': valStr += "\""; break;
- case '\\': valStr += "\\"; break;
- case '/': valStr += "/"; break;
- case 'b': valStr += "\b"; break;
- case 'f': valStr += "\f"; break;
- case 'n': valStr += "\n"; break;
- case 'r': valStr += "\r"; break;
- case 't': valStr += "\t"; break;
+ case '"': writer.push_back('\"'); break;
+ case '\\': writer.push_back('\\'); break;
+ case '/': writer.push_back('/'); break;
+ case 'b': writer.push_back('\b'); break;
+ case 'f': writer.push_back('\f'); break;
+ case 'n': writer.push_back('\n'); break;
+ case 'r': writer.push_back('\r'); break;
+ case 't': writer.push_back('\t'); break;
case 'u': {
unsigned int codepoint;
if (hatoui(raw + 1, raw + 1 + 4, codepoint) !=
raw + 1 + 4)
return JTOK_ERR;
-
- if (codepoint <= 0x7f)
- valStr.push_back((char)codepoint);
- else if (codepoint <= 0x7FF) {
- valStr.push_back((char)(0xC0 | (codepoint >> 6)));
- valStr.push_back((char)(0x80 | (codepoint & 0x3F)));
- } else if (codepoint <= 0xFFFF) {
- valStr.push_back((char)(0xE0 | (codepoint >> 12)));
- valStr.push_back((char)(0x80 | ((codepoint >> 6) & 0x3F)));
- valStr.push_back((char)(0x80 | (codepoint & 0x3F)));
- }
-
+ writer.push_back_u(codepoint);
raw += 4;
break;
}
@@ -226,11 +217,13 @@ enum jtokentype getJsonToken(string& tokenVal, unsigned int& consumed,
}
else {
- valStr += *raw;
+ writer.push_back(*raw);
raw++;
}
}
+ if (!writer.finalize())
+ return JTOK_ERR;
tokenVal = valStr;
consumed = (raw - rawStart);
return JTOK_STRING;
diff --git a/src/univalue/lib/univalue_utffilter.h b/src/univalue/lib/univalue_utffilter.h
new file mode 100644
index 0000000000..0e330dce9c
--- /dev/null
+++ b/src/univalue/lib/univalue_utffilter.h
@@ -0,0 +1,119 @@
+// Copyright 2016 Wladimir J. van der Laan
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+#ifndef UNIVALUE_UTFFILTER_H
+#define UNIVALUE_UTFFILTER_H
+
+#include <string>
+
+/**
+ * Filter that generates and validates UTF-8, as well as collates UTF-16
+ * surrogate pairs as specified in RFC4627.
+ */
+class JSONUTF8StringFilter
+{
+public:
+ JSONUTF8StringFilter(std::string &s):
+ str(s), is_valid(true), codepoint(0), state(0), surpair(0)
+ {
+ }
+ // Write single 8-bit char (may be part of UTF-8 sequence)
+ void push_back(unsigned char ch)
+ {
+ if (state == 0) {
+ if (ch < 0x80) // 7-bit ASCII, fast direct pass-through
+ str.push_back(ch);
+ else if (ch < 0xc0) // Mid-sequence character, invalid in this state
+ is_valid = false;
+ else if (ch < 0xe0) { // Start of 2-byte sequence
+ codepoint = (ch & 0x1f) << 6;
+ state = 6;
+ } else if (ch < 0xf0) { // Start of 3-byte sequence
+ codepoint = (ch & 0x0f) << 12;
+ state = 12;
+ } else if (ch < 0xf8) { // Start of 4-byte sequence
+ codepoint = (ch & 0x07) << 18;
+ state = 18;
+ } else // Reserved, invalid
+ is_valid = false;
+ } else {
+ if ((ch & 0xc0) != 0x80) // Not a continuation, invalid
+ is_valid = false;
+ state -= 6;
+ codepoint |= (ch & 0x3f) << state;
+ if (state == 0)
+ push_back_u(codepoint);
+ }
+ }
+ // Write codepoint directly, possibly collating surrogate pairs
+ void push_back_u(unsigned int codepoint)
+ {
+ if (state) // Only accept full codepoints in open state
+ is_valid = false;
+ if (codepoint >= 0xD800 && codepoint < 0xDC00) { // First half of surrogate pair
+ if (surpair) // Two subsequent surrogate pair openers - fail
+ is_valid = false;
+ else
+ surpair = codepoint;
+ } else if (codepoint >= 0xDC00 && codepoint < 0xE000) { // Second half of surrogate pair
+ if (surpair) { // Open surrogate pair, expect second half
+ // Compute code point from UTF-16 surrogate pair
+ append_codepoint(0x10000 | ((surpair - 0xD800)<<10) | (codepoint - 0xDC00));
+ surpair = 0;
+ } else // Second half doesn't follow a first half - fail
+ is_valid = false;
+ } else {
+ if (surpair) // First half of surrogate pair not followed by second - fail
+ is_valid = false;
+ else
+ append_codepoint(codepoint);
+ }
+ }
+ // Check that we're in a state where the string can be ended
+ // No open sequences, no open surrogate pairs, etc
+ bool finalize()
+ {
+ if (state || surpair)
+ is_valid = false;
+ return is_valid;
+ }
+private:
+ std::string &str;
+ bool is_valid;
+ // Current UTF-8 decoding state
+ unsigned int codepoint;
+ int state; // Top bit to be filled in for next UTF-8 byte, or 0
+
+ // Keep track of the following state to handle the following section of
+ // RFC4627:
+ //
+ // To escape an extended character that is not in the Basic Multilingual
+ // Plane, the character is represented as a twelve-character sequence,
+ // encoding the UTF-16 surrogate pair. So, for example, a string
+ // containing only the G clef character (U+1D11E) may be represented as
+ // "\uD834\uDD1E".
+ //
+ // Two subsequent \u.... may have to be replaced with one actual codepoint.
+ unsigned int surpair; // First half of open UTF-16 surrogate pair, or 0
+
+ void append_codepoint(unsigned int codepoint)
+ {
+ if (codepoint <= 0x7f)
+ str.push_back((char)codepoint);
+ else if (codepoint <= 0x7FF) {
+ str.push_back((char)(0xC0 | (codepoint >> 6)));
+ str.push_back((char)(0x80 | (codepoint & 0x3F)));
+ } else if (codepoint <= 0xFFFF) {
+ str.push_back((char)(0xE0 | (codepoint >> 12)));
+ str.push_back((char)(0x80 | ((codepoint >> 6) & 0x3F)));
+ str.push_back((char)(0x80 | (codepoint & 0x3F)));
+ } else if (codepoint <= 0x1FFFFF) {
+ str.push_back((char)(0xF0 | (codepoint >> 18)));
+ str.push_back((char)(0x80 | ((codepoint >> 12) & 0x3F)));
+ str.push_back((char)(0x80 | ((codepoint >> 6) & 0x3F)));
+ str.push_back((char)(0x80 | (codepoint & 0x3F)));
+ }
+ }
+};
+
+#endif
diff --git a/src/univalue/lib/univalue_write.cpp b/src/univalue/lib/univalue_write.cpp
index ceb4cc9166..cfbdad3284 100644
--- a/src/univalue/lib/univalue_write.cpp
+++ b/src/univalue/lib/univalue_write.cpp
@@ -8,8 +8,6 @@
#include "univalue.h"
#include "univalue_escapes.h"
-// TODO: Using UTF8
-
using namespace std;
static string json_escape(const string& inS)
@@ -23,15 +21,8 @@ static string json_escape(const string& inS)
if (escStr)
outS += escStr;
-
- else if (ch < 0x80)
+ else
outS += ch;
-
- else { // TODO handle UTF-8 properly
- char tmpesc[16];
- sprintf(tmpesc, "\\u%04x", ch);
- outS += tmpesc;
- }
}
return outS;
diff --git a/src/univalue/test/fail38.json b/src/univalue/test/fail38.json
new file mode 100644
index 0000000000..b245e2e46c
--- /dev/null
+++ b/src/univalue/test/fail38.json
@@ -0,0 +1 @@
+["\ud834"]
diff --git a/src/univalue/test/fail39.json b/src/univalue/test/fail39.json
new file mode 100644
index 0000000000..7c9e263f27
--- /dev/null
+++ b/src/univalue/test/fail39.json
@@ -0,0 +1 @@
+["\udd61"]
diff --git a/src/univalue/test/fail40.json b/src/univalue/test/fail40.json
new file mode 100644
index 0000000000..664dc9e245
--- /dev/null
+++ b/src/univalue/test/fail40.json
@@ -0,0 +1 @@
+["…ก"] \ No newline at end of file
diff --git a/src/univalue/test/fail41.json b/src/univalue/test/fail41.json
new file mode 100644
index 0000000000..0de342a2b5
--- /dev/null
+++ b/src/univalue/test/fail41.json
@@ -0,0 +1 @@
+["๐…"] \ No newline at end of file
diff --git a/src/univalue/test/round2.json b/src/univalue/test/round2.json
new file mode 100644
index 0000000000..b766cccc68
--- /dev/null
+++ b/src/univalue/test/round2.json
@@ -0,0 +1 @@
+["aยงโ– ๐Ž’๐…ก"]
diff --git a/src/univalue/test/unitester.cpp b/src/univalue/test/unitester.cpp
index 5a052fe92c..05f3842cd1 100644
--- a/src/univalue/test/unitester.cpp
+++ b/src/univalue/test/unitester.cpp
@@ -22,6 +22,7 @@ string srcdir(JSON_TEST_SRC);
static bool test_failed = false;
#define d_assert(expr) { if (!(expr)) { test_failed = true; fprintf(stderr, "%s failed\n", filename.c_str()); } }
+#define f_assert(expr) { if (!(expr)) { test_failed = true; fprintf(stderr, "%s failed\n", __func__); } }
static std::string rtrim(std::string s)
{
@@ -108,6 +109,10 @@ static const char *filenames[] = {
"fail35.json",
"fail36.json",
"fail37.json",
+ "fail38.json", // invalid unicode: only first half of surrogate pair
+ "fail39.json", // invalid unicode: only second half of surrogate pair
+ "fail40.json", // invalid unicode: broken UTF-8
+ "fail41.json", // invalid unicode: unfinished UTF-8
"fail3.json",
"fail4.json", // extra comma
"fail5.json",
@@ -119,14 +124,40 @@ static const char *filenames[] = {
"pass2.json",
"pass3.json",
"round1.json", // round-trip test
+ "round2.json", // unicode
};
+// Test \u handling
+void unescape_unicode_test()
+{
+ UniValue val;
+ bool testResult;
+ // Escaped ASCII (quote)
+ testResult = val.read("[\"\\u0022\"]");
+ f_assert(testResult);
+ f_assert(val[0].get_str() == "\"");
+ // Escaped Basic Plane character, two-byte UTF-8
+ testResult = val.read("[\"\\u0191\"]");
+ f_assert(testResult);
+ f_assert(val[0].get_str() == "\xc6\x91");
+ // Escaped Basic Plane character, three-byte UTF-8
+ testResult = val.read("[\"\\u2191\"]");
+ f_assert(testResult);
+ f_assert(val[0].get_str() == "\xe2\x86\x91");
+ // Escaped Supplementary Plane character U+1d161
+ testResult = val.read("[\"\\ud834\\udd61\"]");
+ f_assert(testResult);
+ f_assert(val[0].get_str() == "\xf0\x9d\x85\xa1");
+}
+
int main (int argc, char *argv[])
{
for (unsigned int fidx = 0; fidx < ARRAY_SIZE(filenames); fidx++) {
runtest_file(filenames[fidx]);
}
+ unescape_unicode_test();
+
return test_failed ? 1 : 0;
}
diff --git a/src/version.h b/src/version.h
index 0e1d8a63ce..68ccd6d378 100644
--- a/src/version.h
+++ b/src/version.h
@@ -9,7 +9,7 @@
* network protocol versioning
*/
-static const int PROTOCOL_VERSION = 70013;
+static const int PROTOCOL_VERSION = 70014;
//! initial proto version, to be increased after version/verack negotiation
static const int INIT_PROTO_VERSION = 209;
@@ -39,4 +39,7 @@ static const int SENDHEADERS_VERSION = 70012;
//! "feefilter" tells peers to filter invs to you by fee starts with this version
static const int FEEFILTER_VERSION = 70013;
+//! shord-id-based block download starts with this version
+static const int SHORT_IDS_BLOCKS_VERSION = 70014;
+
#endif // BITCOIN_VERSION_H
diff --git a/src/wallet/rpcdump.cpp b/src/wallet/rpcdump.cpp
index 14c2e31d95..d55cc68dc0 100644
--- a/src/wallet/rpcdump.cpp
+++ b/src/wallet/rpcdump.cpp
@@ -167,6 +167,11 @@ void ImportScript(const CScript& script, const string& strLabel, bool isRedeemSc
if (!pwalletMain->HaveCScript(script) && !pwalletMain->AddCScript(script))
throw JSONRPCError(RPC_WALLET_ERROR, "Error adding p2sh redeemScript to wallet");
ImportAddress(CBitcoinAddress(CScriptID(script)), strLabel);
+ } else {
+ CTxDestination destination;
+ if (ExtractDestination(script, destination)) {
+ pwalletMain->SetAddressBook(destination, strLabel, "receive");
+ }
}
}
@@ -195,6 +200,8 @@ UniValue importaddress(const UniValue& params, bool fHelp)
"4. p2sh (boolean, optional, default=false) Add the P2SH version of the script as well\n"
"\nNote: This call can take minutes to complete if rescan is true.\n"
"If you have the full public key, you should call importpubkey instead of this.\n"
+ "\nNote: If you import a non-standard raw script in hex form, outputs sending to it will be treated\n"
+ "as change, and not show up in many RPCs.\n"
"\nExamples:\n"
"\nImport a script with rescan\n"
+ HelpExampleCli("importaddress", "\"myscript\"") +
diff --git a/src/wallet/test/wallet_tests.cpp b/src/wallet/test/wallet_tests.cpp
index 387b223589..0a4f06ba88 100644
--- a/src/wallet/test/wallet_tests.cpp
+++ b/src/wallet/test/wallet_tests.cpp
@@ -27,7 +27,7 @@ typedef set<pair<const CWalletTx*,unsigned int> > CoinSet;
BOOST_FIXTURE_TEST_SUITE(wallet_tests, WalletTestingSetup)
-static CWallet wallet;
+static const CWallet wallet;
static vector<COutput> vCoins;
static void add_coin(const CAmount& nValue, int nAge = 6*24, bool fIsFromMe = false, int nInput=0)
@@ -188,11 +188,11 @@ BOOST_AUTO_TEST_CASE(coin_selection_tests)
// empty the wallet and start again, now with fractions of a cent, to test small change avoidance
empty_wallet();
- add_coin(0.1*MIN_CHANGE);
- add_coin(0.2*MIN_CHANGE);
- add_coin(0.3*MIN_CHANGE);
- add_coin(0.4*MIN_CHANGE);
- add_coin(0.5*MIN_CHANGE);
+ add_coin(MIN_CHANGE * 1 / 10);
+ add_coin(MIN_CHANGE * 2 / 10);
+ add_coin(MIN_CHANGE * 3 / 10);
+ add_coin(MIN_CHANGE * 4 / 10);
+ add_coin(MIN_CHANGE * 5 / 10);
// 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
@@ -207,8 +207,8 @@ BOOST_AUTO_TEST_CASE(coin_selection_tests)
BOOST_CHECK_EQUAL(nValueRet, 1 * MIN_CHANGE); // we should get the exact amount
// if we add more small coins:
- add_coin(0.6*MIN_CHANGE);
- add_coin(0.7*MIN_CHANGE);
+ add_coin(MIN_CHANGE * 6 / 10);
+ add_coin(MIN_CHANGE * 7 / 10);
// and try again to make 1.0 * MIN_CHANGE
BOOST_CHECK( wallet.SelectCoinsMinConf(1 * MIN_CHANGE, 1, 1, vCoins, setCoinsRet, nValueRet));
@@ -229,9 +229,9 @@ BOOST_AUTO_TEST_CASE(coin_selection_tests)
// sometimes it will fail, and so we use the next biggest coin:
empty_wallet();
- add_coin(0.5 * MIN_CHANGE);
- add_coin(0.6 * MIN_CHANGE);
- add_coin(0.7 * MIN_CHANGE);
+ add_coin(MIN_CHANGE * 5 / 10);
+ 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, vCoins, setCoinsRet, nValueRet));
BOOST_CHECK_EQUAL(nValueRet, 1111 * MIN_CHANGE); // we get the bigger coin
@@ -239,9 +239,9 @@ BOOST_AUTO_TEST_CASE(coin_selection_tests)
// but sometimes it's possible, and we use an exact subset (0.4 + 0.6 = 1.0)
empty_wallet();
- add_coin(0.4 * MIN_CHANGE);
- add_coin(0.6 * MIN_CHANGE);
- add_coin(0.8 * MIN_CHANGE);
+ add_coin(MIN_CHANGE * 4 / 10);
+ 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, vCoins, setCoinsRet, nValueRet));
BOOST_CHECK_EQUAL(nValueRet, MIN_CHANGE); // we should get the exact amount
@@ -249,17 +249,17 @@ BOOST_AUTO_TEST_CASE(coin_selection_tests)
// test avoiding small change
empty_wallet();
- add_coin(0.05 * MIN_CHANGE);
- add_coin(1 * MIN_CHANGE);
- add_coin(100 * MIN_CHANGE);
+ add_coin(MIN_CHANGE * 5 / 100);
+ add_coin(MIN_CHANGE * 1);
+ add_coin(MIN_CHANGE * 100);
// trying to make 100.01 from these three coins
- BOOST_CHECK( wallet.SelectCoinsMinConf(100.01 * MIN_CHANGE, 1, 1, vCoins, setCoinsRet, nValueRet));
- BOOST_CHECK_EQUAL(nValueRet, 101.05 * MIN_CHANGE); // we should get all coins
+ BOOST_CHECK(wallet.SelectCoinsMinConf(MIN_CHANGE * 10001 / 100, 1, 1, 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(99.9 * MIN_CHANGE, 1, 1, vCoins, setCoinsRet, nValueRet));
+ BOOST_CHECK(wallet.SelectCoinsMinConf(MIN_CHANGE * 9990 / 100, 1, 1, vCoins, setCoinsRet, nValueRet));
BOOST_CHECK_EQUAL(nValueRet, 101 * MIN_CHANGE);
BOOST_CHECK_EQUAL(setCoinsRet.size(), 2U);
@@ -310,7 +310,11 @@ BOOST_AUTO_TEST_CASE(coin_selection_tests)
// add 75 cents in small change. not enough to make 90 cents,
// then try making 90 cents. there are multiple competing "smallest bigger" coins,
// one of which should be picked at random
- add_coin( 5*CENT); add_coin(10*CENT); add_coin(15*CENT); add_coin(20*CENT); add_coin(25*CENT);
+ add_coin(5 * CENT);
+ add_coin(10 * CENT);
+ add_coin(15 * CENT);
+ add_coin(20 * CENT);
+ add_coin(25 * CENT);
fails = 0;
for (int i = 0; i < RANDOM_REPEATS; i++)
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index 723b2eceff..ba5f92a987 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -3209,7 +3209,7 @@ std::string CWallet::GetWalletHelpString(bool 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));
+ 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));
strUsage += HelpMessageOpt("-upgradewallet", _("Upgrade wallet to latest format on startup"));
strUsage += HelpMessageOpt("-wallet=<file>", _("Specify wallet file (within data directory)") + " " + strprintf(_("(default: %s)"), DEFAULT_WALLET_DAT));
strUsage += HelpMessageOpt("-walletbroadcast", _("Make the wallet broadcast transactions") + " " + strprintf(_("(default: %u)"), DEFAULT_WALLETBROADCAST));