diff options
113 files changed, 5246 insertions, 956 deletions
diff --git a/contrib/debian/manpages/bitcoin.conf.5 b/contrib/debian/manpages/bitcoin.conf.5 index eef213149d..7438b4b66a 100644 --- a/contrib/debian/manpages/bitcoin.conf.5 +++ b/contrib/debian/manpages/bitcoin.conf.5 @@ -37,9 +37,6 @@ You must set *rpcuser* to secure the JSON-RPC api. \fBrpcpassword=\fR\fI'password'\fR You must set *rpcpassword* to secure the JSON-RPC api. .TP -\fBrpctimeout=\fR\fI'30'\fR -How many seconds *bitcoin* will wait for a complete RPC HTTP request, after the HTTP connection is established. -.TP \fBrpcallowip=\fR\fI'192.168.1.*'\fR By default, only RPC connections from localhost are allowed. Specify as many *rpcallowip=* settings as you like to allow connections from other hosts (and you may use * as a wildcard character). .TP diff --git a/qa/rpc-tests/netutil.py b/qa/rpc-tests/netutil.py new file mode 100644 index 0000000000..9bea2e355e --- /dev/null +++ b/qa/rpc-tests/netutil.py @@ -0,0 +1,134 @@ +# Linux network utilities +import sys +import socket +import fcntl +import struct +import array +import os +import binascii + +# Roughly based on http://voorloopnul.com/blog/a-python-netstat-in-less-than-100-lines-of-code/ by Ricardo Pascal +STATE_ESTABLISHED = '01' +STATE_SYN_SENT = '02' +STATE_SYN_RECV = '03' +STATE_FIN_WAIT1 = '04' +STATE_FIN_WAIT2 = '05' +STATE_TIME_WAIT = '06' +STATE_CLOSE = '07' +STATE_CLOSE_WAIT = '08' +STATE_LAST_ACK = '09' +STATE_LISTEN = '0A' +STATE_CLOSING = '0B' + +def get_socket_inodes(pid): + ''' + Get list of socket inodes for process pid. + ''' + base = '/proc/%i/fd' % pid + inodes = [] + for item in os.listdir(base): + target = os.readlink(os.path.join(base, item)) + if target.startswith('socket:'): + inodes.append(int(target[8:-1])) + return inodes + +def _remove_empty(array): + return [x for x in array if x !=''] + +def _convert_ip_port(array): + host,port = array.split(':') + # convert host from mangled-per-four-bytes form as used by kernel + host = binascii.unhexlify(host) + host_out = '' + for x in range(0, len(host)/4): + (val,) = struct.unpack('=I', host[x*4:(x+1)*4]) + host_out += '%08x' % val + + return host_out,int(port,16) + +def netstat(typ='tcp'): + ''' + Function to return a list with status of tcp connections at linux systems + To get pid of all network process running on system, you must run this script + as superuser + ''' + with open('/proc/net/'+typ,'r') as f: + content = f.readlines() + content.pop(0) + result = [] + for line in content: + line_array = _remove_empty(line.split(' ')) # Split lines and remove empty spaces. + tcp_id = line_array[0] + l_addr = _convert_ip_port(line_array[1]) + r_addr = _convert_ip_port(line_array[2]) + state = line_array[3] + inode = int(line_array[9]) # Need the inode to match with process pid. + nline = [tcp_id, l_addr, r_addr, state, inode] + result.append(nline) + return result + +def get_bind_addrs(pid): + ''' + Get bind addresses as (host,port) tuples for process pid. + ''' + inodes = get_socket_inodes(pid) + bind_addrs = [] + for conn in netstat('tcp') + netstat('tcp6'): + if conn[3] == STATE_LISTEN and conn[4] in inodes: + bind_addrs.append(conn[1]) + return bind_addrs + +# from: http://code.activestate.com/recipes/439093/ +def all_interfaces(): + ''' + Return all interfaces that are up + ''' + is_64bits = sys.maxsize > 2**32 + struct_size = 40 if is_64bits else 32 + s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM) + max_possible = 8 # initial value + while True: + bytes = max_possible * struct_size + names = array.array('B', '\0' * bytes) + outbytes = struct.unpack('iL', fcntl.ioctl( + s.fileno(), + 0x8912, # SIOCGIFCONF + struct.pack('iL', bytes, names.buffer_info()[0]) + ))[0] + if outbytes == bytes: + max_possible *= 2 + else: + break + namestr = names.tostring() + return [(namestr[i:i+16].split('\0', 1)[0], + socket.inet_ntoa(namestr[i+20:i+24])) + for i in range(0, outbytes, struct_size)] + +def addr_to_hex(addr): + ''' + Convert string IPv4 or IPv6 address to binary address as returned by + get_bind_addrs. + Very naive implementation that certainly doesn't work for all IPv6 variants. + ''' + if '.' in addr: # IPv4 + addr = [int(x) for x in addr.split('.')] + elif ':' in addr: # IPv6 + sub = [[], []] # prefix, suffix + x = 0 + addr = addr.split(':') + for i,comp in enumerate(addr): + if comp == '': + if i == 0 or i == (len(addr)-1): # skip empty component at beginning or end + continue + x += 1 # :: skips to suffix + assert(x < 2) + else: # two bytes per component + val = int(comp, 16) + sub[x].append(val >> 8) + sub[x].append(val & 0xff) + nullbytes = 16 - len(sub[0]) - len(sub[1]) + assert((x == 0 and nullbytes == 0) or (x == 1 and nullbytes > 0)) + addr = sub[0] + ([0] * nullbytes) + sub[1] + else: + raise ValueError('Could not parse address %s' % addr) + return binascii.hexlify(bytearray(addr)) diff --git a/qa/rpc-tests/rpcbind_test.py b/qa/rpc-tests/rpcbind_test.py new file mode 100755 index 0000000000..a31f8d98ef --- /dev/null +++ b/qa/rpc-tests/rpcbind_test.py @@ -0,0 +1,152 @@ +#!/usr/bin/env python +# Copyright (c) 2014 The Bitcoin Core developers +# Distributed under the MIT/X11 software license, see the accompanying +# file COPYING or http://www.opensource.org/licenses/mit-license.php. + +# Test for -rpcbind, as well as -rpcallowip and -rpcconnect + +# Add python-bitcoinrpc to module search path: +import os +import sys +sys.path.append(os.path.join(os.path.dirname(os.path.abspath(__file__)), "python-bitcoinrpc")) + +import json +import shutil +import subprocess +import tempfile +import traceback + +from bitcoinrpc.authproxy import AuthServiceProxy, JSONRPCException +from util import * +from netutil import * + +def run_bind_test(tmpdir, allow_ips, connect_to, addresses, expected): + ''' + Start a node with requested rpcallowip and rpcbind parameters, + then try to connect, and check if the set of bound addresses + matches the expected set. + ''' + expected = [(addr_to_hex(addr), port) for (addr, port) in expected] + base_args = ['-disablewallet', '-nolisten'] + if allow_ips: + base_args += ['-rpcallowip=' + x for x in allow_ips] + binds = ['-rpcbind='+addr for addr in addresses] + nodes = start_nodes(1, tmpdir, [base_args + binds], connect_to) + try: + pid = bitcoind_processes[0].pid + assert_equal(set(get_bind_addrs(pid)), set(expected)) + finally: + stop_nodes(nodes) + wait_bitcoinds() + +def run_allowip_test(tmpdir, allow_ips, rpchost): + ''' + Start a node with rpcwallow IP, and request getinfo + at a non-localhost IP. + ''' + base_args = ['-disablewallet', '-nolisten'] + ['-rpcallowip='+x for x in allow_ips] + nodes = start_nodes(1, tmpdir, [base_args]) + try: + # connect to node through non-loopback interface + url = "http://rt:rt@%s:%d" % (rpchost, START_RPC_PORT,) + node = AuthServiceProxy(url) + node.getinfo() + finally: + node = None # make sure connection will be garbage collected and closed + stop_nodes(nodes) + wait_bitcoinds() + + +def run_test(tmpdir): + assert(sys.platform == 'linux2') # due to OS-specific network stats queries, this test works only on Linux + # find the first non-loopback interface for testing + non_loopback_ip = None + for name,ip in all_interfaces(): + if ip != '127.0.0.1': + non_loopback_ip = ip + break + if non_loopback_ip is None: + assert(not 'This test requires at least one non-loopback IPv4 interface') + print("Using interface %s for testing" % non_loopback_ip) + + # check default without rpcallowip (IPv4 and IPv6 localhost) + run_bind_test(tmpdir, None, '127.0.0.1', [], + [('127.0.0.1', 11100), ('::1', 11100)]) + # check default with rpcallowip (IPv6 any) + run_bind_test(tmpdir, ['127.0.0.1'], '127.0.0.1', [], + [('::0', 11100)]) + # check only IPv4 localhost (explicit) + run_bind_test(tmpdir, ['127.0.0.1'], '127.0.0.1', ['127.0.0.1'], + [('127.0.0.1', START_RPC_PORT)]) + # check only IPv4 localhost (explicit) with alternative port + run_bind_test(tmpdir, ['127.0.0.1'], '127.0.0.1:32171', ['127.0.0.1:32171'], + [('127.0.0.1', 32171)]) + # check only IPv4 localhost (explicit) with multiple alternative ports on same host + run_bind_test(tmpdir, ['127.0.0.1'], '127.0.0.1:32171', ['127.0.0.1:32171', '127.0.0.1:32172'], + [('127.0.0.1', 32171), ('127.0.0.1', 32172)]) + # check only IPv6 localhost (explicit) + run_bind_test(tmpdir, ['[::1]'], '[::1]', ['[::1]'], + [('::1', 11100)]) + # check both IPv4 and IPv6 localhost (explicit) + run_bind_test(tmpdir, ['127.0.0.1'], '127.0.0.1', ['127.0.0.1', '[::1]'], + [('127.0.0.1', START_RPC_PORT), ('::1', START_RPC_PORT)]) + # check only non-loopback interface + run_bind_test(tmpdir, [non_loopback_ip], non_loopback_ip, [non_loopback_ip], + [(non_loopback_ip, START_RPC_PORT)]) + + # Check that with invalid rpcallowip, we are denied + run_allowip_test(tmpdir, [non_loopback_ip], non_loopback_ip) + try: + run_allowip_test(tmpdir, ['1.1.1.1'], non_loopback_ip) + assert(not 'Connection not denied by rpcallowip as expected') + except ValueError: + pass + +def main(): + import optparse + + parser = optparse.OptionParser(usage="%prog [options]") + parser.add_option("--nocleanup", dest="nocleanup", default=False, action="store_true", + help="Leave bitcoinds and test.* datadir on exit or error") + parser.add_option("--srcdir", dest="srcdir", default="../../src", + help="Source directory containing bitcoind/bitcoin-cli (default: %default%)") + parser.add_option("--tmpdir", dest="tmpdir", default=tempfile.mkdtemp(prefix="test"), + help="Root directory for datadirs") + (options, args) = parser.parse_args() + + os.environ['PATH'] = options.srcdir+":"+os.environ['PATH'] + + check_json_precision() + + success = False + nodes = [] + try: + print("Initializing test directory "+options.tmpdir) + if not os.path.isdir(options.tmpdir): + os.makedirs(options.tmpdir) + initialize_chain(options.tmpdir) + + run_test(options.tmpdir) + + success = True + + except AssertionError as e: + print("Assertion failed: "+e.message) + except Exception as e: + print("Unexpected exception caught during testing: "+str(e)) + traceback.print_tb(sys.exc_info()[2]) + + if not options.nocleanup: + print("Cleaning up") + wait_bitcoinds() + shutil.rmtree(options.tmpdir) + + if success: + print("Tests successful") + sys.exit(0) + else: + print("Failed") + sys.exit(1) + +if __name__ == '__main__': + main() diff --git a/qa/rpc-tests/util.py b/qa/rpc-tests/util.py index 1d0896a3fb..40f4a1458f 100644 --- a/qa/rpc-tests/util.py +++ b/qa/rpc-tests/util.py @@ -15,6 +15,7 @@ import json import shutil import subprocess import time +import re from bitcoinrpc.authproxy import AuthServiceProxy, JSONRPCException from util import * @@ -112,20 +113,43 @@ def initialize_chain(test_dir): to_dir = os.path.join(test_dir, "node"+str(i)) shutil.copytree(from_dir, to_dir) -def start_nodes(num_nodes, dir): +def _rpchost_to_args(rpchost): + '''Convert optional IP:port spec to rpcconnect/rpcport args''' + if rpchost is None: + return [] + + match = re.match('(\[[0-9a-fA-f:]+\]|[^:]+)(?::([0-9]+))?$', rpchost) + if not match: + raise ValueError('Invalid RPC host spec ' + rpchost) + + rpcconnect = match.group(1) + rpcport = match.group(2) + + if rpcconnect.startswith('['): # remove IPv6 [...] wrapping + rpcconnect = rpcconnect[1:-1] + + rv = ['-rpcconnect=' + rpcconnect] + if rpcport: + rv += ['-rpcport=' + rpcport] + return rv + +def start_nodes(num_nodes, dir, extra_args=None, rpchost=None): # Start bitcoinds, and wait for RPC interface to be up and running: devnull = open("/dev/null", "w+") for i in range(num_nodes): datadir = os.path.join(dir, "node"+str(i)) args = [ "bitcoind", "-datadir="+datadir ] + if extra_args is not None: + args += extra_args[i] bitcoind_processes.append(subprocess.Popen(args)) - subprocess.check_call([ "bitcoin-cli", "-datadir="+datadir, - "-rpcwait", "getblockcount"], stdout=devnull) + subprocess.check_call([ "bitcoin-cli", "-datadir="+datadir] + + _rpchost_to_args(rpchost) + + ["-rpcwait", "getblockcount"], stdout=devnull) devnull.close() # Create&return JSON-RPC connections rpc_connections = [] for i in range(num_nodes): - url = "http://rt:rt@127.0.0.1:%d"%(START_RPC_PORT+i,) + url = "http://rt:rt@%s:%d" % (rpchost or '127.0.0.1', START_RPC_PORT+i,) rpc_connections.append(AuthServiceProxy(url)) return rpc_connections diff --git a/src/base58.cpp b/src/base58.cpp index 0b08ee3d06..5975703887 100644 --- a/src/base58.cpp +++ b/src/base58.cpp @@ -2,11 +2,18 @@ // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. +#include "base58.h" + +#include "hash.h" +#include "uint256.h" + #include <assert.h> #include <stdint.h> #include <string.h> #include <vector> #include <string> +#include <boost/variant/apply_visitor.hpp> +#include <boost/variant/static_visitor.hpp> /* All alphanumeric characters except for "0", "I", "O", and "l" */ static const char* pszBase58 = "123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz"; @@ -89,3 +96,179 @@ std::string EncodeBase58(const unsigned char* pbegin, const unsigned char* pend) str += pszBase58[*(it++)]; return str; } + +std::string EncodeBase58(const std::vector<unsigned char>& vch) { + return EncodeBase58(&vch[0], &vch[0] + vch.size()); +} + +bool DecodeBase58(const std::string& str, std::vector<unsigned char>& vchRet) { + return DecodeBase58(str.c_str(), vchRet); +} + +std::string EncodeBase58Check(const std::vector<unsigned char>& vchIn) { + // add 4-byte hash check to the end + std::vector<unsigned char> vch(vchIn); + uint256 hash = Hash(vch.begin(), vch.end()); + vch.insert(vch.end(), (unsigned char*)&hash, (unsigned char*)&hash + 4); + return EncodeBase58(vch); +} + +bool DecodeBase58Check(const char* psz, std::vector<unsigned char>& vchRet) { + if (!DecodeBase58(psz, vchRet)) + return false; + if (vchRet.size() < 4) + { + vchRet.clear(); + return false; + } + // re-calculate the checksum, insure it matches the included 4-byte checksum + uint256 hash = Hash(vchRet.begin(), vchRet.end()-4); + if (memcmp(&hash, &vchRet.end()[-4], 4) != 0) + { + vchRet.clear(); + return false; + } + vchRet.resize(vchRet.size()-4); + return true; +} + +bool DecodeBase58Check(const std::string& str, std::vector<unsigned char>& vchRet) { + return DecodeBase58Check(str.c_str(), vchRet); +} + +CBase58Data::CBase58Data() { + vchVersion.clear(); + vchData.clear(); +} + +void CBase58Data::SetData(const std::vector<unsigned char> &vchVersionIn, const void* pdata, size_t nSize) { + vchVersion = vchVersionIn; + vchData.resize(nSize); + if (!vchData.empty()) + memcpy(&vchData[0], pdata, nSize); +} + +void CBase58Data::SetData(const std::vector<unsigned char> &vchVersionIn, const unsigned char *pbegin, const unsigned char *pend) { + SetData(vchVersionIn, (void*)pbegin, pend - pbegin); +} + +bool CBase58Data::SetString(const char* psz, unsigned int nVersionBytes) { + std::vector<unsigned char> vchTemp; + DecodeBase58Check(psz, vchTemp); + if (vchTemp.size() < nVersionBytes) { + vchData.clear(); + vchVersion.clear(); + return false; + } + vchVersion.assign(vchTemp.begin(), vchTemp.begin() + nVersionBytes); + vchData.resize(vchTemp.size() - nVersionBytes); + if (!vchData.empty()) + memcpy(&vchData[0], &vchTemp[nVersionBytes], vchData.size()); + OPENSSL_cleanse(&vchTemp[0], vchData.size()); + return true; +} + +bool CBase58Data::SetString(const std::string& str) { + return SetString(str.c_str()); +} + +std::string CBase58Data::ToString() const { + std::vector<unsigned char> vch = vchVersion; + vch.insert(vch.end(), vchData.begin(), vchData.end()); + return EncodeBase58Check(vch); +} + +int CBase58Data::CompareTo(const CBase58Data& b58) const { + if (vchVersion < b58.vchVersion) return -1; + if (vchVersion > b58.vchVersion) return 1; + if (vchData < b58.vchData) return -1; + if (vchData > b58.vchData) return 1; + return 0; +} + +namespace { + class CBitcoinAddressVisitor : public boost::static_visitor<bool> { + private: + CBitcoinAddress *addr; + public: + CBitcoinAddressVisitor(CBitcoinAddress *addrIn) : addr(addrIn) { } + + bool operator()(const CKeyID &id) const { return addr->Set(id); } + bool operator()(const CScriptID &id) const { return addr->Set(id); } + bool operator()(const CNoDestination &no) const { return false; } + }; +}; + +bool CBitcoinAddress::Set(const CKeyID &id) { + SetData(Params().Base58Prefix(CChainParams::PUBKEY_ADDRESS), &id, 20); + return true; +} + +bool CBitcoinAddress::Set(const CScriptID &id) { + SetData(Params().Base58Prefix(CChainParams::SCRIPT_ADDRESS), &id, 20); + return true; +} + +bool CBitcoinAddress::Set(const CTxDestination &dest) { + return boost::apply_visitor(CBitcoinAddressVisitor(this), dest); +} + +bool CBitcoinAddress::IsValid() const { + bool fCorrectSize = vchData.size() == 20; + bool fKnownVersion = vchVersion == Params().Base58Prefix(CChainParams::PUBKEY_ADDRESS) || + vchVersion == Params().Base58Prefix(CChainParams::SCRIPT_ADDRESS); + return fCorrectSize && fKnownVersion; +} + +CTxDestination CBitcoinAddress::Get() const { + if (!IsValid()) + return CNoDestination(); + uint160 id; + memcpy(&id, &vchData[0], 20); + if (vchVersion == Params().Base58Prefix(CChainParams::PUBKEY_ADDRESS)) + return CKeyID(id); + else if (vchVersion == Params().Base58Prefix(CChainParams::SCRIPT_ADDRESS)) + return CScriptID(id); + else + return CNoDestination(); +} + +bool CBitcoinAddress::GetKeyID(CKeyID &keyID) const { + if (!IsValid() || vchVersion != Params().Base58Prefix(CChainParams::PUBKEY_ADDRESS)) + return false; + uint160 id; + memcpy(&id, &vchData[0], 20); + keyID = CKeyID(id); + return true; +} + +bool CBitcoinAddress::IsScript() const { + return IsValid() && vchVersion == Params().Base58Prefix(CChainParams::SCRIPT_ADDRESS); +} + +void CBitcoinSecret::SetKey(const CKey& vchSecret) { + assert(vchSecret.IsValid()); + SetData(Params().Base58Prefix(CChainParams::SECRET_KEY), vchSecret.begin(), vchSecret.size()); + if (vchSecret.IsCompressed()) + vchData.push_back(1); +} + +CKey CBitcoinSecret::GetKey() { + CKey ret; + ret.Set(&vchData[0], &vchData[32], vchData.size() > 32 && vchData[32] == 1); + return ret; +} + +bool CBitcoinSecret::IsValid() const { + bool fExpectedFormat = vchData.size() == 32 || (vchData.size() == 33 && vchData[32] == 1); + bool fCorrectVersion = vchVersion == Params().Base58Prefix(CChainParams::SECRET_KEY); + return fExpectedFormat && fCorrectVersion; +} + +bool CBitcoinSecret::SetString(const char* pszSecret) { + return CBase58Data::SetString(pszSecret) && IsValid(); +} + +bool CBitcoinSecret::SetString(const std::string& strSecret) { + return SetString(strSecret.c_str()); +} diff --git a/src/base58.h b/src/base58.h index 4fb436c5ed..70681f589a 100644 --- a/src/base58.h +++ b/src/base58.h @@ -15,17 +15,12 @@ #define BITCOIN_BASE58_H #include "chainparams.h" -#include "hash.h" #include "key.h" #include "script.h" -#include "uint256.h" #include <string> #include <vector> -#include <boost/variant/apply_visitor.hpp> -#include <boost/variant/static_visitor.hpp> - /** * Encode a byte sequence as a base58-encoded string. * pbegin and pend cannot be NULL, unless both are. @@ -35,10 +30,7 @@ std::string EncodeBase58(const unsigned char* pbegin, const unsigned char* pend) /** * Encode a byte vector as a base58-encoded string */ -inline std::string EncodeBase58(const std::vector<unsigned char>& vch) -{ - return EncodeBase58(&vch[0], &vch[0] + vch.size()); -} +std::string EncodeBase58(const std::vector<unsigned char>& vch); /** * Decode a base58-encoded string (psz) into a byte vector (vchRet). @@ -51,55 +43,24 @@ bool DecodeBase58(const char* psz, std::vector<unsigned char>& vchRet); * Decode a base58-encoded string (str) into a byte vector (vchRet). * return true if decoding is successful. */ -inline bool DecodeBase58(const std::string& str, std::vector<unsigned char>& vchRet) -{ - return DecodeBase58(str.c_str(), vchRet); -} +bool DecodeBase58(const std::string& str, std::vector<unsigned char>& vchRet); /** * Encode a byte vector into a base58-encoded string, including checksum */ -inline std::string EncodeBase58Check(const std::vector<unsigned char>& vchIn) -{ - // add 4-byte hash check to the end - std::vector<unsigned char> vch(vchIn); - uint256 hash = Hash(vch.begin(), vch.end()); - vch.insert(vch.end(), (unsigned char*)&hash, (unsigned char*)&hash + 4); - return EncodeBase58(vch); -} +std::string EncodeBase58Check(const std::vector<unsigned char>& vchIn); /** * Decode a base58-encoded string (psz) that includes a checksum into a byte * vector (vchRet), return true if decoding is successful */ -inline bool DecodeBase58Check(const char* psz, std::vector<unsigned char>& vchRet) -{ - if (!DecodeBase58(psz, vchRet)) - return false; - if (vchRet.size() < 4) - { - vchRet.clear(); - return false; - } - // re-calculate the checksum, insure it matches the included 4-byte checksum - uint256 hash = Hash(vchRet.begin(), vchRet.end()-4); - if (memcmp(&hash, &vchRet.end()[-4], 4) != 0) - { - vchRet.clear(); - return false; - } - vchRet.resize(vchRet.size()-4); - return true; -} +inline bool DecodeBase58Check(const char* psz, std::vector<unsigned char>& vchRet); /** * Decode a base58-encoded string (str) that includes a checksum into a byte * vector (vchRet), return true if decoding is successful */ -inline bool DecodeBase58Check(const std::string& str, std::vector<unsigned char>& vchRet) -{ - return DecodeBase58Check(str.c_str(), vchRet); -} +inline bool DecodeBase58Check(const std::string& str, std::vector<unsigned char>& vchRet); /** * Base class for all base58-encoded data @@ -114,64 +75,15 @@ protected: typedef std::vector<unsigned char, zero_after_free_allocator<unsigned char> > vector_uchar; vector_uchar vchData; - CBase58Data() - { - vchVersion.clear(); - vchData.clear(); - } - - void SetData(const std::vector<unsigned char> &vchVersionIn, const void* pdata, size_t nSize) - { - vchVersion = vchVersionIn; - vchData.resize(nSize); - if (!vchData.empty()) - memcpy(&vchData[0], pdata, nSize); - } - - void SetData(const std::vector<unsigned char> &vchVersionIn, const unsigned char *pbegin, const unsigned char *pend) - { - SetData(vchVersionIn, (void*)pbegin, pend - pbegin); - } + CBase58Data(); + void SetData(const std::vector<unsigned char> &vchVersionIn, const void* pdata, size_t nSize); + void SetData(const std::vector<unsigned char> &vchVersionIn, const unsigned char *pbegin, const unsigned char *pend); public: - bool SetString(const char* psz, unsigned int nVersionBytes = 1) - { - std::vector<unsigned char> vchTemp; - DecodeBase58Check(psz, vchTemp); - if (vchTemp.size() < nVersionBytes) - { - vchData.clear(); - vchVersion.clear(); - return false; - } - vchVersion.assign(vchTemp.begin(), vchTemp.begin() + nVersionBytes); - vchData.resize(vchTemp.size() - nVersionBytes); - if (!vchData.empty()) - memcpy(&vchData[0], &vchTemp[nVersionBytes], vchData.size()); - OPENSSL_cleanse(&vchTemp[0], vchData.size()); - return true; - } - - bool SetString(const std::string& str) - { - return SetString(str.c_str()); - } - - std::string ToString() const - { - std::vector<unsigned char> vch = vchVersion; - vch.insert(vch.end(), vchData.begin(), vchData.end()); - return EncodeBase58Check(vch); - } - - int CompareTo(const CBase58Data& b58) const - { - if (vchVersion < b58.vchVersion) return -1; - if (vchVersion > b58.vchVersion) return 1; - if (vchData < b58.vchData) return -1; - if (vchData > b58.vchData) return 1; - return 0; - } + bool SetString(const char* psz, unsigned int nVersionBytes = 1); + bool SetString(const std::string& str); + std::string ToString() const; + int CompareTo(const CBase58Data& b58) const; bool operator==(const CBase58Data& b58) const { return CompareTo(b58) == 0; } bool operator<=(const CBase58Data& b58) const { return CompareTo(b58) <= 0; } @@ -186,140 +98,37 @@ public: * Script-hash-addresses have version 5 (or 196 testnet). * The data vector contains RIPEMD160(SHA256(cscript)), where cscript is the serialized redemption script. */ -class CBitcoinAddress; -class CBitcoinAddressVisitor : public boost::static_visitor<bool> -{ -private: - CBitcoinAddress *addr; +class CBitcoinAddress : public CBase58Data { public: - CBitcoinAddressVisitor(CBitcoinAddress *addrIn) : addr(addrIn) { } - bool operator()(const CKeyID &id) const; - bool operator()(const CScriptID &id) const; - bool operator()(const CNoDestination &no) const; + bool Set(const CKeyID &id); + bool Set(const CScriptID &id); + bool Set(const CTxDestination &dest); + bool IsValid() const; + + CBitcoinAddress() {} + CBitcoinAddress(const CTxDestination &dest) { Set(dest); } + CBitcoinAddress(const std::string& strAddress) { SetString(strAddress); } + CBitcoinAddress(const char* pszAddress) { SetString(pszAddress); } + + CTxDestination Get() const; + bool GetKeyID(CKeyID &keyID) const; + bool IsScript() const; }; -class CBitcoinAddress : public CBase58Data -{ -public: - bool Set(const CKeyID &id) { - SetData(Params().Base58Prefix(CChainParams::PUBKEY_ADDRESS), &id, 20); - return true; - } - - bool Set(const CScriptID &id) { - SetData(Params().Base58Prefix(CChainParams::SCRIPT_ADDRESS), &id, 20); - return true; - } - - bool Set(const CTxDestination &dest) - { - return boost::apply_visitor(CBitcoinAddressVisitor(this), dest); - } - - bool IsValid() const - { - bool fCorrectSize = vchData.size() == 20; - bool fKnownVersion = vchVersion == Params().Base58Prefix(CChainParams::PUBKEY_ADDRESS) || - vchVersion == Params().Base58Prefix(CChainParams::SCRIPT_ADDRESS); - return fCorrectSize && fKnownVersion; - } - - CBitcoinAddress() - { - } - - CBitcoinAddress(const CTxDestination &dest) - { - Set(dest); - } - - CBitcoinAddress(const std::string& strAddress) - { - SetString(strAddress); - } - - CBitcoinAddress(const char* pszAddress) - { - SetString(pszAddress); - } - - CTxDestination Get() const { - if (!IsValid()) - return CNoDestination(); - uint160 id; - memcpy(&id, &vchData[0], 20); - if (vchVersion == Params().Base58Prefix(CChainParams::PUBKEY_ADDRESS)) - return CKeyID(id); - else if (vchVersion == Params().Base58Prefix(CChainParams::SCRIPT_ADDRESS)) - return CScriptID(id); - else - return CNoDestination(); - } - - bool GetKeyID(CKeyID &keyID) const { - if (!IsValid() || vchVersion != Params().Base58Prefix(CChainParams::PUBKEY_ADDRESS)) - return false; - uint160 id; - memcpy(&id, &vchData[0], 20); - keyID = CKeyID(id); - return true; - } - - bool IsScript() const { - return IsValid() && vchVersion == Params().Base58Prefix(CChainParams::SCRIPT_ADDRESS); - } -}; - -bool inline CBitcoinAddressVisitor::operator()(const CKeyID &id) const { return addr->Set(id); } -bool inline CBitcoinAddressVisitor::operator()(const CScriptID &id) const { return addr->Set(id); } -bool inline CBitcoinAddressVisitor::operator()(const CNoDestination &id) const { return false; } - /** * A base58-encoded secret key */ class CBitcoinSecret : public CBase58Data { public: - void SetKey(const CKey& vchSecret) - { - assert(vchSecret.IsValid()); - SetData(Params().Base58Prefix(CChainParams::SECRET_KEY), vchSecret.begin(), vchSecret.size()); - if (vchSecret.IsCompressed()) - vchData.push_back(1); - } - - CKey GetKey() - { - CKey ret; - ret.Set(&vchData[0], &vchData[32], vchData.size() > 32 && vchData[32] == 1); - return ret; - } - - bool IsValid() const - { - bool fExpectedFormat = vchData.size() == 32 || (vchData.size() == 33 && vchData[32] == 1); - bool fCorrectVersion = vchVersion == Params().Base58Prefix(CChainParams::SECRET_KEY); - return fExpectedFormat && fCorrectVersion; - } - - bool SetString(const char* pszSecret) - { - return CBase58Data::SetString(pszSecret) && IsValid(); - } - - bool SetString(const std::string& strSecret) - { - return SetString(strSecret.c_str()); - } - - CBitcoinSecret(const CKey& vchSecret) - { - SetKey(vchSecret); - } - - CBitcoinSecret() - { - } + void SetKey(const CKey& vchSecret); + CKey GetKey(); + bool IsValid() const; + bool SetString(const char* pszSecret); + bool SetString(const std::string& strSecret); + + CBitcoinSecret(const CKey& vchSecret) { SetKey(vchSecret); } + CBitcoinSecret() {} }; template<typename K, int Size, CChainParams::Base58Type Type> class CBitcoinExtKeyBase : public CBase58Data diff --git a/src/bitcoin-cli.cpp b/src/bitcoin-cli.cpp index ca6950a162..ce9e7a4027 100644 --- a/src/bitcoin-cli.cpp +++ b/src/bitcoin-cli.cpp @@ -58,6 +58,8 @@ static bool AppInitRPC(int argc, char* argv[]) int main(int argc, char* argv[]) { + SetupEnvironment(); + try { if(!AppInitRPC(argc, argv)) diff --git a/src/bitcoind.cpp b/src/bitcoind.cpp index 17aa0c9d4b..78c8b2ba0e 100644 --- a/src/bitcoind.cpp +++ b/src/bitcoind.cpp @@ -172,6 +172,8 @@ bool AppInit(int argc, char* argv[]) int main(int argc, char* argv[]) { + SetupEnvironment(); + bool fRet = false; // Connect bitcoind signal handlers diff --git a/src/core.cpp b/src/core.cpp index cbdd24e806..7651ce9957 100644 --- a/src/core.cpp +++ b/src/core.cpp @@ -140,7 +140,7 @@ double CTransaction::ComputePriority(double dPriorityInputs, unsigned int nTxSiz std::string CTransaction::ToString() const { std::string str; - str += strprintf("CTransaction(hash=%s, ver=%d, vin.size=%"PRIszu", vout.size=%"PRIszu", nLockTime=%u)\n", + str += strprintf("CTransaction(hash=%s, ver=%d, vin.size=%u, vout.size=%u, nLockTime=%u)\n", GetHash().ToString().substr(0,10), nVersion, vin.size(), @@ -269,7 +269,7 @@ uint256 CBlock::CheckMerkleBranch(uint256 hash, const std::vector<uint256>& vMer void CBlock::print() const { - LogPrintf("CBlock(hash=%s, ver=%d, hashPrevBlock=%s, hashMerkleRoot=%s, nTime=%u, nBits=%08x, nNonce=%u, vtx=%"PRIszu")\n", + LogPrintf("CBlock(hash=%s, ver=%d, hashPrevBlock=%s, hashMerkleRoot=%s, nTime=%u, nBits=%08x, nNonce=%u, vtx=%u)\n", GetHash().ToString(), nVersion, hashPrevBlock.ToString(), diff --git a/src/init.cpp b/src/init.cpp index 77c32d0b49..7664988762 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -25,6 +25,7 @@ #endif #include <stdint.h> +#include <stdio.h> #ifndef WIN32 #include <signal.h> @@ -303,10 +304,11 @@ std::string HelpMessage(HelpMessageMode hmm) strUsage += "\n" + _("RPC server options:") + "\n"; strUsage += " -server " + _("Accept command line and JSON-RPC commands") + "\n"; + strUsage += " -rpcbind=<addr> " + _("Bind to given address to listen for JSON-RPC connections. Use [host]:port notation for IPv6. This option can be specified multiple times (default: bind to all interfaces)") + "\n"; strUsage += " -rpcuser=<user> " + _("Username for JSON-RPC connections") + "\n"; strUsage += " -rpcpassword=<pw> " + _("Password for JSON-RPC connections") + "\n"; strUsage += " -rpcport=<port> " + _("Listen for JSON-RPC connections on <port> (default: 8332 or testnet: 18332)") + "\n"; - strUsage += " -rpcallowip=<ip> " + _("Allow JSON-RPC connections from specified IP address") + "\n"; + strUsage += " -rpcallowip=<ip> " + _("Allow JSON-RPC connections from specified IP address. This option can be specified multiple times") + "\n"; strUsage += " -rpcthreads=<n> " + _("Set the number of threads to service RPC calls (default: 4)") + "\n"; strUsage += "\n" + _("RPC SSL options: (see the Bitcoin Wiki for SSL setup instructions)") + "\n"; @@ -530,6 +532,7 @@ bool AppInit2(boost::thread_group& threadGroup) fServer = GetBoolArg("-server", false); fPrintToConsole = GetBoolArg("-printtoconsole", false); fLogTimestamps = GetBoolArg("-logtimestamps", true); + setvbuf(stdout, NULL, _IOLBF, 0); #ifdef ENABLE_WALLET bool fDisableWallet = GetBoolArg("-disablewallet", false); #endif @@ -1078,12 +1081,12 @@ bool AppInit2(boost::thread_group& threadGroup) RandAddSeedPerfmon(); //// debug print - LogPrintf("mapBlockIndex.size() = %"PRIszu"\n", mapBlockIndex.size()); + LogPrintf("mapBlockIndex.size() = %u\n", mapBlockIndex.size()); LogPrintf("nBestHeight = %d\n", chainActive.Height()); #ifdef ENABLE_WALLET - LogPrintf("setKeyPool.size() = %"PRIszu"\n", pwalletMain ? pwalletMain->setKeyPool.size() : 0); - LogPrintf("mapWallet.size() = %"PRIszu"\n", pwalletMain ? pwalletMain->mapWallet.size() : 0); - LogPrintf("mapAddressBook.size() = %"PRIszu"\n", pwalletMain ? pwalletMain->mapAddressBook.size() : 0); + LogPrintf("setKeyPool.size() = %u\n", pwalletMain ? pwalletMain->setKeyPool.size() : 0); + LogPrintf("mapWallet.size() = %u\n", pwalletMain ? pwalletMain->mapWallet.size() : 0); + LogPrintf("mapAddressBook.size() = %u\n", pwalletMain ? pwalletMain->mapAddressBook.size() : 0); #endif StartNode(threadGroup); diff --git a/src/json/json_spirit_reader_template.h b/src/json/json_spirit_reader_template.h index 4dec00e6c9..46f5892f62 100644 --- a/src/json/json_spirit_reader_template.h +++ b/src/json/json_spirit_reader_template.h @@ -33,8 +33,8 @@ namespace json_spirit { - const spirit_namespace::int_parser < boost::int64_t > int64_p = spirit_namespace::int_parser < boost::int64_t >(); - const spirit_namespace::uint_parser< boost::uint64_t > uint64_p = spirit_namespace::uint_parser< boost::uint64_t >(); + const spirit_namespace::int_parser < int64_t > int64_p = spirit_namespace::int_parser < int64_t >(); + const spirit_namespace::uint_parser< uint64_t > uint64_p = spirit_namespace::uint_parser< uint64_t >(); template< class Iter_type > bool is_eq( Iter_type first, Iter_type last, const char* c_str ) @@ -270,12 +270,12 @@ namespace json_spirit add_to_current( Value_type() ); } - void new_int( boost::int64_t i ) + void new_int( int64_t i ) { add_to_current( i ); } - void new_uint64( boost::uint64_t ui ) + void new_uint64( uint64_t ui ) { add_to_current( ui ); } @@ -425,8 +425,8 @@ namespace json_spirit typedef boost::function< void( Char_type ) > Char_action; typedef boost::function< void( Iter_type, Iter_type ) > Str_action; typedef boost::function< void( double ) > Real_action; - typedef boost::function< void( boost::int64_t ) > Int_action; - typedef boost::function< void( boost::uint64_t ) > Uint64_action; + typedef boost::function< void( int64_t ) > Int_action; + typedef boost::function< void( uint64_t ) > Uint64_action; Char_action begin_obj ( boost::bind( &Semantic_actions_t::begin_obj, &self.actions_, _1 ) ); Char_action end_obj ( boost::bind( &Semantic_actions_t::end_obj, &self.actions_, _1 ) ); diff --git a/src/json/json_spirit_value.h b/src/json/json_spirit_value.h index 7e83a2a7e3..13cc89210c 100644 --- a/src/json/json_spirit_value.h +++ b/src/json/json_spirit_value.h @@ -16,8 +16,8 @@ #include <cassert> #include <sstream> #include <stdexcept> +#include <stdint.h> #include <boost/config.hpp> -#include <boost/cstdint.hpp> #include <boost/shared_ptr.hpp> #include <boost/variant.hpp> @@ -45,8 +45,8 @@ namespace json_spirit Value_impl( const Array& value ); Value_impl( bool value ); Value_impl( int value ); - Value_impl( boost::int64_t value ); - Value_impl( boost::uint64_t value ); + Value_impl( int64_t value ); + Value_impl( uint64_t value ); Value_impl( double value ); Value_impl( const Value_impl& other ); @@ -65,8 +65,8 @@ namespace json_spirit const Array& get_array() const; bool get_bool() const; int get_int() const; - boost::int64_t get_int64() const; - boost::uint64_t get_uint64() const; + int64_t get_int64() const; + uint64_t get_uint64() const; double get_real() const; Object& get_obj(); @@ -83,7 +83,7 @@ namespace json_spirit typedef boost::variant< String_type, boost::recursive_wrapper< Object >, boost::recursive_wrapper< Array >, - bool, boost::int64_t, double > Variant; + bool, int64_t, double > Variant; Value_type type_; Variant v_; @@ -258,13 +258,13 @@ namespace json_spirit template< class Config > Value_impl< Config >::Value_impl( int value ) : type_( int_type ) - , v_( static_cast< boost::int64_t >( value ) ) + , v_( static_cast< int64_t >( value ) ) , is_uint64_( false ) { } template< class Config > - Value_impl< Config >::Value_impl( boost::int64_t value ) + Value_impl< Config >::Value_impl( int64_t value ) : type_( int_type ) , v_( value ) , is_uint64_( false ) @@ -272,9 +272,9 @@ namespace json_spirit } template< class Config > - Value_impl< Config >::Value_impl( boost::uint64_t value ) + Value_impl< Config >::Value_impl( uint64_t value ) : type_( int_type ) - , v_( static_cast< boost::int64_t >( value ) ) + , v_( static_cast< int64_t >( value ) ) , is_uint64_( true ) { } @@ -390,19 +390,19 @@ namespace json_spirit } template< class Config > - boost::int64_t Value_impl< Config >::get_int64() const + int64_t Value_impl< Config >::get_int64() const { check_type( int_type ); - return boost::get< boost::int64_t >( v_ ); + return boost::get< int64_t >( v_ ); } template< class Config > - boost::uint64_t Value_impl< Config >::get_uint64() const + uint64_t Value_impl< Config >::get_uint64() const { check_type( int_type ); - return static_cast< boost::uint64_t >( get_int64() ); + return static_cast< uint64_t >( get_int64() ); } template< class Config > @@ -481,13 +481,13 @@ namespace json_spirit } template< class Value > - boost::int64_t get_value( const Value& value, Type_to_type< boost::int64_t > ) + int64_t get_value( const Value& value, Type_to_type< int64_t > ) { return value.get_int64(); } template< class Value > - boost::uint64_t get_value( const Value& value, Type_to_type< boost::uint64_t > ) + uint64_t get_value( const Value& value, Type_to_type< uint64_t > ) { return value.get_uint64(); } diff --git a/src/leveldb/Makefile b/src/leveldb/Makefile index 344ff2972a..f8903b69e4 100644 --- a/src/leveldb/Makefile +++ b/src/leveldb/Makefile @@ -72,7 +72,7 @@ SHARED = $(SHARED1) else # Update db.h if you change these. SHARED_MAJOR = 1 -SHARED_MINOR = 15 +SHARED_MINOR = 17 SHARED1 = libleveldb.$(PLATFORM_SHARED_EXT) SHARED2 = $(SHARED1).$(SHARED_MAJOR) SHARED3 = $(SHARED1).$(SHARED_MAJOR).$(SHARED_MINOR) @@ -190,19 +190,20 @@ PLATFORMSROOT=/Applications/Xcode.app/Contents/Developer/Platforms SIMULATORROOT=$(PLATFORMSROOT)/iPhoneSimulator.platform/Developer DEVICEROOT=$(PLATFORMSROOT)/iPhoneOS.platform/Developer IOSVERSION=$(shell defaults read $(PLATFORMSROOT)/iPhoneOS.platform/version CFBundleShortVersionString) +IOSARCH=-arch armv6 -arch armv7 -arch armv7s -arch arm64 .cc.o: mkdir -p ios-x86/$(dir $@) - $(CXX) $(CXXFLAGS) -isysroot $(SIMULATORROOT)/SDKs/iPhoneSimulator$(IOSVERSION).sdk -arch i686 -c $< -o ios-x86/$@ + $(CXX) $(CXXFLAGS) -isysroot $(SIMULATORROOT)/SDKs/iPhoneSimulator$(IOSVERSION).sdk -arch i686 -arch x86_64 -c $< -o ios-x86/$@ mkdir -p ios-arm/$(dir $@) - xcrun -sdk iphoneos $(CXX) $(CXXFLAGS) -isysroot $(DEVICEROOT)/SDKs/iPhoneOS$(IOSVERSION).sdk -arch armv6 -arch armv7 -c $< -o ios-arm/$@ + xcrun -sdk iphoneos $(CXX) $(CXXFLAGS) -isysroot $(DEVICEROOT)/SDKs/iPhoneOS$(IOSVERSION).sdk $(IOSARCH) -c $< -o ios-arm/$@ lipo ios-x86/$@ ios-arm/$@ -create -output $@ .c.o: mkdir -p ios-x86/$(dir $@) - $(CC) $(CFLAGS) -isysroot $(SIMULATORROOT)/SDKs/iPhoneSimulator$(IOSVERSION).sdk -arch i686 -c $< -o ios-x86/$@ + $(CC) $(CFLAGS) -isysroot $(SIMULATORROOT)/SDKs/iPhoneSimulator$(IOSVERSION).sdk -arch i686 -arch x86_64 -c $< -o ios-x86/$@ mkdir -p ios-arm/$(dir $@) - xcrun -sdk iphoneos $(CC) $(CFLAGS) -isysroot $(DEVICEROOT)/SDKs/iPhoneOS$(IOSVERSION).sdk -arch armv6 -arch armv7 -c $< -o ios-arm/$@ + xcrun -sdk iphoneos $(CC) $(CFLAGS) -isysroot $(DEVICEROOT)/SDKs/iPhoneOS$(IOSVERSION).sdk $(IOSARCH) -c $< -o ios-arm/$@ lipo ios-x86/$@ ios-arm/$@ -create -output $@ else diff --git a/src/leveldb/db/filename.cc b/src/leveldb/db/filename.cc index 27d750697b..da32946d99 100644 --- a/src/leveldb/db/filename.cc +++ b/src/leveldb/db/filename.cc @@ -29,19 +29,14 @@ std::string LogFileName(const std::string& name, uint64_t number) { return MakeFileName(name, number, "log"); } -// TableFileName returns the filenames we usually write to, while -// SSTTableFileName returns the alternative filenames we also try to read from -// for backward compatibility. For now, swap them around. -// TODO: when compatibility is no longer necessary, swap them back -// (TableFileName to use "ldb" and SSTTableFileName to use "sst"). std::string TableFileName(const std::string& name, uint64_t number) { assert(number > 0); - return MakeFileName(name, number, "sst"); + return MakeFileName(name, number, "ldb"); } std::string SSTTableFileName(const std::string& name, uint64_t number) { assert(number > 0); - return MakeFileName(name, number, "ldb"); + return MakeFileName(name, number, "sst"); } std::string DescriptorFileName(const std::string& dbname, uint64_t number) { diff --git a/src/leveldb/db/log_reader.cc b/src/leveldb/db/log_reader.cc index b35f115aad..4919216d04 100644 --- a/src/leveldb/db/log_reader.cc +++ b/src/leveldb/db/log_reader.cc @@ -133,7 +133,9 @@ bool Reader::ReadRecord(Slice* record, std::string* scratch) { case kEof: if (in_fragmented_record) { - ReportCorruption(scratch->size(), "partial record without end(3)"); + // This can be caused by the writer dying immediately after + // writing a physical record but before completing the next; don't + // treat it as a corruption, just ignore the entire logical record. scratch->clear(); } return false; @@ -193,13 +195,12 @@ unsigned int Reader::ReadPhysicalRecord(Slice* result) { eof_ = true; } continue; - } else if (buffer_.size() == 0) { - // End of file - return kEof; } else { - size_t drop_size = buffer_.size(); + // Note that if buffer_ is non-empty, we have a truncated header at the + // end of the file, which can be caused by the writer crashing in the + // middle of writing the header. Instead of considering this an error, + // just report EOF. buffer_.clear(); - ReportCorruption(drop_size, "truncated record at end of file"); return kEof; } } @@ -213,8 +214,14 @@ unsigned int Reader::ReadPhysicalRecord(Slice* result) { if (kHeaderSize + length > buffer_.size()) { size_t drop_size = buffer_.size(); buffer_.clear(); - ReportCorruption(drop_size, "bad record length"); - return kBadRecord; + if (!eof_) { + ReportCorruption(drop_size, "bad record length"); + return kBadRecord; + } + // If the end of the file has been reached without reading |length| bytes + // of payload, assume the writer died in the middle of writing the record. + // Don't report a corruption. + return kEof; } if (type == kZeroType && length == 0) { diff --git a/src/leveldb/db/log_test.cc b/src/leveldb/db/log_test.cc index 4c5cf87573..91d3caafc3 100644 --- a/src/leveldb/db/log_test.cc +++ b/src/leveldb/db/log_test.cc @@ -351,20 +351,32 @@ TEST(LogTest, BadRecordType) { ASSERT_EQ("OK", MatchError("unknown record type")); } -TEST(LogTest, TruncatedTrailingRecord) { +TEST(LogTest, TruncatedTrailingRecordIsIgnored) { Write("foo"); ShrinkSize(4); // Drop all payload as well as a header byte ASSERT_EQ("EOF", Read()); - ASSERT_EQ(kHeaderSize - 1, DroppedBytes()); - ASSERT_EQ("OK", MatchError("truncated record at end of file")); + // Truncated last record is ignored, not treated as an error. + ASSERT_EQ(0, DroppedBytes()); + ASSERT_EQ("", ReportMessage()); } TEST(LogTest, BadLength) { + const int kPayloadSize = kBlockSize - kHeaderSize; + Write(BigString("bar", kPayloadSize)); + Write("foo"); + // Least significant size byte is stored in header[4]. + IncrementByte(4, 1); + ASSERT_EQ("foo", Read()); + ASSERT_EQ(kBlockSize, DroppedBytes()); + ASSERT_EQ("OK", MatchError("bad record length")); +} + +TEST(LogTest, BadLengthAtEndIsIgnored) { Write("foo"); ShrinkSize(1); ASSERT_EQ("EOF", Read()); - ASSERT_EQ(kHeaderSize + 2, DroppedBytes()); - ASSERT_EQ("OK", MatchError("bad record length")); + ASSERT_EQ(0, DroppedBytes()); + ASSERT_EQ("", ReportMessage()); } TEST(LogTest, ChecksumMismatch) { @@ -415,6 +427,24 @@ TEST(LogTest, UnexpectedFirstType) { ASSERT_EQ("OK", MatchError("partial record without end")); } +TEST(LogTest, MissingLastIsIgnored) { + Write(BigString("bar", kBlockSize)); + // Remove the LAST block, including header. + ShrinkSize(14); + ASSERT_EQ("EOF", Read()); + ASSERT_EQ("", ReportMessage()); + ASSERT_EQ(0, DroppedBytes()); +} + +TEST(LogTest, PartialLastIsIgnored) { + Write(BigString("bar", kBlockSize)); + // Cause a bad record length in the LAST block. + ShrinkSize(1); + ASSERT_EQ("EOF", Read()); + ASSERT_EQ("", ReportMessage()); + ASSERT_EQ(0, DroppedBytes()); +} + TEST(LogTest, ErrorJoinsRecords) { // Consider two fragmented records: // first(R1) last(R1) first(R2) last(R2) diff --git a/src/leveldb/db/repair.cc b/src/leveldb/db/repair.cc index 96c9b37af1..7727fafc58 100644 --- a/src/leveldb/db/repair.cc +++ b/src/leveldb/db/repair.cc @@ -242,7 +242,6 @@ class Repairer { } void ExtractMetaData() { - std::vector<TableInfo> kept; for (size_t i = 0; i < table_numbers_.size(); i++) { ScanTable(table_numbers_[i]); } diff --git a/src/leveldb/db/version_set.cc b/src/leveldb/db/version_set.cc index 517edd3b18..aa83df55e4 100644 --- a/src/leveldb/db/version_set.cc +++ b/src/leveldb/db/version_set.cc @@ -54,20 +54,6 @@ static int64_t TotalFileSize(const std::vector<FileMetaData*>& files) { return sum; } -namespace { -std::string IntSetToString(const std::set<uint64_t>& s) { - std::string result = "{"; - for (std::set<uint64_t>::const_iterator it = s.begin(); - it != s.end(); - ++it) { - result += (result.size() > 1) ? "," : ""; - result += NumberToString(*it); - } - result += "}"; - return result; -} -} // namespace - Version::~Version() { assert(refs_ == 0); diff --git a/src/leveldb/include/leveldb/c.h b/src/leveldb/include/leveldb/c.h index 1fa58866c3..1048fe3b86 100644 --- a/src/leveldb/include/leveldb/c.h +++ b/src/leveldb/include/leveldb/c.h @@ -9,7 +9,6 @@ Does not support: . getters for the option types . custom comparators that implement key shortening - . capturing post-write-snapshot . custom iter, db, env, cache implementations using just the C bindings Some conventions: diff --git a/src/leveldb/include/leveldb/db.h b/src/leveldb/include/leveldb/db.h index 5ffb29d526..40851b2aa8 100644 --- a/src/leveldb/include/leveldb/db.h +++ b/src/leveldb/include/leveldb/db.h @@ -14,7 +14,7 @@ namespace leveldb { // Update Makefile if you change these static const int kMajorVersion = 1; -static const int kMinorVersion = 15; +static const int kMinorVersion = 17; struct Options; struct ReadOptions; diff --git a/src/leveldb/include/leveldb/slice.h b/src/leveldb/include/leveldb/slice.h index 74ea8fa49a..bc367986f7 100644 --- a/src/leveldb/include/leveldb/slice.h +++ b/src/leveldb/include/leveldb/slice.h @@ -94,7 +94,7 @@ inline bool operator!=(const Slice& x, const Slice& y) { } inline int Slice::compare(const Slice& b) const { - const int min_len = (size_ < b.size_) ? size_ : b.size_; + const size_t min_len = (size_ < b.size_) ? size_ : b.size_; int r = memcmp(data_, b.data_, min_len); if (r == 0) { if (size_ < b.size_) r = -1; diff --git a/src/main.cpp b/src/main.cpp index 4b0e3af649..3bed4fdc44 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -430,7 +430,7 @@ bool AddOrphanTx(const CTransaction& tx) BOOST_FOREACH(const CTxIn& txin, tx.vin) mapOrphanTransactionsByPrev[txin.prevout.hash].insert(hash); - LogPrint("mempool", "stored orphan tx %s (mapsz %"PRIszu")\n", hash.ToString(), + LogPrint("mempool", "stored orphan tx %s (mapsz %u)\n", hash.ToString(), mapOrphanTransactions.size()); return true; } @@ -3154,7 +3154,7 @@ void PrintBlockTree() // print item CBlock block; ReadBlockFromDisk(block, pindex); - LogPrintf("%d (blk%05u.dat:0x%x) %s tx %"PRIszu"\n", + LogPrintf("%d (blk%05u.dat:0x%x) %s tx %u\n", pindex->nHeight, pindex->GetBlockPos().nFile, pindex->GetBlockPos().nPos, DateTimeStrFormat("%Y-%m-%d %H:%M:%S", block.GetBlockTime()), @@ -3481,7 +3481,7 @@ void static ProcessGetData(CNode* pfrom) bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv) { RandAddSeedPerfmon(); - LogPrint("net", "received: %s (%"PRIszu" bytes)\n", strCommand, vRecv.size()); + LogPrint("net", "received: %s (%u bytes)\n", strCommand, vRecv.size()); if (mapArgs.count("-dropmessagestest") && GetRand(atoi(mapArgs["-dropmessagestest"])) == 0) { LogPrintf("dropmessagestest DROPPING RECV MESSAGE\n"); @@ -3622,7 +3622,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv) if (vAddr.size() > 1000) { Misbehaving(pfrom->GetId(), 20); - return error("message addr size() = %"PRIszu"", vAddr.size()); + return error("message addr size() = %u", vAddr.size()); } // Store the new addresses @@ -3685,7 +3685,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv) if (vInv.size() > MAX_INV_SZ) { Misbehaving(pfrom->GetId(), 20); - return error("message inv size() = %"PRIszu"", vInv.size()); + return error("message inv size() = %u", vInv.size()); } LOCK(cs_main); @@ -3724,11 +3724,11 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv) if (vInv.size() > MAX_INV_SZ) { Misbehaving(pfrom->GetId(), 20); - return error("message getdata size() = %"PRIszu"", vInv.size()); + return error("message getdata size() = %u", vInv.size()); } if (fDebug || (vInv.size() != 1)) - LogPrint("net", "received getdata (%"PRIszu" invsz)\n", vInv.size()); + LogPrint("net", "received getdata (%u invsz)\n", vInv.size()); if ((fDebug && vInv.size() > 0) || (vInv.size() == 1)) LogPrint("net", "received getdata for: %s\n", vInv[0].ToString()); @@ -3836,7 +3836,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv) vEraseQueue.push_back(inv.hash); - LogPrint("mempool", "AcceptToMemoryPool: %s %s : accepted %s (poolsz %"PRIszu")\n", + LogPrint("mempool", "AcceptToMemoryPool: %s %s : accepted %s (poolsz %u)\n", pfrom->addr.ToString(), pfrom->cleanSubVer, tx.GetHash().ToString(), mempool.mapTx.size()); @@ -4021,7 +4021,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv) } if (!(sProblem.empty())) { - LogPrint("net", "pong %s %s: %s, %x expected, %x received, %"PRIszu" bytes\n", + LogPrint("net", "pong %s %s: %s, %x expected, %x received, %u bytes\n", pfrom->addr.ToString(), pfrom->cleanSubVer, sProblem, @@ -4156,7 +4156,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv) bool ProcessMessages(CNode* pfrom) { //if (fDebug) - // LogPrintf("ProcessMessages(%"PRIszu" messages)\n", pfrom->vRecvMsg.size()); + // LogPrintf("ProcessMessages(%u messages)\n", pfrom->vRecvMsg.size()); // // Message format @@ -4184,7 +4184,7 @@ bool ProcessMessages(CNode* pfrom) CNetMessage& msg = *it; //if (fDebug) - // LogPrintf("ProcessMessages(message %u msgsz, %"PRIszu" bytes, complete:%s)\n", + // LogPrintf("ProcessMessages(message %u msgsz, %u bytes, complete:%s)\n", // msg.hdr.nMessageSize, msg.vRecv.size(), // msg.complete() ? "Y" : "N"); diff --git a/src/miner.cpp b/src/miner.cpp index 50be4fad40..94fc8e3888 100644 --- a/src/miner.cpp +++ b/src/miner.cpp @@ -531,7 +531,7 @@ void static BitcoinMiner(CWallet *pwallet) CBlock *pblock = &pblocktemplate->block; IncrementExtraNonce(pblock, pindexPrev, nExtraNonce); - LogPrintf("Running BitcoinMiner with %"PRIszu" transactions in block (%u bytes)\n", pblock->vtx.size(), + LogPrintf("Running BitcoinMiner with %u transactions in block (%u bytes)\n", pblock->vtx.size(), ::GetSerializeSize(*pblock, SER_NETWORK, PROTOCOL_VERSION)); // diff --git a/src/qt/Makefile.am b/src/qt/Makefile.am index 8ec1ae2583..648971bd8f 100644 --- a/src/qt/Makefile.am +++ b/src/qt/Makefile.am @@ -57,6 +57,7 @@ QT_TS = \ locale/bitcoin_la.ts \ locale/bitcoin_lt.ts \ locale/bitcoin_lv_LV.ts \ + locale/bitcoin_mn.ts \ locale/bitcoin_ms_MY.ts \ locale/bitcoin_nb.ts \ locale/bitcoin_nl.ts \ diff --git a/src/qt/bitcoin.cpp b/src/qt/bitcoin.cpp index 31716ab825..45d7a52889 100644 --- a/src/qt/bitcoin.cpp +++ b/src/qt/bitcoin.cpp @@ -459,6 +459,8 @@ WId BitcoinApplication::getMainWinId() const #ifndef BITCOIN_QT_TEST int main(int argc, char *argv[]) { + SetupEnvironment(); + /// 1. Parse command-line options. These take precedence over anything else. // Command-line options take precedence: ParseParameters(argc, argv); diff --git a/src/qt/bitcoin.qrc b/src/qt/bitcoin.qrc index 75078581ce..e1c739b022 100644 --- a/src/qt/bitcoin.qrc +++ b/src/qt/bitcoin.qrc @@ -130,6 +130,7 @@ <file alias="la">locale/bitcoin_la.qm</file> <file alias="lt">locale/bitcoin_lt.qm</file> <file alias="lv_LV">locale/bitcoin_lv_LV.qm</file> + <file alias="mn">locale/bitcoin_mn.qm</file> <file alias="ms_MY">locale/bitcoin_ms_MY.qm</file> <file alias="nb">locale/bitcoin_nb.qm</file> <file alias="nl">locale/bitcoin_nl.qm</file> diff --git a/src/qt/locale/bitcoin_ach.ts b/src/qt/locale/bitcoin_ach.ts index cfe916093b..de5619bfc0 100644 --- a/src/qt/locale/bitcoin_ach.ts +++ b/src/qt/locale/bitcoin_ach.ts @@ -1,4 +1,4 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="ach" version="2.0"> +<?xml version="1.0" ?><!DOCTYPE TS><TS language="ach" version="2.1"> <context> <name>AboutDialog</name> <message> @@ -1039,6 +1039,14 @@ Address: %4 <translation type="unfinished"/> </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 type="unfinished"/> + </message> + <message> + <source>Third party transaction URLs</source> + <translation type="unfinished"/> + </message> + <message> <source>Active command-line options that override above options:</source> <translation type="unfinished"/> </message> @@ -1340,7 +1348,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <source>Bitcoin Core did't yet exit safely...</source> + <source>Bitcoin Core didn't yet exit safely...</source> <translation type="unfinished"/> </message> <message> diff --git a/src/qt/locale/bitcoin_af_ZA.ts b/src/qt/locale/bitcoin_af_ZA.ts index a1f1abde69..80e4de010f 100644 --- a/src/qt/locale/bitcoin_af_ZA.ts +++ b/src/qt/locale/bitcoin_af_ZA.ts @@ -1,4 +1,4 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="af_ZA" version="2.0"> +<?xml version="1.0" ?><!DOCTYPE TS><TS language="af_ZA" version="2.1"> <context> <name>AboutDialog</name> <message> @@ -1039,6 +1039,14 @@ Address: %4 <translation type="unfinished"/> </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 type="unfinished"/> + </message> + <message> + <source>Third party transaction URLs</source> + <translation type="unfinished"/> + </message> + <message> <source>Active command-line options that override above options:</source> <translation type="unfinished"/> </message> @@ -1340,7 +1348,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <source>Bitcoin Core did't yet exit safely...</source> + <source>Bitcoin Core didn't yet exit safely...</source> <translation type="unfinished"/> </message> <message> diff --git a/src/qt/locale/bitcoin_ar.ts b/src/qt/locale/bitcoin_ar.ts index daf09183c4..32b0d4b0fc 100644 --- a/src/qt/locale/bitcoin_ar.ts +++ b/src/qt/locale/bitcoin_ar.ts @@ -1,4 +1,4 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="ar" version="2.0"> +<?xml version="1.0" ?><!DOCTYPE TS><TS language="ar" version="2.1"> <context> <name>AboutDialog</name> <message> @@ -1042,6 +1042,14 @@ Address: %4 <translation type="unfinished"/> </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 type="unfinished"/> + </message> + <message> + <source>Third party transaction URLs</source> + <translation type="unfinished"/> + </message> + <message> <source>Active command-line options that override above options:</source> <translation type="unfinished"/> </message> @@ -1343,7 +1351,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <source>Bitcoin Core did't yet exit safely...</source> + <source>Bitcoin Core didn't yet exit safely...</source> <translation type="unfinished"/> </message> <message> diff --git a/src/qt/locale/bitcoin_be_BY.ts b/src/qt/locale/bitcoin_be_BY.ts index f7beb808d1..c384aa6d2d 100644 --- a/src/qt/locale/bitcoin_be_BY.ts +++ b/src/qt/locale/bitcoin_be_BY.ts @@ -1,4 +1,4 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="be_BY" version="2.0"> +<?xml version="1.0" ?><!DOCTYPE TS><TS language="be_BY" version="2.1"> <context> <name>AboutDialog</name> <message> @@ -1043,6 +1043,14 @@ Address: %4 <translation type="unfinished"/> </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 type="unfinished"/> + </message> + <message> + <source>Third party transaction URLs</source> + <translation type="unfinished"/> + </message> + <message> <source>Active command-line options that override above options:</source> <translation type="unfinished"/> </message> @@ -1344,7 +1352,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <source>Bitcoin Core did't yet exit safely...</source> + <source>Bitcoin Core didn't yet exit safely...</source> <translation type="unfinished"/> </message> <message> diff --git a/src/qt/locale/bitcoin_bg.ts b/src/qt/locale/bitcoin_bg.ts index 6b94dc8978..367e223784 100644 --- a/src/qt/locale/bitcoin_bg.ts +++ b/src/qt/locale/bitcoin_bg.ts @@ -1,4 +1,4 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="bg" version="2.0"> +<?xml version="1.0" ?><!DOCTYPE TS><TS language="bg" version="2.1"> <context> <name>AboutDialog</name> <message> @@ -1044,6 +1044,14 @@ Address: %4 <translation type="unfinished"/> </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 type="unfinished"/> + </message> + <message> + <source>Third party transaction URLs</source> + <translation type="unfinished"/> + </message> + <message> <source>Active command-line options that override above options:</source> <translation type="unfinished"/> </message> @@ -1345,7 +1353,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <source>Bitcoin Core did't yet exit safely...</source> + <source>Bitcoin Core didn't yet exit safely...</source> <translation type="unfinished"/> </message> <message> diff --git a/src/qt/locale/bitcoin_bs.ts b/src/qt/locale/bitcoin_bs.ts index 01c37b0278..2ec28af777 100644 --- a/src/qt/locale/bitcoin_bs.ts +++ b/src/qt/locale/bitcoin_bs.ts @@ -1,4 +1,4 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="bs" version="2.0"> +<?xml version="1.0" ?><!DOCTYPE TS><TS language="bs" version="2.1"> <context> <name>AboutDialog</name> <message> @@ -1039,6 +1039,14 @@ Address: %4 <translation type="unfinished"/> </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 type="unfinished"/> + </message> + <message> + <source>Third party transaction URLs</source> + <translation type="unfinished"/> + </message> + <message> <source>Active command-line options that override above options:</source> <translation type="unfinished"/> </message> @@ -1340,7 +1348,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <source>Bitcoin Core did't yet exit safely...</source> + <source>Bitcoin Core didn't yet exit safely...</source> <translation type="unfinished"/> </message> <message> diff --git a/src/qt/locale/bitcoin_ca.ts b/src/qt/locale/bitcoin_ca.ts index 592cb337d5..c225967cac 100644 --- a/src/qt/locale/bitcoin_ca.ts +++ b/src/qt/locale/bitcoin_ca.ts @@ -1,4 +1,4 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="ca" version="2.0"> +<?xml version="1.0" ?><!DOCTYPE TS><TS language="ca" version="2.1"> <context> <name>AboutDialog</name> <message> @@ -1039,6 +1039,14 @@ Address: %4 <translation type="unfinished"/> </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 type="unfinished"/> + </message> + <message> + <source>Third party transaction URLs</source> + <translation type="unfinished"/> + </message> + <message> <source>Active command-line options that override above options:</source> <translation type="unfinished"/> </message> @@ -1340,7 +1348,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <source>Bitcoin Core did't yet exit safely...</source> + <source>Bitcoin Core didn't yet exit safely...</source> <translation type="unfinished"/> </message> <message> diff --git a/src/qt/locale/bitcoin_ca@valencia.ts b/src/qt/locale/bitcoin_ca@valencia.ts index 053cc82ebb..b36d6b7d67 100644 --- a/src/qt/locale/bitcoin_ca@valencia.ts +++ b/src/qt/locale/bitcoin_ca@valencia.ts @@ -1,4 +1,4 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="ca@valencia" version="2.0"> +<?xml version="1.0" ?><!DOCTYPE TS><TS language="ca@valencia" version="2.1"> <context> <name>AboutDialog</name> <message> @@ -1039,6 +1039,14 @@ Address: %4 <translation type="unfinished"/> </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 type="unfinished"/> + </message> + <message> + <source>Third party transaction URLs</source> + <translation type="unfinished"/> + </message> + <message> <source>Active command-line options that override above options:</source> <translation type="unfinished"/> </message> @@ -1340,7 +1348,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <source>Bitcoin Core did't yet exit safely...</source> + <source>Bitcoin Core didn't yet exit safely...</source> <translation type="unfinished"/> </message> <message> diff --git a/src/qt/locale/bitcoin_ca_ES.ts b/src/qt/locale/bitcoin_ca_ES.ts index f01e48a435..5bf7fbfba7 100644 --- a/src/qt/locale/bitcoin_ca_ES.ts +++ b/src/qt/locale/bitcoin_ca_ES.ts @@ -1,4 +1,4 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="ca_ES" version="2.0"> +<?xml version="1.0" ?><!DOCTYPE TS><TS language="ca_ES" version="2.1"> <context> <name>AboutDialog</name> <message> @@ -1039,6 +1039,14 @@ Address: %4 <translation type="unfinished"/> </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 type="unfinished"/> + </message> + <message> + <source>Third party transaction URLs</source> + <translation type="unfinished"/> + </message> + <message> <source>Active command-line options that override above options:</source> <translation type="unfinished"/> </message> @@ -1340,7 +1348,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <source>Bitcoin Core did't yet exit safely...</source> + <source>Bitcoin Core didn't yet exit safely...</source> <translation type="unfinished"/> </message> <message> diff --git a/src/qt/locale/bitcoin_cmn.ts b/src/qt/locale/bitcoin_cmn.ts index 402ce7cb10..696cbedd0a 100644 --- a/src/qt/locale/bitcoin_cmn.ts +++ b/src/qt/locale/bitcoin_cmn.ts @@ -1,4 +1,4 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="cmn" version="2.0"> +<?xml version="1.0" ?><!DOCTYPE TS><TS language="cmn" version="2.1"> <context> <name>AboutDialog</name> <message> @@ -1039,6 +1039,14 @@ Address: %4 <translation type="unfinished"/> </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 type="unfinished"/> + </message> + <message> + <source>Third party transaction URLs</source> + <translation type="unfinished"/> + </message> + <message> <source>Active command-line options that override above options:</source> <translation type="unfinished"/> </message> @@ -1340,7 +1348,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <source>Bitcoin Core did't yet exit safely...</source> + <source>Bitcoin Core didn't yet exit safely...</source> <translation type="unfinished"/> </message> <message> diff --git a/src/qt/locale/bitcoin_cs.ts b/src/qt/locale/bitcoin_cs.ts index f77e7f34db..ba4d2def35 100644 --- a/src/qt/locale/bitcoin_cs.ts +++ b/src/qt/locale/bitcoin_cs.ts @@ -1,4 +1,4 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="cs" version="2.0"> +<?xml version="1.0" ?><!DOCTYPE TS><TS language="cs" version="2.1"> <context> <name>AboutDialog</name> <message> @@ -333,7 +333,7 @@ Tento produkt zahrnuje programy vyvinuté OpenSSL Projektem pro použití v Open </message> <message> <source>Open &URI...</source> - <translation type="unfinished"/> + <translation>Načíst &URI...</translation> </message> <message> <source>Importing blocks from disk...</source> @@ -433,7 +433,7 @@ Tento produkt zahrnuje programy vyvinuté OpenSSL Projektem pro použití v Open </message> <message> <source>Request payments (generates QR codes and bitcoin: URIs)</source> - <translation type="unfinished"/> + <translation>Požaduj platby (generuje QR kódy a bitcoin: URI)</translation> </message> <message> <source>&About Bitcoin Core</source> @@ -441,15 +441,15 @@ Tento produkt zahrnuje programy vyvinuté OpenSSL Projektem pro použití v Open </message> <message> <source>Show the list of used sending addresses and labels</source> - <translation type="unfinished"/> + <translation>Ukaž seznam použitých odesílacích adres a jejich označení</translation> </message> <message> <source>Show the list of used receiving addresses and labels</source> - <translation type="unfinished"/> + <translation>Ukaž seznam použitých přijímacích adres a jejich označení</translation> </message> <message> <source>Open a bitcoin: URI or payment request</source> - <translation type="unfinished"/> + <translation>Načti bitcoin: URI nebo platební požadavek</translation> </message> <message> <source>&Command-line options</source> @@ -457,7 +457,7 @@ Tento produkt zahrnuje programy vyvinuté OpenSSL Projektem pro použití v Open </message> <message> <source>Show the Bitcoin Core help message to get a list with possible Bitcoin command-line options</source> - <translation>Seznam argumentů Bitcoinu pro příkazovou řádku získáš v nápovědě Bitcoinu Core.</translation> + <translation>Seznam argumentů Bitcoinu pro příkazovou řádku získáš v nápovědě Bitcoinu Core</translation> </message> <message> <source>Bitcoin client</source> @@ -497,7 +497,7 @@ Tento produkt zahrnuje programy vyvinuté OpenSSL Projektem pro použití v Open </message> <message numerus="yes"> <source>%n year(s)</source> - <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> + <translation><numerusform>rok</numerusform><numerusform>%n roky</numerusform><numerusform>%n roků</numerusform></translation> </message> <message> <source>%1 behind</source> @@ -579,7 +579,7 @@ Adresa: %4 </message> <message> <source>Quantity:</source> - <translation type="unfinished"/> + <translation>Počet:</translation> </message> <message> <source>Bytes:</source> @@ -599,11 +599,11 @@ Adresa: %4 </message> <message> <source>Low Output:</source> - <translation type="unfinished"/> + <translation>Malý výstup:</translation> </message> <message> <source>After Fee:</source> - <translation type="unfinished"/> + <translation>Čistá částka:</translation> </message> <message> <source>Change:</source> @@ -611,15 +611,15 @@ Adresa: %4 </message> <message> <source>(un)select all</source> - <translation type="unfinished"/> + <translation>(od)označit všechny</translation> </message> <message> <source>Tree mode</source> - <translation type="unfinished"/> + <translation>Zobrazit jako strom</translation> </message> <message> <source>List mode</source> - <translation type="unfinished"/> + <translation>Vypsat jako seznam</translation> </message> <message> <source>Amount</source> @@ -663,15 +663,15 @@ Adresa: %4 </message> <message> <source>Lock unspent</source> - <translation type="unfinished"/> + <translation>Zamkni neutracené</translation> </message> <message> <source>Unlock unspent</source> - <translation type="unfinished"/> + <translation>Odemkni k utracení</translation> </message> <message> <source>Copy quantity</source> - <translation type="unfinished"/> + <translation>Kopíruj počet</translation> </message> <message> <source>Copy fee</source> @@ -679,7 +679,7 @@ Adresa: %4 </message> <message> <source>Copy after fee</source> - <translation type="unfinished"/> + <translation>Kopíruj čistou částku</translation> </message> <message> <source>Copy bytes</source> @@ -691,7 +691,7 @@ Adresa: %4 </message> <message> <source>Copy low output</source> - <translation type="unfinished"/> + <translation>Kopíruj malý výstup</translation> </message> <message> <source>Copy change</source> @@ -699,47 +699,47 @@ Adresa: %4 </message> <message> <source>highest</source> - <translation type="unfinished"/> + <translation>nejvyšší</translation> </message> <message> <source>higher</source> - <translation type="unfinished"/> + <translation>vyšší</translation> </message> <message> <source>high</source> - <translation type="unfinished"/> + <translation>vysoká</translation> </message> <message> <source>medium-high</source> - <translation type="unfinished"/> + <translation>vyšší střední</translation> </message> <message> <source>medium</source> - <translation type="unfinished"/> + <translation>střední</translation> </message> <message> <source>low-medium</source> - <translation type="unfinished"/> + <translation>nižší střední</translation> </message> <message> <source>low</source> - <translation type="unfinished"/> + <translation>nízká</translation> </message> <message> <source>lower</source> - <translation type="unfinished"/> + <translation>nižší</translation> </message> <message> <source>lowest</source> - <translation type="unfinished"/> + <translation>nejnižší</translation> </message> <message> <source>(%1 locked)</source> - <translation type="unfinished"/> + <translation>(%1 zamčeno)</translation> </message> <message> <source>none</source> - <translation type="unfinished"/> + <translation>žádná</translation> </message> <message> <source>Dust</source> @@ -747,11 +747,11 @@ Adresa: %4 </message> <message> <source>yes</source> - <translation type="unfinished"/> + <translation>ano</translation> </message> <message> <source>no</source> - <translation type="unfinished"/> + <translation>ne</translation> </message> <message> <source>This label turns red, if the transaction size is greater than 1000 bytes.</source> @@ -759,11 +759,11 @@ Adresa: %4 </message> <message> <source>This means a fee of at least %1 per kB is required.</source> - <translation type="unfinished"/> + <translation>To znamená, že je vyžadován poplatek alespoň %1 za kB.</translation> </message> <message> <source>Can vary +/- 1 byte per input.</source> - <translation type="unfinished"/> + <translation>Může se lišit o +/– 1 bajt na každý vstup.</translation> </message> <message> <source>Transactions with higher priority are more likely to get included into a block.</source> @@ -1048,6 +1048,14 @@ Adresa: %4 <translation>IP adresa proxy (např. IPv4: 127.0.0.1/IPv6: ::1)</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 type="unfinished"/> + </message> + <message> + <source>Third party transaction URLs</source> + <translation type="unfinished"/> + </message> + <message> <source>Active command-line options that override above options:</source> <translation type="unfinished"/> </message> @@ -1181,7 +1189,7 @@ Adresa: %4 </message> <message> <source>none</source> - <translation type="unfinished"/> + <translation>žádná</translation> </message> <message> <source>Confirm options reset</source> @@ -1189,7 +1197,7 @@ Adresa: %4 </message> <message> <source>Client restart required to activate changes.</source> - <translation type="unfinished"/> + <translation>K aktivaci změn je potřeba restartovat klienta.</translation> </message> <message> <source>Client will be shutdown, do you want to proceed?</source> @@ -1291,7 +1299,7 @@ Adresa: %4 </message> <message> <source>Payment request fetch URL is invalid: %1</source> - <translation type="unfinished"/> + <translation>Zdrojová URL platebního požadavku není platná: %1</translation> </message> <message> <source>Payment request file handling</source> @@ -1303,7 +1311,7 @@ Adresa: %4 </message> <message> <source>Unverified payment requests to custom payment scripts are unsupported.</source> - <translation type="unfinished"/> + <translation>Neověřené platební požadavky k uživatelským platebním skriptům nejsou podporované.</translation> </message> <message> <source>Refund from %1</source> @@ -1349,7 +1357,7 @@ Adresa: %4 <translation>Chyba: Neplatná kombinace -regtest a -testnet.</translation> </message> <message> - <source>Bitcoin Core did't yet exit safely...</source> + <source>Bitcoin Core didn't yet exit safely...</source> <translation>Bitcoin Core ještě bezpečně neskončil...</translation> </message> <message> @@ -1614,15 +1622,15 @@ Adresa: %4 </message> <message> <source>Copy &URI</source> - <translation type="unfinished"/> + <translation>Kopíruj &URI</translation> </message> <message> <source>Copy &Address</source> - <translation type="unfinished"/> + <translation>Kopíruj &adresu</translation> </message> <message> <source>&Save Image...</source> - <translation>&Ulož Obrázek...</translation> + <translation>&Ulož obrázek...</translation> </message> <message> <source>Request payment to %1</source> @@ -1630,7 +1638,7 @@ Adresa: %4 </message> <message> <source>Payment information</source> - <translation type="unfinished"/> + <translation>Informace o platbě</translation> </message> <message> <source>URI</source> @@ -1712,11 +1720,11 @@ Adresa: %4 </message> <message> <source>Insufficient funds!</source> - <translation type="unfinished"/> + <translation>Nedostatek prostředků!</translation> </message> <message> <source>Quantity:</source> - <translation type="unfinished"/> + <translation>Počet:</translation> </message> <message> <source>Bytes:</source> @@ -1736,11 +1744,11 @@ Adresa: %4 </message> <message> <source>Low Output:</source> - <translation type="unfinished"/> + <translation>Malý výstup:</translation> </message> <message> <source>After Fee:</source> - <translation type="unfinished"/> + <translation>Čistá částka:</translation> </message> <message> <source>Change:</source> @@ -1792,7 +1800,7 @@ Adresa: %4 </message> <message> <source>Copy quantity</source> - <translation type="unfinished"/> + <translation>Kopíruj počet</translation> </message> <message> <source>Copy amount</source> @@ -1804,7 +1812,7 @@ Adresa: %4 </message> <message> <source>Copy after fee</source> - <translation type="unfinished"/> + <translation>Kopíruj čistou částku</translation> </message> <message> <source>Copy bytes</source> @@ -1816,7 +1824,7 @@ Adresa: %4 </message> <message> <source>Copy low output</source> - <translation type="unfinished"/> + <translation>Kopíruj malý výstup</translation> </message> <message> <source>Copy change</source> @@ -1824,7 +1832,7 @@ Adresa: %4 </message> <message> <source>Total Amount %1 (= %2)</source> - <translation type="unfinished"/> + <translation>Celková částka %1 (= %2)</translation> </message> <message> <source>or</source> @@ -1876,11 +1884,11 @@ Adresa: %4 </message> <message> <source>added as transaction fee</source> - <translation type="unfinished"/> + <translation>přidán jako transakční poplatek</translation> </message> <message> <source>Payment request expired</source> - <translation type="unfinished"/> + <translation>Platební požadavek vypršel</translation> </message> <message> <source>Invalid payment address %1</source> @@ -1911,7 +1919,7 @@ Adresa: %4 </message> <message> <source>Choose previously used address</source> - <translation type="unfinished"/> + <translation>Vyber již použitou adresu</translation> </message> <message> <source>This is a normal payment.</source> @@ -1955,7 +1963,7 @@ Adresa: %4 </message> <message> <source>Pay To:</source> - <translation type="unfinished"/> + <translation>Komu:</translation> </message> <message> <source>Memo:</source> @@ -1993,7 +2001,7 @@ Adresa: %4 </message> <message> <source>Choose previously used address</source> - <translation type="unfinished"/> + <translation>Vyber již použitou adresu</translation> </message> <message> <source>Alt+A</source> @@ -2823,7 +2831,7 @@ například: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <source>Connect through SOCKS proxy</source> - <translation type="unfinished"/> + <translation>Připojit se přes SOCKS proxy</translation> </message> <message> <source>Connect to JSON-RPC on <port> (default: 8332 or testnet: 18332)</source> @@ -2831,7 +2839,7 @@ například: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <source>Connection options:</source> - <translation type="unfinished"/> + <translation>Možnosti připojení:</translation> </message> <message> <source>Corrupted block database detected</source> @@ -2839,7 +2847,7 @@ například: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <source>Debugging/Testing options:</source> - <translation type="unfinished"/> + <translation>Možnosti ladění/testování:</translation> </message> <message> <source>Disable safemode, override a real safe mode event (default: 0)</source> @@ -2851,7 +2859,7 @@ například: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <source>Do not load the wallet and disable wallet RPC calls</source> - <translation type="unfinished"/> + <translation>Nenačítat peněženku a vypnout její RPC volání</translation> </message> <message> <source>Do you want to rebuild the block database now?</source> @@ -3035,7 +3043,7 @@ například: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <source>Wallet options:</source> - <translation type="unfinished"/> + <translation>Možnosti peněženky:</translation> </message> <message> <source>Warning: Deprecated argument -debugnet ignored, use -debug=net</source> diff --git a/src/qt/locale/bitcoin_cy.ts b/src/qt/locale/bitcoin_cy.ts index b7624f07f2..d2f41739cb 100644 --- a/src/qt/locale/bitcoin_cy.ts +++ b/src/qt/locale/bitcoin_cy.ts @@ -1,4 +1,4 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="cy" version="2.0"> +<?xml version="1.0" ?><!DOCTYPE TS><TS language="cy" version="2.1"> <context> <name>AboutDialog</name> <message> @@ -1039,6 +1039,14 @@ Address: %4 <translation type="unfinished"/> </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 type="unfinished"/> + </message> + <message> + <source>Third party transaction URLs</source> + <translation type="unfinished"/> + </message> + <message> <source>Active command-line options that override above options:</source> <translation type="unfinished"/> </message> @@ -1340,7 +1348,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <source>Bitcoin Core did't yet exit safely...</source> + <source>Bitcoin Core didn't yet exit safely...</source> <translation type="unfinished"/> </message> <message> diff --git a/src/qt/locale/bitcoin_da.ts b/src/qt/locale/bitcoin_da.ts index 3d89d2e5c5..442a86b7c0 100644 --- a/src/qt/locale/bitcoin_da.ts +++ b/src/qt/locale/bitcoin_da.ts @@ -1,4 +1,4 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="da" version="2.0"> +<?xml version="1.0" ?><!DOCTYPE TS><TS language="da" version="2.1"> <context> <name>AboutDialog</name> <message> @@ -96,11 +96,11 @@ Produktet indeholder software som er udviklet af OpenSSL Project til brug i Open </message> <message> <source>Sending addresses</source> - <translation type="unfinished"/> + <translation>Afsendelsesadresser</translation> </message> <message> <source>Receiving addresses</source> - <translation type="unfinished"/> + <translation>Modtagelsesadresser</translation> </message> <message> <source>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source> @@ -325,11 +325,11 @@ Produktet indeholder software som er udviklet af OpenSSL Project til brug i Open </message> <message> <source>&Sending addresses...</source> - <translation type="unfinished"/> + <translation>&Afsendelsesadresser...</translation> </message> <message> <source>&Receiving addresses...</source> - <translation type="unfinished"/> + <translation>&Modtagelsesadresser...</translation> </message> <message> <source>Open &URI...</source> @@ -1048,6 +1048,14 @@ Adresse: %4 <translation type="unfinished"/> </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 type="unfinished"/> + </message> + <message> + <source>Third party transaction URLs</source> + <translation type="unfinished"/> + </message> + <message> <source>Active command-line options that override above options:</source> <translation type="unfinished"/> </message> @@ -1349,7 +1357,7 @@ Adresse: %4 <translation type="unfinished"/> </message> <message> - <source>Bitcoin Core did't yet exit safely...</source> + <source>Bitcoin Core didn't yet exit safely...</source> <translation type="unfinished"/> </message> <message> diff --git a/src/qt/locale/bitcoin_de.ts b/src/qt/locale/bitcoin_de.ts index 7f7e505e1d..888b48c251 100644 --- a/src/qt/locale/bitcoin_de.ts +++ b/src/qt/locale/bitcoin_de.ts @@ -1,4 +1,4 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="de" version="2.0"> +<?xml version="1.0" ?><!DOCTYPE TS><TS language="de" version="2.1"> <context> <name>AboutDialog</name> <message> @@ -1047,6 +1047,14 @@ Adresse: %4</translation> <translation>IP-Adresse des Proxies (z.B. IPv4: 127.0.0.1 / IPv6: ::1)</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>Externe URLs (z.B. ein Block-Explorer), die im Kontextmenü des Transaktionsverlaufs eingefügt werden. In der URL wird %s durch den Transaktionshash ersetzt. Bei Angabe mehrerer URLs müssen diese durch "|" voneinander getrennt werden.</translation> + </message> + <message> + <source>Third party transaction URLs</source> + <translation>Externe Transaktions-URLs</translation> + </message> + <message> <source>Active command-line options that override above options:</source> <translation>Aktive Kommandozeilenoptionen, die obige Konfiguration überschreiben:</translation> </message> @@ -1348,7 +1356,7 @@ Adresse: %4</translation> <translation>Fehler: Ungültige Kombination von -regtest und -testnet.</translation> </message> <message> - <source>Bitcoin Core did't yet exit safely...</source> + <source>Bitcoin Core didn't yet exit safely...</source> <translation>Bitcoin Core wurde noch nicht sicher beendet...</translation> </message> <message> diff --git a/src/qt/locale/bitcoin_el_GR.ts b/src/qt/locale/bitcoin_el_GR.ts index d13b974b8c..687947e3b9 100644 --- a/src/qt/locale/bitcoin_el_GR.ts +++ b/src/qt/locale/bitcoin_el_GR.ts @@ -1,4 +1,4 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="el_GR" version="2.0"> +<?xml version="1.0" ?><!DOCTYPE TS><TS language="el_GR" version="2.1"> <context> <name>AboutDialog</name> <message> @@ -1049,6 +1049,14 @@ Address: %4 <translation type="unfinished"/> </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 type="unfinished"/> + </message> + <message> + <source>Third party transaction URLs</source> + <translation type="unfinished"/> + </message> + <message> <source>Active command-line options that override above options:</source> <translation type="unfinished"/> </message> @@ -1350,7 +1358,7 @@ Address: %4 <translation>Σφάλμα: Άκυρος συνδυασμός των -regtest και -testnet</translation> </message> <message> - <source>Bitcoin Core did't yet exit safely...</source> + <source>Bitcoin Core didn't yet exit safely...</source> <translation type="unfinished"/> </message> <message> diff --git a/src/qt/locale/bitcoin_eo.ts b/src/qt/locale/bitcoin_eo.ts index 7f5dc3de2f..8c2869abac 100644 --- a/src/qt/locale/bitcoin_eo.ts +++ b/src/qt/locale/bitcoin_eo.ts @@ -1,4 +1,4 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="eo" version="2.0"> +<?xml version="1.0" ?><!DOCTYPE TS><TS language="eo" version="2.1"> <context> <name>AboutDialog</name> <message> @@ -1048,6 +1048,14 @@ Adreso: %4 <translation type="unfinished"/> </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 type="unfinished"/> + </message> + <message> + <source>Third party transaction URLs</source> + <translation type="unfinished"/> + </message> + <message> <source>Active command-line options that override above options:</source> <translation type="unfinished"/> </message> @@ -1349,7 +1357,7 @@ Adreso: %4 <translation>Eraro: nevalida kunigo de -regtest kaj -testnet</translation> </message> <message> - <source>Bitcoin Core did't yet exit safely...</source> + <source>Bitcoin Core didn't yet exit safely...</source> <translation type="unfinished"/> </message> <message> diff --git a/src/qt/locale/bitcoin_es.ts b/src/qt/locale/bitcoin_es.ts index 0bd60be101..8ca8360ef6 100644 --- a/src/qt/locale/bitcoin_es.ts +++ b/src/qt/locale/bitcoin_es.ts @@ -1,4 +1,4 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="es" version="2.0"> +<?xml version="1.0" ?><!DOCTYPE TS><TS language="es" version="2.1"> <context> <name>AboutDialog</name> <message> @@ -1051,6 +1051,14 @@ Dirección: %4 <translation>Dirección IP del proxy (p. ej. IPv4: 127.0.0.1 / IPv6: ::1)</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 type="unfinished"/> + </message> + <message> + <source>Third party transaction URLs</source> + <translation type="unfinished"/> + </message> + <message> <source>Active command-line options that override above options:</source> <translation>Opciones activas de consola de comandos que tienen preferencia sobre las opciones antes mencionadas:</translation> </message> @@ -1352,8 +1360,8 @@ Dirección: %4 <translation>Error: Combinación no válida de -regtest y -testnet.</translation> </message> <message> - <source>Bitcoin Core did't yet exit safely...</source> - <translation type="unfinished"/> + <source>Bitcoin Core didn't yet exit safely...</source> + <translation>Bitcoin core no se ha cerrado de forma segura todavía...</translation> </message> <message> <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> @@ -2971,7 +2979,7 @@ Por ejemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <source>Importing...</source> - <translation type="unfinished"/> + <translation>Importando...</translation> </message> <message> <source>Incorrect or no genesis block found. Wrong datadir for network?</source> diff --git a/src/qt/locale/bitcoin_es_CL.ts b/src/qt/locale/bitcoin_es_CL.ts index b63743e5d6..758a190f75 100644 --- a/src/qt/locale/bitcoin_es_CL.ts +++ b/src/qt/locale/bitcoin_es_CL.ts @@ -1,4 +1,4 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="es_CL" version="2.0"> +<?xml version="1.0" ?><!DOCTYPE TS><TS language="es_CL" version="2.1"> <context> <name>AboutDialog</name> <message> @@ -1051,6 +1051,14 @@ Dirección: %4</translation> <translation type="unfinished"/> </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 type="unfinished"/> + </message> + <message> + <source>Third party transaction URLs</source> + <translation type="unfinished"/> + </message> + <message> <source>Active command-line options that override above options:</source> <translation type="unfinished"/> </message> @@ -1352,7 +1360,7 @@ Dirección: %4</translation> <translation type="unfinished"/> </message> <message> - <source>Bitcoin Core did't yet exit safely...</source> + <source>Bitcoin Core didn't yet exit safely...</source> <translation type="unfinished"/> </message> <message> diff --git a/src/qt/locale/bitcoin_es_DO.ts b/src/qt/locale/bitcoin_es_DO.ts index 6fca831017..6944c3157f 100644 --- a/src/qt/locale/bitcoin_es_DO.ts +++ b/src/qt/locale/bitcoin_es_DO.ts @@ -1,4 +1,4 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="es_DO" version="2.0"> +<?xml version="1.0" ?><!DOCTYPE TS><TS language="es_DO" version="2.1"> <context> <name>AboutDialog</name> <message> @@ -1051,6 +1051,14 @@ Dirección: %4 <translation>Dirección IP del proxy (ej. IPv4: 127.0.0.1 / IPv6: ::1)</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 type="unfinished"/> + </message> + <message> + <source>Third party transaction URLs</source> + <translation type="unfinished"/> + </message> + <message> <source>Active command-line options that override above options:</source> <translation type="unfinished"/> </message> @@ -1352,7 +1360,7 @@ Dirección: %4 <translation>Error: Combinación no válida de -regtest y -testnet.</translation> </message> <message> - <source>Bitcoin Core did't yet exit safely...</source> + <source>Bitcoin Core didn't yet exit safely...</source> <translation type="unfinished"/> </message> <message> diff --git a/src/qt/locale/bitcoin_es_MX.ts b/src/qt/locale/bitcoin_es_MX.ts index 6920f2300b..9a39551d6b 100644 --- a/src/qt/locale/bitcoin_es_MX.ts +++ b/src/qt/locale/bitcoin_es_MX.ts @@ -1,4 +1,4 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="es_MX" version="2.0"> +<?xml version="1.0" ?><!DOCTYPE TS><TS language="es_MX" version="2.1"> <context> <name>AboutDialog</name> <message> @@ -1039,6 +1039,14 @@ Address: %4 <translation type="unfinished"/> </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 type="unfinished"/> + </message> + <message> + <source>Third party transaction URLs</source> + <translation type="unfinished"/> + </message> + <message> <source>Active command-line options that override above options:</source> <translation>Activar las opciones de linea de comando que sobre escriben las siguientes opciones:</translation> </message> @@ -1340,7 +1348,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <source>Bitcoin Core did't yet exit safely...</source> + <source>Bitcoin Core didn't yet exit safely...</source> <translation type="unfinished"/> </message> <message> diff --git a/src/qt/locale/bitcoin_es_UY.ts b/src/qt/locale/bitcoin_es_UY.ts index d94ad1c938..03ecce46c0 100644 --- a/src/qt/locale/bitcoin_es_UY.ts +++ b/src/qt/locale/bitcoin_es_UY.ts @@ -1,4 +1,4 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="es_UY" version="2.0"> +<?xml version="1.0" ?><!DOCTYPE TS><TS language="es_UY" version="2.1"> <context> <name>AboutDialog</name> <message> @@ -1039,6 +1039,14 @@ Address: %4 <translation type="unfinished"/> </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 type="unfinished"/> + </message> + <message> + <source>Third party transaction URLs</source> + <translation type="unfinished"/> + </message> + <message> <source>Active command-line options that override above options:</source> <translation type="unfinished"/> </message> @@ -1340,7 +1348,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <source>Bitcoin Core did't yet exit safely...</source> + <source>Bitcoin Core didn't yet exit safely...</source> <translation type="unfinished"/> </message> <message> diff --git a/src/qt/locale/bitcoin_et.ts b/src/qt/locale/bitcoin_et.ts index 8affc8a5d2..e6c27bf21c 100644 --- a/src/qt/locale/bitcoin_et.ts +++ b/src/qt/locale/bitcoin_et.ts @@ -1,4 +1,4 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="et" version="2.0"> +<?xml version="1.0" ?><!DOCTYPE TS><TS language="et" version="2.1"> <context> <name>AboutDialog</name> <message> @@ -1047,6 +1047,14 @@ Aadress: %4⏎</translation> <translation type="unfinished"/> </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 type="unfinished"/> + </message> + <message> + <source>Third party transaction URLs</source> + <translation type="unfinished"/> + </message> + <message> <source>Active command-line options that override above options:</source> <translation type="unfinished"/> </message> @@ -1348,7 +1356,7 @@ Aadress: %4⏎</translation> <translation type="unfinished"/> </message> <message> - <source>Bitcoin Core did't yet exit safely...</source> + <source>Bitcoin Core didn't yet exit safely...</source> <translation type="unfinished"/> </message> <message> diff --git a/src/qt/locale/bitcoin_eu_ES.ts b/src/qt/locale/bitcoin_eu_ES.ts index afa4d6c540..1fce25d6da 100644 --- a/src/qt/locale/bitcoin_eu_ES.ts +++ b/src/qt/locale/bitcoin_eu_ES.ts @@ -1,4 +1,4 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="eu_ES" version="2.0"> +<?xml version="1.0" ?><!DOCTYPE TS><TS language="eu_ES" version="2.1"> <context> <name>AboutDialog</name> <message> @@ -1039,6 +1039,14 @@ Address: %4 <translation type="unfinished"/> </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 type="unfinished"/> + </message> + <message> + <source>Third party transaction URLs</source> + <translation type="unfinished"/> + </message> + <message> <source>Active command-line options that override above options:</source> <translation type="unfinished"/> </message> @@ -1340,7 +1348,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <source>Bitcoin Core did't yet exit safely...</source> + <source>Bitcoin Core didn't yet exit safely...</source> <translation type="unfinished"/> </message> <message> diff --git a/src/qt/locale/bitcoin_fa.ts b/src/qt/locale/bitcoin_fa.ts index 805c7bb856..0dfbafb811 100644 --- a/src/qt/locale/bitcoin_fa.ts +++ b/src/qt/locale/bitcoin_fa.ts @@ -1,4 +1,4 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="fa" version="2.0"> +<?xml version="1.0" ?><!DOCTYPE TS><TS language="fa" version="2.1"> <context> <name>AboutDialog</name> <message> @@ -1043,6 +1043,14 @@ Address: %4 <translation type="unfinished"/> </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 type="unfinished"/> + </message> + <message> + <source>Third party transaction URLs</source> + <translation type="unfinished"/> + </message> + <message> <source>Active command-line options that override above options:</source> <translation type="unfinished"/> </message> @@ -1344,7 +1352,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <source>Bitcoin Core did't yet exit safely...</source> + <source>Bitcoin Core didn't yet exit safely...</source> <translation type="unfinished"/> </message> <message> diff --git a/src/qt/locale/bitcoin_fa_IR.ts b/src/qt/locale/bitcoin_fa_IR.ts index 18a0dca224..3b82ffa5e5 100644 --- a/src/qt/locale/bitcoin_fa_IR.ts +++ b/src/qt/locale/bitcoin_fa_IR.ts @@ -1,4 +1,4 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="fa_IR" version="2.0"> +<?xml version="1.0" ?><!DOCTYPE TS><TS language="fa_IR" version="2.1"> <context> <name>AboutDialog</name> <message> @@ -1042,6 +1042,14 @@ Address: %4 <translation type="unfinished"/> </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 type="unfinished"/> + </message> + <message> + <source>Third party transaction URLs</source> + <translation type="unfinished"/> + </message> + <message> <source>Active command-line options that override above options:</source> <translation type="unfinished"/> </message> @@ -1343,7 +1351,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <source>Bitcoin Core did't yet exit safely...</source> + <source>Bitcoin Core didn't yet exit safely...</source> <translation type="unfinished"/> </message> <message> diff --git a/src/qt/locale/bitcoin_fi.ts b/src/qt/locale/bitcoin_fi.ts index 942dad5411..ece70f6075 100644 --- a/src/qt/locale/bitcoin_fi.ts +++ b/src/qt/locale/bitcoin_fi.ts @@ -1,4 +1,4 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="fi" version="2.0"> +<?xml version="1.0" ?><!DOCTYPE TS><TS language="fi" version="2.1"> <context> <name>AboutDialog</name> <message> @@ -1048,6 +1048,14 @@ Osoite: %4</translation> <translation>IP osoite proxille (esim. IPv4: 127.0.0.1 / IPv6: ::1)</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>Ulkopuoliset URL-osoitteet (esim. block explorer,) jotka esiintyvät siirrot-välilehdellä valikossa. %s URL-osoitteessa korvataan siirtotunnuksella. Useampi URL-osoite on eroteltu pystyviivalla |.</translation> + </message> + <message> + <source>Third party transaction URLs</source> + <translation type="unfinished"/> + </message> + <message> <source>Active command-line options that override above options:</source> <translation>Aktiiviset komentorivivalinnat jotka ohittavat ylläolevat valinnat:</translation> </message> @@ -1349,8 +1357,8 @@ Osoite: %4</translation> <translation>Virhe: Virheellinen yhdistelmä -regtest ja -testnet.</translation> </message> <message> - <source>Bitcoin Core did't yet exit safely...</source> - <translation>Bitcoin Core ei vielä sulkeutunut turvallisesti...</translation> + <source>Bitcoin Core didn't yet exit safely...</source> + <translation>Bitcoin Core ei ole vielä sulkeutunut turvallisesti...</translation> </message> <message> <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> diff --git a/src/qt/locale/bitcoin_fr.ts b/src/qt/locale/bitcoin_fr.ts index e0d5bbdbcd..05089f0416 100644 --- a/src/qt/locale/bitcoin_fr.ts +++ b/src/qt/locale/bitcoin_fr.ts @@ -1,4 +1,4 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="fr" version="2.0"> +<?xml version="1.0" ?><!DOCTYPE TS><TS language="fr" version="2.1"> <context> <name>AboutDialog</name> <message> @@ -1048,6 +1048,14 @@ Adresse : %4 <translation>Adresse IP du mandataire (par ex. IPv4 : 127.0.0.1 / IPv6 : ::1)</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 de tiers (par ex. un explorateur de blocs) apparaissant dans l'onglet des transactions comme éléments du menu contextuel. %s dans l'URL est remplacé par le hachage de la transaction. Les URL multiples sont séparées par une barre verticale |.</translation> + </message> + <message> + <source>Third party transaction URLs</source> + <translation>URL de transaction d'un tiers</translation> + </message> + <message> <source>Active command-line options that override above options:</source> <translation>Options actives de ligne de commande qui annulent les options ci-dessus :</translation> </message> @@ -1349,8 +1357,8 @@ Adresse : %4 <translation>Erreur : combinaison invalide de -regtest et de -testnet.</translation> </message> <message> - <source>Bitcoin Core did't yet exit safely...</source> - <translation>Bitcoin Core ne s’est pas arrêté correctement...</translation> + <source>Bitcoin Core didn't yet exit safely...</source> + <translation>Bitcoin Core ne s'est pas encore arrêté en toute sécurité...</translation> </message> <message> <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> diff --git a/src/qt/locale/bitcoin_fr_CA.ts b/src/qt/locale/bitcoin_fr_CA.ts index 0df3eb3edd..ff22c2fd1c 100644 --- a/src/qt/locale/bitcoin_fr_CA.ts +++ b/src/qt/locale/bitcoin_fr_CA.ts @@ -1,4 +1,4 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="fr_CA" version="2.0"> +<?xml version="1.0" ?><!DOCTYPE TS><TS language="fr_CA" version="2.1"> <context> <name>AboutDialog</name> <message> @@ -1044,6 +1044,14 @@ Address: %4 <translation type="unfinished"/> </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 type="unfinished"/> + </message> + <message> + <source>Third party transaction URLs</source> + <translation type="unfinished"/> + </message> + <message> <source>Active command-line options that override above options:</source> <translation type="unfinished"/> </message> @@ -1345,7 +1353,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <source>Bitcoin Core did't yet exit safely...</source> + <source>Bitcoin Core didn't yet exit safely...</source> <translation type="unfinished"/> </message> <message> diff --git a/src/qt/locale/bitcoin_gl.ts b/src/qt/locale/bitcoin_gl.ts index a1ee3545bf..ecf1fa2222 100644 --- a/src/qt/locale/bitcoin_gl.ts +++ b/src/qt/locale/bitcoin_gl.ts @@ -1,4 +1,4 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="gl" version="2.0"> +<?xml version="1.0" ?><!DOCTYPE TS><TS language="gl" version="2.1"> <context> <name>AboutDialog</name> <message> @@ -1048,6 +1048,14 @@ Dirección: %4 <translation type="unfinished"/> </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 type="unfinished"/> + </message> + <message> + <source>Third party transaction URLs</source> + <translation type="unfinished"/> + </message> + <message> <source>Active command-line options that override above options:</source> <translation type="unfinished"/> </message> @@ -1349,7 +1357,7 @@ Dirección: %4 <translation>Erro: combinación inválida de -regtest e -testnet.</translation> </message> <message> - <source>Bitcoin Core did't yet exit safely...</source> + <source>Bitcoin Core didn't yet exit safely...</source> <translation type="unfinished"/> </message> <message> diff --git a/src/qt/locale/bitcoin_gu_IN.ts b/src/qt/locale/bitcoin_gu_IN.ts index 66b341545e..ed4a9265e4 100644 --- a/src/qt/locale/bitcoin_gu_IN.ts +++ b/src/qt/locale/bitcoin_gu_IN.ts @@ -1,4 +1,4 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="gu_IN" version="2.0"> +<?xml version="1.0" ?><!DOCTYPE TS><TS language="gu_IN" version="2.1"> <context> <name>AboutDialog</name> <message> @@ -1039,6 +1039,14 @@ Address: %4 <translation type="unfinished"/> </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 type="unfinished"/> + </message> + <message> + <source>Third party transaction URLs</source> + <translation type="unfinished"/> + </message> + <message> <source>Active command-line options that override above options:</source> <translation type="unfinished"/> </message> @@ -1340,7 +1348,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <source>Bitcoin Core did't yet exit safely...</source> + <source>Bitcoin Core didn't yet exit safely...</source> <translation type="unfinished"/> </message> <message> diff --git a/src/qt/locale/bitcoin_he.ts b/src/qt/locale/bitcoin_he.ts index 73378535a7..ae13df4524 100644 --- a/src/qt/locale/bitcoin_he.ts +++ b/src/qt/locale/bitcoin_he.ts @@ -1,4 +1,4 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="he" version="2.0"> +<?xml version="1.0" ?><!DOCTYPE TS><TS language="he" version="2.1"> <context> <name>AboutDialog</name> <message> @@ -1047,6 +1047,14 @@ Address: %4 <translation type="unfinished"/> </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 type="unfinished"/> + </message> + <message> + <source>Third party transaction URLs</source> + <translation type="unfinished"/> + </message> + <message> <source>Active command-line options that override above options:</source> <translation type="unfinished"/> </message> @@ -1348,7 +1356,7 @@ Address: %4 <translation>שגיאה: שילוב בלתי חוקי של regtest- ו testnet-.</translation> </message> <message> - <source>Bitcoin Core did't yet exit safely...</source> + <source>Bitcoin Core didn't yet exit safely...</source> <translation type="unfinished"/> </message> <message> diff --git a/src/qt/locale/bitcoin_hi_IN.ts b/src/qt/locale/bitcoin_hi_IN.ts index d27e26b871..3ccac8899e 100644 --- a/src/qt/locale/bitcoin_hi_IN.ts +++ b/src/qt/locale/bitcoin_hi_IN.ts @@ -1,4 +1,4 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="hi_IN" version="2.0"> +<?xml version="1.0" ?><!DOCTYPE TS><TS language="hi_IN" version="2.1"> <context> <name>AboutDialog</name> <message> @@ -1043,6 +1043,14 @@ Address: %4 <translation type="unfinished"/> </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 type="unfinished"/> + </message> + <message> + <source>Third party transaction URLs</source> + <translation type="unfinished"/> + </message> + <message> <source>Active command-line options that override above options:</source> <translation type="unfinished"/> </message> @@ -1344,7 +1352,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <source>Bitcoin Core did't yet exit safely...</source> + <source>Bitcoin Core didn't yet exit safely...</source> <translation type="unfinished"/> </message> <message> diff --git a/src/qt/locale/bitcoin_hr.ts b/src/qt/locale/bitcoin_hr.ts index b5f1595515..bd2b773d2f 100644 --- a/src/qt/locale/bitcoin_hr.ts +++ b/src/qt/locale/bitcoin_hr.ts @@ -1,4 +1,4 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="hr" version="2.0"> +<?xml version="1.0" ?><!DOCTYPE TS><TS language="hr" version="2.1"> <context> <name>AboutDialog</name> <message> @@ -1043,6 +1043,14 @@ Adresa:%4 <translation type="unfinished"/> </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 type="unfinished"/> + </message> + <message> + <source>Third party transaction URLs</source> + <translation type="unfinished"/> + </message> + <message> <source>Active command-line options that override above options:</source> <translation type="unfinished"/> </message> @@ -1196,7 +1204,7 @@ Adresa:%4 </message> <message> <source>The supplied proxy address is invalid.</source> - <translation type="unfinished"/> + <translation>Priložena proxy adresa je nevažeća.</translation> </message> </context> <context> @@ -1207,7 +1215,7 @@ Adresa:%4 </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 type="unfinished"/> + <translation>Prikazani podatci mogu biti zastarjeli. Vaš novčanik se automatski sinkronizira s Bitcoin mrežom kada je veza uspostavljena, ali taj proces još nije završen.</translation> </message> <message> <source>Wallet</source> @@ -1344,7 +1352,7 @@ Adresa:%4 <translation type="unfinished"/> </message> <message> - <source>Bitcoin Core did't yet exit safely...</source> + <source>Bitcoin Core didn't yet exit safely...</source> <translation type="unfinished"/> </message> <message> @@ -1483,7 +1491,7 @@ Adresa:%4 </message> <message> <source>Use up and down arrows to navigate history, and <b>Ctrl-L</b> to clear screen.</source> - <translation type="unfinished"/> + <translation>Kako bi navigirali kroz povijest koristite strelice gore i dolje. <b>Ctrl-L</b> kako bi očistili ekran.</translation> </message> <message> <source>Type <b>help</b> for an overview of available commands.</source> @@ -2466,7 +2474,7 @@ Adresa:%4 </message> <message> <source>Show transaction details</source> - <translation type="unfinished"/> + <translation>Prikaži detalje transakcije</translation> </message> <message> <source>Export Transaction History</source> @@ -2622,7 +2630,7 @@ Adresa:%4 </message> <message> <source>Specify your own public address</source> - <translation type="unfinished"/> + <translation>Odaberi vlastitu javnu adresu</translation> </message> <message> <source>Threshold for disconnecting misbehaving peers (default: 100)</source> diff --git a/src/qt/locale/bitcoin_hu.ts b/src/qt/locale/bitcoin_hu.ts index de57490847..3d8d45a61d 100644 --- a/src/qt/locale/bitcoin_hu.ts +++ b/src/qt/locale/bitcoin_hu.ts @@ -1,4 +1,4 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="hu" version="2.0"> +<?xml version="1.0" ?><!DOCTYPE TS><TS language="hu" version="2.1"> <context> <name>AboutDialog</name> <message> @@ -1048,6 +1048,14 @@ Cím: %4 <translation type="unfinished"/> </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 type="unfinished"/> + </message> + <message> + <source>Third party transaction URLs</source> + <translation type="unfinished"/> + </message> + <message> <source>Active command-line options that override above options:</source> <translation type="unfinished"/> </message> @@ -1349,7 +1357,7 @@ Cím: %4 <translation type="unfinished"/> </message> <message> - <source>Bitcoin Core did't yet exit safely...</source> + <source>Bitcoin Core didn't yet exit safely...</source> <translation type="unfinished"/> </message> <message> diff --git a/src/qt/locale/bitcoin_id_ID.ts b/src/qt/locale/bitcoin_id_ID.ts index bd92878fed..c4dee5f92d 100644 --- a/src/qt/locale/bitcoin_id_ID.ts +++ b/src/qt/locale/bitcoin_id_ID.ts @@ -1,4 +1,4 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="id_ID" version="2.0"> +<?xml version="1.0" ?><!DOCTYPE TS><TS language="id_ID" version="2.1"> <context> <name>AboutDialog</name> <message> @@ -1048,6 +1048,14 @@ Alamat: %4 <translation>Alamat IP proxy (cth. IPv4: 127.0.0.1 / IPv6: ::1)</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 type="unfinished"/> + </message> + <message> + <source>Third party transaction URLs</source> + <translation type="unfinished"/> + </message> + <message> <source>Active command-line options that override above options:</source> <translation>pilihan perintah-baris aktif menimpa atas pilihan-pilihan: </translation> </message> @@ -1349,7 +1357,7 @@ Alamat: %4 <translation>Gagal: Gabungan -regtest dan -testnet salah</translation> </message> <message> - <source>Bitcoin Core did't yet exit safely...</source> + <source>Bitcoin Core didn't yet exit safely...</source> <translation type="unfinished"/> </message> <message> diff --git a/src/qt/locale/bitcoin_it.ts b/src/qt/locale/bitcoin_it.ts index b9ef5e4d0b..cb9fed1ab9 100644 --- a/src/qt/locale/bitcoin_it.ts +++ b/src/qt/locale/bitcoin_it.ts @@ -1,4 +1,4 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="it" version="2.0"> +<?xml version="1.0" ?><!DOCTYPE TS><TS language="it" version="2.1"> <context> <name>AboutDialog</name> <message> @@ -1049,6 +1049,15 @@ Indirizzo: %4 <translation>Indirizzo IP del proxy (es: IPv4: 127.0.0.1 / IPv6: ::1)</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 di terze parti (es: un block explorer) che appaiono nella tabella delle transazioni come voci nel menu contestuale. %s nell'URL è sostituito dall'hash della transazione. +Più URL vengono separati da una barra verticale |.</translation> + </message> + <message> + <source>Third party transaction URLs</source> + <translation>URL di transazione di terze parti</translation> + </message> + <message> <source>Active command-line options that override above options:</source> <translation>Opzioni command-line attive che sostituiscono i settaggi sopra elencati:</translation> </message> @@ -1350,8 +1359,8 @@ Indirizzo: %4 <translation>Errore: combinazione di -regtest e -testnet non valida.</translation> </message> <message> - <source>Bitcoin Core did't yet exit safely...</source> - <translation>Bitcoin Core non è ancora stato chiuso in modo sicuro ...</translation> + <source>Bitcoin Core didn't yet exit safely...</source> + <translation>Bitcoin Core non si è ancora chiuso con sicurezza...</translation> </message> <message> <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> diff --git a/src/qt/locale/bitcoin_ja.ts b/src/qt/locale/bitcoin_ja.ts index c7e4fe6091..5edfc0746a 100644 --- a/src/qt/locale/bitcoin_ja.ts +++ b/src/qt/locale/bitcoin_ja.ts @@ -1,4 +1,4 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="ja" version="2.0"> +<?xml version="1.0" ?><!DOCTYPE TS><TS language="ja" version="2.1"> <context> <name>AboutDialog</name> <message> @@ -7,7 +7,7 @@ </message> <message> <source><b>Bitcoin Core</b> version</source> - <translation type="unfinished"/> + <translation><b>ビットコインコア</b> バージョン</translation> </message> <message> <source> @@ -29,7 +29,7 @@ MIT/X11 ソフトウェア ライセンスの下で配布されています。 </message> <message> <source>The Bitcoin Core developers</source> - <translation type="unfinished"/> + <translation>ビットコインコアの開発者</translation> </message> <message> <source>(%1-bit)</source> @@ -128,7 +128,7 @@ MIT/X11 ソフトウェア ライセンスの下で配布されています。 </message> <message> <source>Exporting Failed</source> - <translation type="unfinished"/> + <translation>エクスポート失敗</translation> </message> <message> <source>There was an error trying to save the address list to %1.</source> @@ -273,7 +273,7 @@ MIT/X11 ソフトウェア ライセンスの下で配布されています。 </message> <message> <source>Node</source> - <translation type="unfinished"/> + <translation>ノード</translation> </message> <message> <source>Show general overview of wallet</source> @@ -325,15 +325,15 @@ MIT/X11 ソフトウェア ライセンスの下で配布されています。 </message> <message> <source>&Sending addresses...</source> - <translation type="unfinished"/> + <translation>送金先アドレス一覧 (&S)...</translation> </message> <message> <source>&Receiving addresses...</source> - <translation type="unfinished"/> + <translation>受け取り用アドレス一覧 (&R)...</translation> </message> <message> <source>Open &URI...</source> - <translation type="unfinished"/> + <translation>URI を開く (&U)...</translation> </message> <message> <source>Importing blocks from disk...</source> @@ -437,7 +437,7 @@ MIT/X11 ソフトウェア ライセンスの下で配布されています。 </message> <message> <source>&About Bitcoin Core</source> - <translation type="unfinished"/> + <translation>ビットコインコアについて (&A)</translation> </message> <message> <source>Show the list of used sending addresses and labels</source> @@ -453,7 +453,7 @@ MIT/X11 ソフトウェア ライセンスの下で配布されています。 </message> <message> <source>&Command-line options</source> - <translation type="unfinished"/> + <translation>コマンドラインオプション (&C)</translation> </message> <message> <source>Show the Bitcoin Core help message to get a list with possible Bitcoin command-line options</source> @@ -493,11 +493,11 @@ MIT/X11 ソフトウェア ライセンスの下で配布されています。 </message> <message> <source>%1 and %2</source> - <translation type="unfinished"/> + <translation>%1 と %2</translation> </message> <message numerus="yes"> <source>%n year(s)</source> - <translation type="unfinished"><numerusform></numerusform></translation> + <translation><numerusform>%n 年</numerusform></translation> </message> <message> <source>%1 behind</source> @@ -579,11 +579,11 @@ Address: %4 </message> <message> <source>Quantity:</source> - <translation type="unfinished"/> + <translation>数量:</translation> </message> <message> <source>Bytes:</source> - <translation type="unfinished"/> + <translation>バイト:</translation> </message> <message> <source>Amount:</source> @@ -591,11 +591,11 @@ Address: %4 </message> <message> <source>Priority:</source> - <translation type="unfinished"/> + <translation>優先度:</translation> </message> <message> <source>Fee:</source> - <translation type="unfinished"/> + <translation>手数料:</translation> </message> <message> <source>Low Output:</source> @@ -603,7 +603,7 @@ Address: %4 </message> <message> <source>After Fee:</source> - <translation type="unfinished"/> + <translation>手数料差引後:</translation> </message> <message> <source>Change:</source> @@ -615,11 +615,11 @@ Address: %4 </message> <message> <source>Tree mode</source> - <translation type="unfinished"/> + <translation>ツリーモード</translation> </message> <message> <source>List mode</source> - <translation type="unfinished"/> + <translation>リストモード</translation> </message> <message> <source>Amount</source> @@ -635,7 +635,7 @@ Address: %4 </message> <message> <source>Confirmations</source> - <translation type="unfinished"/> + <translation>検証数</translation> </message> <message> <source>Confirmed</source> @@ -643,7 +643,7 @@ Address: %4 </message> <message> <source>Priority</source> - <translation type="unfinished"/> + <translation>優先度</translation> </message> <message> <source>Copy address</source> @@ -671,23 +671,23 @@ Address: %4 </message> <message> <source>Copy quantity</source> - <translation type="unfinished"/> + <translation>数量をコピーする</translation> </message> <message> <source>Copy fee</source> - <translation type="unfinished"/> + <translation>手数料をコピーする</translation> </message> <message> <source>Copy after fee</source> - <translation type="unfinished"/> + <translation>手数料差引後の値をコピーする</translation> </message> <message> <source>Copy bytes</source> - <translation type="unfinished"/> + <translation>バイト数をコピーする</translation> </message> <message> <source>Copy priority</source> - <translation type="unfinished"/> + <translation>優先度をコピーする</translation> </message> <message> <source>Copy low output</source> @@ -771,7 +771,7 @@ Address: %4 </message> <message> <source>This label turns red, if the priority is smaller than "medium".</source> - <translation type="unfinished"/> + <translation>優先度が「中」未満の場合には、このラベルは赤くなります。</translation> </message> <message> <source>This label turns red, if any recipient receives an amount smaller than %1.</source> @@ -978,11 +978,11 @@ Address: %4 <name>OpenURIDialog</name> <message> <source>Open URI</source> - <translation type="unfinished"/> + <translation>URI を開く</translation> </message> <message> <source>Open payment request from URI or file</source> - <translation type="unfinished"/> + <translation>URI またはファイルから支払いリクエストを開く</translation> </message> <message> <source>URI:</source> @@ -990,11 +990,11 @@ Address: %4 </message> <message> <source>Select payment request file</source> - <translation type="unfinished"/> + <translation>支払いリクエストファイルを選択してください</translation> </message> <message> <source>Select payment request file to open</source> - <translation type="unfinished"/> + <translation>開きたい支払いリクエストファイルを選択してください</translation> </message> </context> <context> @@ -1025,11 +1025,11 @@ Address: %4 </message> <message> <source>Size of &database cache</source> - <translation type="unfinished"/> + <translation>データベースキャッシュのサイズ (&D)</translation> </message> <message> <source>MB</source> - <translation type="unfinished"/> + <translation>MB</translation> </message> <message> <source>Number of script &verification threads</source> @@ -1045,6 +1045,14 @@ Address: %4 </message> <message> <source>IP address of the proxy (e.g. IPv4: 127.0.0.1 / IPv6: ::1)</source> + <translation>プロキシのIPアドレス (例えば IPv4: 127.0.0.1 / IPv6: ::1)</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 type="unfinished"/> + </message> + <message> + <source>Third party transaction URLs</source> <translation type="unfinished"/> </message> <message> @@ -1069,15 +1077,15 @@ Address: %4 </message> <message> <source>W&allet</source> - <translation type="unfinished"/> + <translation>ウォレット (&A)</translation> </message> <message> <source>Expert</source> - <translation type="unfinished"/> + <translation>エクスポート</translation> </message> <message> <source>Enable coin &control features</source> - <translation type="unfinished"/> + <translation>コインコントロール機能を有効化する (&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> @@ -1350,7 +1358,7 @@ Address: %4 <translation>エラー： -regtestと-testnetは一緒にするのは無効です。</translation> </message> <message> - <source>Bitcoin Core did't yet exit safely...</source> + <source>Bitcoin Core didn't yet exit safely...</source> <translation type="unfinished"/> </message> <message> @@ -1461,11 +1469,11 @@ Address: %4 </message> <message> <source>In:</source> - <translation type="unfinished"/> + <translation>入力:</translation> </message> <message> <source>Out:</source> - <translation type="unfinished"/> + <translation>出力:</translation> </message> <message> <source>Build date</source> @@ -1497,31 +1505,31 @@ Address: %4 </message> <message> <source>%1 B</source> - <translation type="unfinished"/> + <translation>%1 B</translation> </message> <message> <source>%1 KB</source> - <translation type="unfinished"/> + <translation>%1 KB</translation> </message> <message> <source>%1 MB</source> - <translation type="unfinished"/> + <translation>%1 MB</translation> </message> <message> <source>%1 GB</source> - <translation type="unfinished"/> + <translation>%1 GB</translation> </message> <message> <source>%1 m</source> - <translation type="unfinished"/> + <translation>%1 m</translation> </message> <message> <source>%1 h</source> - <translation type="unfinished"/> + <translation>%1 h</translation> </message> <message> <source>%1 h %2 m</source> - <translation type="unfinished"/> + <translation>%1 h %2 m</translation> </message> </context> <context> @@ -1536,7 +1544,7 @@ Address: %4 </message> <message> <source>&Message:</source> - <translation type="unfinished"/> + <translation>メッセージ (&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> @@ -1600,7 +1608,7 @@ Address: %4 </message> <message> <source>Copy message</source> - <translation type="unfinished"/> + <translation>メッセージをコピーする</translation> </message> <message> <source>Copy amount</source> @@ -1615,11 +1623,11 @@ Address: %4 </message> <message> <source>Copy &URI</source> - <translation type="unfinished"/> + <translation>URI をコピーする (&U)</translation> </message> <message> <source>Copy &Address</source> - <translation type="unfinished"/> + <translation>アドレスをコピーする (&A)</translation> </message> <message> <source>&Save Image...</source> @@ -1627,7 +1635,7 @@ Address: %4 </message> <message> <source>Request payment to %1</source> - <translation type="unfinished"/> + <translation>%1 への支払いリクエストを行う</translation> </message> <message> <source>Payment information</source> @@ -1635,7 +1643,7 @@ Address: %4 </message> <message> <source>URI</source> - <translation type="unfinished"/> + <translation>URI</translation> </message> <message> <source>Address</source> @@ -1701,27 +1709,27 @@ Address: %4 </message> <message> <source>Coin Control Features</source> - <translation type="unfinished"/> + <translation>コインコントロール機能</translation> </message> <message> <source>Inputs...</source> - <translation type="unfinished"/> + <translation>入力...</translation> </message> <message> <source>automatically selected</source> - <translation type="unfinished"/> + <translation>自動選択</translation> </message> <message> <source>Insufficient funds!</source> - <translation type="unfinished"/> + <translation>残高不足です！</translation> </message> <message> <source>Quantity:</source> - <translation type="unfinished"/> + <translation>数量:</translation> </message> <message> <source>Bytes:</source> - <translation type="unfinished"/> + <translation>バイト:</translation> </message> <message> <source>Amount:</source> @@ -1729,11 +1737,11 @@ Address: %4 </message> <message> <source>Priority:</source> - <translation type="unfinished"/> + <translation>優先度:</translation> </message> <message> <source>Fee:</source> - <translation type="unfinished"/> + <translation>手数料:</translation> </message> <message> <source>Low Output:</source> @@ -1741,7 +1749,7 @@ Address: %4 </message> <message> <source>After Fee:</source> - <translation type="unfinished"/> + <translation>手数料差引後:</translation> </message> <message> <source>Change:</source> @@ -1793,7 +1801,7 @@ Address: %4 </message> <message> <source>Copy quantity</source> - <translation type="unfinished"/> + <translation>数量をコピーする</translation> </message> <message> <source>Copy amount</source> @@ -1801,19 +1809,19 @@ Address: %4 </message> <message> <source>Copy fee</source> - <translation type="unfinished"/> + <translation>手数料をコピーする</translation> </message> <message> <source>Copy after fee</source> - <translation type="unfinished"/> + <translation>手数料差引後の値をコピーする</translation> </message> <message> <source>Copy bytes</source> - <translation type="unfinished"/> + <translation>バイト数をコピーする</translation> </message> <message> <source>Copy priority</source> - <translation type="unfinished"/> + <translation>優先度をコピーする</translation> </message> <message> <source>Copy low output</source> @@ -1956,7 +1964,7 @@ Address: %4 </message> <message> <source>Pay To:</source> - <translation type="unfinished"/> + <translation>支払先:</translation> </message> <message> <source>Memo:</source> @@ -2125,7 +2133,7 @@ Address: %4 </message> <message> <source>The Bitcoin Core developers</source> - <translation type="unfinished"/> + <translation>ビットコインコアの開発者</translation> </message> <message> <source>[testnet]</source> @@ -2136,7 +2144,7 @@ Address: %4 <name>TrafficGraphWidget</name> <message> <source>KB/s</source> - <translation type="unfinished"/> + <translation>KB/s</translation> </message> </context> <context> @@ -2333,11 +2341,11 @@ Address: %4 </message> <message> <source>Offline</source> - <translation type="unfinished"/> + <translation>オフライン</translation> </message> <message> <source>Unconfirmed</source> - <translation type="unfinished"/> + <translation>未検証</translation> </message> <message> <source>Confirming (%1 of %2 recommended confirmations)</source> @@ -2476,19 +2484,19 @@ Address: %4 </message> <message> <source>Export Transaction History</source> - <translation type="unfinished"/> + <translation>トランザクション履歴をエクスポートする</translation> </message> <message> <source>Exporting Failed</source> - <translation type="unfinished"/> + <translation>エクスポートに失敗しました</translation> </message> <message> <source>There was an error trying to save the transaction history to %1.</source> - <translation type="unfinished"/> + <translation>トランザクション履歴を %1 へ保存する際にエラーが発生しました。</translation> </message> <message> <source>Exporting Successful</source> - <translation type="unfinished"/> + <translation>エクスポートに成功しました</translation> </message> <message> <source>The transaction history was successfully saved to %1.</source> @@ -2652,7 +2660,7 @@ Address: %4 </message> <message> <source>Bitcoin Core RPC client version</source> - <translation type="unfinished"/> + <translation>ビットコインコアRPCクライアントのバージョン</translation> </message> <message> <source>Run in the background as a daemon and accept commands</source> @@ -2791,11 +2799,11 @@ rpcpassword=%s </message> <message> <source>(default: 1)</source> - <translation type="unfinished"/> + <translation>(デフォルト: 1)</translation> </message> <message> <source>(default: wallet.dat)</source> - <translation type="unfinished"/> + <translation>(デフォルト: wallet.dat)</translation> </message> <message> <source><category> can be:</source> @@ -2823,7 +2831,7 @@ rpcpassword=%s </message> <message> <source>Connect through SOCKS proxy</source> - <translation type="unfinished"/> + <translation>SOCKS プロキシ経由で接続する</translation> </message> <message> <source>Connect to JSON-RPC on <port> (default: 8332 or testnet: 18332)</source> @@ -2840,7 +2848,7 @@ rpcpassword=%s </message> <message> <source>Debugging/Testing options:</source> - <translation type="unfinished"/> + <translation>デバッグ／テスト用オプション:</translation> </message> <message> <source>Disable safemode, override a real safe mode event (default: 0)</source> @@ -2932,11 +2940,11 @@ rpcpassword=%s </message> <message> <source>Fee per kB to add to transactions you send</source> - <translation type="unfinished"/> + <translation>送信するトランザクションの1kBあたりの手数料</translation> </message> <message> <source>Fees smaller than this are considered zero fee (for relaying) (default:</source> - <translation type="unfinished"/> + <translation>この値未満の (中継) 手数料はゼロであるとみなす (デフォルト:</translation> </message> <message> <source>Find peers using DNS lookup (default: 1 unless -connect)</source> @@ -2944,7 +2952,7 @@ rpcpassword=%s </message> <message> <source>Force safe mode (default: 0)</source> - <translation type="unfinished"/> + <translation>セーフモードを矯正する (デフォルト: 0)</translation> </message> <message> <source>Generate coins (default: 0)</source> @@ -2956,7 +2964,7 @@ rpcpassword=%s </message> <message> <source>If <category> is not supplied, output all debugging information.</source> - <translation type="unfinished"/> + <translation><category> が与えられなかった場合には、すべてのデバッグ情報が出力されます。</translation> </message> <message> <source>Importing...</source> @@ -2980,7 +2988,7 @@ rpcpassword=%s </message> <message> <source>RPC client options:</source> - <translation type="unfinished"/> + <translation>RPC クライアントのオプション:</translation> </message> <message> <source>Rebuild block chain index from current blk000??.dat files</source> @@ -3028,7 +3036,7 @@ rpcpassword=%s </message> <message> <source>Wait for RPC server to start</source> - <translation type="unfinished"/> + <translation>RPC サーバが開始するのを待つ</translation> </message> <message> <source>Wallet %s resides outside data directory %s</source> @@ -3040,7 +3048,7 @@ rpcpassword=%s </message> <message> <source>Warning: Deprecated argument -debugnet ignored, use -debug=net</source> - <translation type="unfinished"/> + <translation>警告: 非推奨の引数 -debugnet は無視されました。-debug=net を使用してください</translation> </message> <message> <source>You need to rebuild the database using -reindex to change -txindex</source> @@ -3080,11 +3088,11 @@ rpcpassword=%s </message> <message> <source>Limit size of signature cache to <n> entries (default: 50000)</source> - <translation type="unfinished"/> + <translation>署名キャッシュのサイズを <n> エントリーに制限する (デフォルト: 50000)</translation> </message> <message> <source>Log transaction priority and fee per kB when mining blocks (default: 0)</source> - <translation type="unfinished"/> + <translation>ブロックの採掘時にトランザクションの優先度と1kBあたりの手数料をログに残す (デフォルト: 0)</translation> </message> <message> <source>Maintain a full transaction index (default: 0)</source> @@ -3116,11 +3124,11 @@ rpcpassword=%s </message> <message> <source>RPC SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source> - <translation type="unfinished"/> + <translation>RPC SSL オプション: (SSLのセットアップ手順はビットコインWikiを参照してください)</translation> </message> <message> <source>RPC server options:</source> - <translation type="unfinished"/> + <translation>RPCサーバのオプション:</translation> </message> <message> <source>Randomly drop 1 of every <n> network messages</source> diff --git a/src/qt/locale/bitcoin_ka.ts b/src/qt/locale/bitcoin_ka.ts index fd14152b04..fda2e97037 100644 --- a/src/qt/locale/bitcoin_ka.ts +++ b/src/qt/locale/bitcoin_ka.ts @@ -1,4 +1,4 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="ka" version="2.0"> +<?xml version="1.0" ?><!DOCTYPE TS><TS language="ka" version="2.1"> <context> <name>AboutDialog</name> <message> @@ -1048,6 +1048,14 @@ Address: %4 <translation>პროქსის IP-მისამართი (მაგ.: IPv4: 127.0.0.1 / IPv6: ::1)</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 type="unfinished"/> + </message> + <message> + <source>Third party transaction URLs</source> + <translation type="unfinished"/> + </message> + <message> <source>Active command-line options that override above options:</source> <translation>საკომანდო სტრიქონის აქტიური ოპციები, რომლებიც გადაფარავენ ზემოთნაჩვენებს:</translation> </message> @@ -1349,7 +1357,7 @@ Address: %4 <translation>შეცდომა: -regtest-ისა და -testnet-ის დაუშვებელი კომბინაცია.</translation> </message> <message> - <source>Bitcoin Core did't yet exit safely...</source> + <source>Bitcoin Core didn't yet exit safely...</source> <translation type="unfinished"/> </message> <message> diff --git a/src/qt/locale/bitcoin_kk_KZ.ts b/src/qt/locale/bitcoin_kk_KZ.ts index e35055ebd1..b913ba9858 100644 --- a/src/qt/locale/bitcoin_kk_KZ.ts +++ b/src/qt/locale/bitcoin_kk_KZ.ts @@ -1,4 +1,4 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="kk_KZ" version="2.0"> +<?xml version="1.0" ?><!DOCTYPE TS><TS language="kk_KZ" version="2.1"> <context> <name>AboutDialog</name> <message> @@ -1039,6 +1039,14 @@ Address: %4 <translation type="unfinished"/> </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 type="unfinished"/> + </message> + <message> + <source>Third party transaction URLs</source> + <translation type="unfinished"/> + </message> + <message> <source>Active command-line options that override above options:</source> <translation type="unfinished"/> </message> @@ -1340,7 +1348,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <source>Bitcoin Core did't yet exit safely...</source> + <source>Bitcoin Core didn't yet exit safely...</source> <translation type="unfinished"/> </message> <message> diff --git a/src/qt/locale/bitcoin_ko_KR.ts b/src/qt/locale/bitcoin_ko_KR.ts index c1584600cf..f5d2dddbe4 100644 --- a/src/qt/locale/bitcoin_ko_KR.ts +++ b/src/qt/locale/bitcoin_ko_KR.ts @@ -1,4 +1,4 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="ko_KR" version="2.0"> +<?xml version="1.0" ?><!DOCTYPE TS><TS language="ko_KR" version="2.1"> <context> <name>AboutDialog</name> <message> @@ -1048,6 +1048,14 @@ Address: %4 <translation>프록시 아이피 주소(예. IPv4:127.0.0.1 / IPv6: ::1)</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 type="unfinished"/> + </message> + <message> + <source>Third party transaction URLs</source> + <translation type="unfinished"/> + </message> + <message> <source>Active command-line options that override above options:</source> <translation type="unfinished"/> </message> @@ -1349,7 +1357,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <source>Bitcoin Core did't yet exit safely...</source> + <source>Bitcoin Core didn't yet exit safely...</source> <translation type="unfinished"/> </message> <message> diff --git a/src/qt/locale/bitcoin_ky.ts b/src/qt/locale/bitcoin_ky.ts index 375e72d359..d0db034e86 100644 --- a/src/qt/locale/bitcoin_ky.ts +++ b/src/qt/locale/bitcoin_ky.ts @@ -1,4 +1,4 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="ky" version="2.0"> +<?xml version="1.0" ?><!DOCTYPE TS><TS language="ky" version="2.1"> <context> <name>AboutDialog</name> <message> @@ -1039,6 +1039,14 @@ Address: %4 <translation type="unfinished"/> </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 type="unfinished"/> + </message> + <message> + <source>Third party transaction URLs</source> + <translation type="unfinished"/> + </message> + <message> <source>Active command-line options that override above options:</source> <translation type="unfinished"/> </message> @@ -1340,7 +1348,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <source>Bitcoin Core did't yet exit safely...</source> + <source>Bitcoin Core didn't yet exit safely...</source> <translation type="unfinished"/> </message> <message> diff --git a/src/qt/locale/bitcoin_la.ts b/src/qt/locale/bitcoin_la.ts index 89f4be8202..425519514a 100644 --- a/src/qt/locale/bitcoin_la.ts +++ b/src/qt/locale/bitcoin_la.ts @@ -1,4 +1,4 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="la" version="2.0"> +<?xml version="1.0" ?><!DOCTYPE TS><TS language="la" version="2.1"> <context> <name>AboutDialog</name> <message> @@ -1047,6 +1047,14 @@ Inscriptio: %4 <translation type="unfinished"/> </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 type="unfinished"/> + </message> + <message> + <source>Third party transaction URLs</source> + <translation type="unfinished"/> + </message> + <message> <source>Active command-line options that override above options:</source> <translation type="unfinished"/> </message> @@ -1348,7 +1356,7 @@ Inscriptio: %4 <translation type="unfinished"/> </message> <message> - <source>Bitcoin Core did't yet exit safely...</source> + <source>Bitcoin Core didn't yet exit safely...</source> <translation type="unfinished"/> </message> <message> diff --git a/src/qt/locale/bitcoin_lt.ts b/src/qt/locale/bitcoin_lt.ts index 103cd5f53d..a9898adb2b 100644 --- a/src/qt/locale/bitcoin_lt.ts +++ b/src/qt/locale/bitcoin_lt.ts @@ -1,4 +1,4 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="lt" version="2.0"> +<?xml version="1.0" ?><!DOCTYPE TS><TS language="lt" version="2.1"> <context> <name>AboutDialog</name> <message> @@ -1046,6 +1046,14 @@ Adresas: %4</translation> <translation type="unfinished"/> </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 type="unfinished"/> + </message> + <message> + <source>Third party transaction URLs</source> + <translation type="unfinished"/> + </message> + <message> <source>Active command-line options that override above options:</source> <translation type="unfinished"/> </message> @@ -1347,7 +1355,7 @@ Adresas: %4</translation> <translation type="unfinished"/> </message> <message> - <source>Bitcoin Core did't yet exit safely...</source> + <source>Bitcoin Core didn't yet exit safely...</source> <translation type="unfinished"/> </message> <message> diff --git a/src/qt/locale/bitcoin_lv_LV.ts b/src/qt/locale/bitcoin_lv_LV.ts index 0db0b77a47..c17f65e125 100644 --- a/src/qt/locale/bitcoin_lv_LV.ts +++ b/src/qt/locale/bitcoin_lv_LV.ts @@ -1,4 +1,4 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="lv_LV" version="2.0"> +<?xml version="1.0" ?><!DOCTYPE TS><TS language="lv_LV" version="2.1"> <context> <name>AboutDialog</name> <message> @@ -1043,6 +1043,14 @@ Adrese: %4 <translation type="unfinished"/> </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 type="unfinished"/> + </message> + <message> + <source>Third party transaction URLs</source> + <translation type="unfinished"/> + </message> + <message> <source>Active command-line options that override above options:</source> <translation type="unfinished"/> </message> @@ -1344,7 +1352,7 @@ Adrese: %4 <translation type="unfinished"/> </message> <message> - <source>Bitcoin Core did't yet exit safely...</source> + <source>Bitcoin Core didn't yet exit safely...</source> <translation type="unfinished"/> </message> <message> diff --git a/src/qt/locale/bitcoin_mn.ts b/src/qt/locale/bitcoin_mn.ts new file mode 100644 index 0000000000..e765931b2c --- /dev/null +++ b/src/qt/locale/bitcoin_mn.ts @@ -0,0 +1,3375 @@ +<?xml version="1.0" ?><!DOCTYPE TS><TS language="mn" version="2.1"> +<context> + <name>AboutDialog</name> + <message> + <source>About Bitcoin Core</source> + <translation type="unfinished"/> + </message> + <message> + <source><b>Bitcoin Core</b> version</source> + <translation type="unfinished"/> + </message> + <message> + <source> +This is experimental software. + +Distributed under the MIT/X11 software license, see the accompanying file COPYING or http://www.opensource.org/licenses/mit-license.php. + +This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit (http://www.openssl.org/) and cryptographic software written by Eric Young (eay@cryptsoft.com) and UPnP software written by Thomas Bernard.</source> + <translation type="unfinished"/> + </message> + <message> + <source>Copyright</source> + <translation type="unfinished"/> + </message> + <message> + <source>The Bitcoin Core developers</source> + <translation type="unfinished"/> + </message> + <message> + <source>(%1-bit)</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>AddressBookPage</name> + <message> + <source>Double-click to edit address or label</source> + <translation>Хаяг эсвэл шошгыг ѳѳрчлѳхийн тулд хоёр удаа дар</translation> + </message> + <message> + <source>Create a new address</source> + <translation>Шинэ хаяг нээх</translation> + </message> + <message> + <source>&New</source> + <translation type="unfinished"/> + </message> + <message> + <source>Copy the currently selected address to the system clipboard</source> + <translation>Одоогоор сонгогдсон байгаа хаягуудыг сануулах</translation> + </message> + <message> + <source>&Copy</source> + <translation type="unfinished"/> + </message> + <message> + <source>C&lose</source> + <translation type="unfinished"/> + </message> + <message> + <source>&Copy Address</source> + <translation>Хаягийг &Хуулбарлах</translation> + </message> + <message> + <source>Delete the currently selected address from the list</source> + <translation type="unfinished"/> + </message> + <message> + <source>Export the data in the current tab to a file</source> + <translation type="unfinished"/> + </message> + <message> + <source>&Export</source> + <translation type="unfinished"/> + </message> + <message> + <source>&Delete</source> + <translation>&Устгах</translation> + </message> + <message> + <source>Choose the address to send coins to</source> + <translation type="unfinished"/> + </message> + <message> + <source>Choose the address to receive coins with</source> + <translation type="unfinished"/> + </message> + <message> + <source>C&hoose</source> + <translation type="unfinished"/> + </message> + <message> + <source>Sending addresses</source> + <translation type="unfinished"/> + </message> + <message> + <source>Receiving addresses</source> + <translation type="unfinished"/> + </message> + <message> + <source>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source> + <translation type="unfinished"/> + </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 type="unfinished"/> + </message> + <message> + <source>Copy &Label</source> + <translation>&Шошгыг хуулбарлах</translation> + </message> + <message> + <source>&Edit</source> + <translation>&Ѳѳрчлѳх</translation> + </message> + <message> + <source>Export Address List</source> + <translation type="unfinished"/> + </message> + <message> + <source>Comma separated file (*.csv)</source> + <translation>Таслалаар тусгаарлагдсан хүснэгтэн файл (.csv)</translation> + </message> + <message> + <source>Exporting Failed</source> + <translation type="unfinished"/> + </message> + <message> + <source>There was an error trying to save the address list to %1.</source> + <translation type="unfinished"/> + </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 type="unfinished"/> + </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>Enter the new passphrase to the wallet.<br/>Please use a passphrase of <b>10 or more random characters</b>, or <b>eight or more words</b>.</source> + <translation>Түрүйвчийн шинэ нууц үгийг оруул. <br/><b>Дор хаяж 10 дурын үсэг/тоо бүхий</b> эсвэл <b>дор хаяж 8 дурын үгнээс бүрдсэн</b> нууц үгийг ашиглана уу. </translation> + </message> + <message> + <source>Encrypt wallet</source> + <translation>Түрүйвчийг цоожлох</translation> + </message> + <message> + <source>This operation needs your wallet passphrase to unlock the wallet.</source> + <translation>Энэ үйлдэлийг гүйцэтгэхийн тулд та нууц үгээрээ түрүйвчийн цоожийг тайлах хэрэгтэй</translation> + </message> + <message> + <source>Unlock wallet</source> + <translation>Түрүйвчийн цоожийг тайлах</translation> + </message> + <message> + <source>This operation needs your wallet passphrase to decrypt the wallet.</source> + <translation>Энэ үйлдэлийг гүйцэтгэхийн тулд та эхлээд түрүйвчийн нууц үгийг оруулж цоожийг тайлах шаардлагтай.</translation> + </message> + <message> + <source>Decrypt wallet</source> + <translation>Түрүйвчийн цоожийг устгах</translation> + </message> + <message> + <source>Change passphrase</source> + <translation>Нууц үгийг солих</translation> + </message> + <message> + <source>Enter the old and new passphrase to the wallet.</source> + <translation>Түрүйвчийн хуучин болоод шинэ нууц үгсийг оруулна уу</translation> + </message> + <message> + <source>Confirm wallet encryption</source> + <translation>Түрүйвчийн цоожийг баталгаажуулах</translation> + </message> + <message> + <source>Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR BITCOINS</b>!</source> + <translation type="unfinished"/> + </message> + <message> + <source>Are you sure you wish to encrypt your wallet?</source> + <translation type="unfinished"/> + </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 type="unfinished"/> + </message> + <message> + <source>Warning: The Caps Lock key is on!</source> + <translation type="unfinished"/> + </message> + <message> + <source>Wallet encrypted</source> + <translation>Түрүйвч цоожлогдлоо</translation> + </message> + <message> + <source>Bitcoin 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>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>BitcoinGUI</name> + <message> + <source>Sign &message...</source> + <translation>&Зурвас хавсаргах...</translation> + </message> + <message> + <source>Synchronizing with network...</source> + <translation>Сүлжээтэй тааруулж байна...</translation> + </message> + <message> + <source>&Overview</source> + <translation type="unfinished"/> + </message> + <message> + <source>Node</source> + <translation>Нод</translation> + </message> + <message> + <source>Show general overview of wallet</source> + <translation type="unfinished"/> + </message> + <message> + <source>&Transactions</source> + <translation>Гүйлгээнүүд</translation> + </message> + <message> + <source>Browse transaction history</source> + <translation>Гүйлгээнүүдийн түүхийг харах</translation> + </message> + <message> + <source>E&xit</source> + <translation>Гарах</translation> + </message> + <message> + <source>Quit application</source> + <translation>Програмаас Гарах</translation> + </message> + <message> + <source>Show information about Bitcoin</source> + <translation>Биткойны мэдээллийг харуулах</translation> + </message> + <message> + <source>About &Qt</source> + <translation>&Клиентийн тухай</translation> + </message> + <message> + <source>Show information about Qt</source> + <translation>Клиентийн тухай мэдээллийг харуул</translation> + </message> + <message> + <source>&Options...</source> + <translation>&Сонголтууд...</translation> + </message> + <message> + <source>&Encrypt Wallet...</source> + <translation>&Түрүйвчийг цоожлох...</translation> + </message> + <message> + <source>&Backup Wallet...</source> + <translation>&Түрүйвчийг Жоорлох...</translation> + </message> + <message> + <source>&Change Passphrase...</source> + <translation>&Нууц Үгийг Солих...</translation> + </message> + <message> + <source>&Sending addresses...</source> + <translation type="unfinished"/> + </message> + <message> + <source>&Receiving addresses...</source> + <translation type="unfinished"/> + </message> + <message> + <source>Open &URI...</source> + <translation type="unfinished"/> + </message> + <message> + <source>Importing blocks from disk...</source> + <translation type="unfinished"/> + </message> + <message> + <source>Reindexing blocks on disk...</source> + <translation type="unfinished"/> + </message> + <message> + <source>Send coins to a Bitcoin address</source> + <translation type="unfinished"/> + </message> + <message> + <source>Modify configuration options for Bitcoin</source> + <translation type="unfinished"/> + </message> + <message> + <source>Backup wallet to another location</source> + <translation type="unfinished"/> + </message> + <message> + <source>Change the passphrase used for wallet encryption</source> + <translation>Түрүйвчийг цоожлох нууц үгийг солих</translation> + </message> + <message> + <source>&Debug window</source> + <translation type="unfinished"/> + </message> + <message> + <source>Open debugging and diagnostic console</source> + <translation>Оношилгоо ба засварын консолыг онгойлго</translation> + </message> + <message> + <source>&Verify message...</source> + <translation type="unfinished"/> + </message> + <message> + <source>Bitcoin</source> + <translation>Биткойн</translation> + </message> + <message> + <source>Wallet</source> + <translation>Түрүйвч</translation> + </message> + <message> + <source>&Send</source> + <translation type="unfinished"/> + </message> + <message> + <source>&Receive</source> + <translation type="unfinished"/> + </message> + <message> + <source>&Show / Hide</source> + <translation>&Харуул / Нуу</translation> + </message> + <message> + <source>Show or hide the main Window</source> + <translation type="unfinished"/> + </message> + <message> + <source>Encrypt the private keys that belong to your wallet</source> + <translation type="unfinished"/> + </message> + <message> + <source>Sign messages with your Bitcoin addresses to prove you own them</source> + <translation type="unfinished"/> + </message> + <message> + <source>Verify messages to ensure they were signed with specified Bitcoin addresses</source> + <translation type="unfinished"/> + </message> + <message> + <source>&File</source> + <translation>&Файл</translation> + </message> + <message> + <source>&Settings</source> + <translation>&Тохиргоо</translation> + </message> + <message> + <source>&Help</source> + <translation>&Тусламж</translation> + </message> + <message> + <source>Tabs toolbar</source> + <translation type="unfinished"/> + </message> + <message> + <source>[testnet]</source> + <translation type="unfinished"/> + </message> + <message> + <source>Bitcoin Core</source> + <translation type="unfinished"/> + </message> + <message> + <source>Request payments (generates QR codes and bitcoin: URIs)</source> + <translation type="unfinished"/> + </message> + <message> + <source>&About Bitcoin Core</source> + <translation type="unfinished"/> + </message> + <message> + <source>Show the list of used sending addresses and labels</source> + <translation type="unfinished"/> + </message> + <message> + <source>Show the list of used receiving addresses and labels</source> + <translation type="unfinished"/> + </message> + <message> + <source>Open a bitcoin: URI or payment request</source> + <translation type="unfinished"/> + </message> + <message> + <source>&Command-line options</source> + <translation type="unfinished"/> + </message> + <message> + <source>Show the Bitcoin Core help message to get a list with possible Bitcoin command-line options</source> + <translation type="unfinished"/> + </message> + <message> + <source>Bitcoin client</source> + <translation>Биткойн клиент</translation> + </message> + <message numerus="yes"> + <source>%n active connection(s) to Bitcoin network</source> + <translation><numerusform>Биткойны сүлжээрүү %n идэвхитэй холболт байна </numerusform><numerusform>Биткойны сүлжээрүү %n идэвхитэй холболтууд байна </numerusform></translation> + </message> + <message> + <source>No block source available...</source> + <translation type="unfinished"/> + </message> + <message> + <source>Processed %1 of %2 (estimated) blocks of transaction history.</source> + <translation type="unfinished"/> + </message> + <message> + <source>Processed %1 blocks of transaction history.</source> + <translation type="unfinished"/> + </message> + <message numerus="yes"> + <source>%n hour(s)</source> + <translation><numerusform>%n цаг</numerusform><numerusform>%n цаг</numerusform></translation> + </message> + <message numerus="yes"> + <source>%n day(s)</source> + <translation><numerusform>%n ѳдѳр</numerusform><numerusform>%n ѳдрүүд</numerusform></translation> + </message> + <message numerus="yes"> + <source>%n week(s)</source> + <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> + </message> + <message> + <source>%1 and %2</source> + <translation type="unfinished"/> + </message> + <message numerus="yes"> + <source>%n year(s)</source> + <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> + </message> + <message> + <source>%1 behind</source> + <translation type="unfinished"/> + </message> + <message> + <source>Last received block was generated %1 ago.</source> + <translation type="unfinished"/> + </message> + <message> + <source>Transactions after this will not yet be visible.</source> + <translation type="unfinished"/> + </message> + <message> + <source>Error</source> + <translation>Алдаа</translation> + </message> + <message> + <source>Warning</source> + <translation type="unfinished"/> + </message> + <message> + <source>Information</source> + <translation type="unfinished"/> + </message> + <message> + <source>Up to date</source> + <translation>Шинэчлэгдсэн</translation> + </message> + <message> + <source>Catching up...</source> + <translation type="unfinished"/> + </message> + <message> + <source>Sent transaction</source> + <translation>Гадагшаа гүйлгээ</translation> + </message> + <message> + <source>Incoming transaction</source> + <translation>Дотогшоо гүйлгээ</translation> + </message> + <message> + <source>Date: %1 +Amount: %2 +Type: %3 +Address: %4 +</source> + <translation>Огноо: %1 + +Хэмжээ: %2 + +Тѳрѳл: %3 + +Хаяг: %4 +</translation> + </message> + <message> + <source>Wallet is <b>encrypted</b> and currently <b>unlocked</b></source> + <translation>Түрүйвч <b>цоожтой</b> ба одоогоор цоож <b>онгорхой</b> байна</translation> + </message> + <message> + <source>Wallet is <b>encrypted</b> and currently <b>locked</b></source> + <translation>Түрүйвч <b>цоожтой</b> ба одоогоор цоож <b>хаалттай</b> байна</translation> + </message> + <message> + <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>ClientModel</name> + <message> + <source>Network Alert</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>CoinControlDialog</name> + <message> + <source>Coin Control Address Selection</source> + <translation type="unfinished"/> + </message> + <message> + <source>Quantity:</source> + <translation type="unfinished"/> + </message> + <message> + <source>Bytes:</source> + <translation type="unfinished"/> + </message> + <message> + <source>Amount:</source> + <translation>Хэмжээ:</translation> + </message> + <message> + <source>Priority:</source> + <translation type="unfinished"/> + </message> + <message> + <source>Fee:</source> + <translation>Тѳлбѳр:</translation> + </message> + <message> + <source>Low Output:</source> + <translation type="unfinished"/> + </message> + <message> + <source>After Fee:</source> + <translation type="unfinished"/> + </message> + <message> + <source>Change:</source> + <translation type="unfinished"/> + </message> + <message> + <source>(un)select all</source> + <translation type="unfinished"/> + </message> + <message> + <source>Tree mode</source> + <translation type="unfinished"/> + </message> + <message> + <source>List mode</source> + <translation type="unfinished"/> + </message> + <message> + <source>Amount</source> + <translation>Хэмжээ</translation> + </message> + <message> + <source>Address</source> + <translation>Хаяг</translation> + </message> + <message> + <source>Date</source> + <translation>Огноо</translation> + </message> + <message> + <source>Confirmations</source> + <translation type="unfinished"/> + </message> + <message> + <source>Confirmed</source> + <translation>Баталгаажлаа</translation> + </message> + <message> + <source>Priority</source> + <translation type="unfinished"/> + </message> + <message> + <source>Copy address</source> + <translation>Хаягийг санах</translation> + </message> + <message> + <source>Copy label</source> + <translation>Шошгыг санах</translation> + </message> + <message> + <source>Copy amount</source> + <translation>Хэмжээг санах</translation> + </message> + <message> + <source>Copy transaction ID</source> + <translation type="unfinished"/> + </message> + <message> + <source>Lock unspent</source> + <translation type="unfinished"/> + </message> + <message> + <source>Unlock unspent</source> + <translation type="unfinished"/> + </message> + <message> + <source>Copy quantity</source> + <translation type="unfinished"/> + </message> + <message> + <source>Copy fee</source> + <translation type="unfinished"/> + </message> + <message> + <source>Copy after fee</source> + <translation type="unfinished"/> + </message> + <message> + <source>Copy bytes</source> + <translation type="unfinished"/> + </message> + <message> + <source>Copy priority</source> + <translation type="unfinished"/> + </message> + <message> + <source>Copy low output</source> + <translation type="unfinished"/> + </message> + <message> + <source>Copy change</source> + <translation>Ѳѳрчлѳлтийг санах</translation> + </message> + <message> + <source>highest</source> + <translation type="unfinished"/> + </message> + <message> + <source>higher</source> + <translation type="unfinished"/> + </message> + <message> + <source>high</source> + <translation type="unfinished"/> + </message> + <message> + <source>medium-high</source> + <translation type="unfinished"/> + </message> + <message> + <source>medium</source> + <translation type="unfinished"/> + </message> + <message> + <source>low-medium</source> + <translation type="unfinished"/> + </message> + <message> + <source>low</source> + <translation type="unfinished"/> + </message> + <message> + <source>lower</source> + <translation type="unfinished"/> + </message> + <message> + <source>lowest</source> + <translation type="unfinished"/> + </message> + <message> + <source>(%1 locked)</source> + <translation type="unfinished"/> + </message> + <message> + <source>none</source> + <translation type="unfinished"/> + </message> + <message> + <source>Dust</source> + <translation type="unfinished"/> + </message> + <message> + <source>yes</source> + <translation type="unfinished"/> + </message> + <message> + <source>no</source> + <translation type="unfinished"/> + </message> + <message> + <source>This label turns red, if the transaction size is greater than 1000 bytes.</source> + <translation type="unfinished"/> + </message> + <message> + <source>This means a fee of at least %1 per kB is required.</source> + <translation type="unfinished"/> + </message> + <message> + <source>Can vary +/- 1 byte per input.</source> + <translation type="unfinished"/> + </message> + <message> + <source>Transactions with higher priority are more likely to get included into a block.</source> + <translation type="unfinished"/> + </message> + <message> + <source>This label turns red, if the priority is smaller than "medium".</source> + <translation type="unfinished"/> + </message> + <message> + <source>This label turns red, if any recipient receives an amount smaller than %1.</source> + <translation type="unfinished"/> + </message> + <message> + <source>This means a fee of at least %1 is required.</source> + <translation type="unfinished"/> + </message> + <message> + <source>Amounts below 0.546 times the minimum relay fee are shown as dust.</source> + <translation type="unfinished"/> + </message> + <message> + <source>This label turns red, if the change is smaller than %1.</source> + <translation type="unfinished"/> + </message> + <message> + <source>(no label)</source> + <translation>(шошгогүй)</translation> + </message> + <message> + <source>change from %1 (%2)</source> + <translation type="unfinished"/> + </message> + <message> + <source>(change)</source> + <translation>(ѳѳрчлѳх)</translation> + </message> +</context> +<context> + <name>EditAddressDialog</name> + <message> + <source>Edit Address</source> + <translation>Хаягийг ѳѳрчлѳх</translation> + </message> + <message> + <source>&Label</source> + <translation>&Шошго</translation> + </message> + <message> + <source>The label associated with this address list entry</source> + <translation type="unfinished"/> + </message> + <message> + <source>The address associated with this address list entry. This can only be modified for sending addresses.</source> + <translation type="unfinished"/> + </message> + <message> + <source>&Address</source> + <translation>&Хаяг</translation> + </message> + <message> + <source>New receiving address</source> + <translation>Шинэ хүлээн авах хаяг</translation> + </message> + <message> + <source>New sending address</source> + <translation>Шинэ явуулах хаяг</translation> + </message> + <message> + <source>Edit receiving address</source> + <translation>Хүлээн авах хаягийг ѳѳрчлѳх</translation> + </message> + <message> + <source>Edit sending address</source> + <translation>Явуулах хаягийг ѳѳрчлѳх</translation> + </message> + <message> + <source>The entered address "%1" is already in the address book.</source> + <translation>Таны оруулсан хаяг "%1" нь хаягийн бүртгэлд ѳмнѳ нь орсон байна</translation> + </message> + <message> + <source>The entered address "%1" is not a valid Bitcoin address.</source> + <translation type="unfinished"/> + </message> + <message> + <source>Could not unlock wallet.</source> + <translation>Түрүйвчийн цоожийг тайлж чадсангүй</translation> + </message> + <message> + <source>New key generation failed.</source> + <translation>Шинэ түлхүүр амжилттай гарсангүй</translation> + </message> +</context> +<context> + <name>FreespaceChecker</name> + <message> + <source>A new data directory will be created.</source> + <translation type="unfinished"/> + </message> + <message> + <source>name</source> + <translation type="unfinished"/> + </message> + <message> + <source>Directory already exists. Add %1 if you intend to create a new directory here.</source> + <translation type="unfinished"/> + </message> + <message> + <source>Path already exists, and is not a directory.</source> + <translation type="unfinished"/> + </message> + <message> + <source>Cannot create data directory here.</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>HelpMessageDialog</name> + <message> + <source>Bitcoin Core - Command-line options</source> + <translation type="unfinished"/> + </message> + <message> + <source>Bitcoin Core</source> + <translation type="unfinished"/> + </message> + <message> + <source>version</source> + <translation>хувилбар</translation> + </message> + <message> + <source>Usage:</source> + <translation>Хэрэглээ:</translation> + </message> + <message> + <source>command-line options</source> + <translation type="unfinished"/> + </message> + <message> + <source>UI options</source> + <translation type="unfinished"/> + </message> + <message> + <source>Set language, for example "de_DE" (default: system locale)</source> + <translation type="unfinished"/> + </message> + <message> + <source>Start minimized</source> + <translation type="unfinished"/> + </message> + <message> + <source>Set SSL root certificates for payment request (default: -system-)</source> + <translation type="unfinished"/> + </message> + <message> + <source>Show splash screen on startup (default: 1)</source> + <translation type="unfinished"/> + </message> + <message> + <source>Choose data directory on startup (default: 0)</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>Intro</name> + <message> + <source>Welcome</source> + <translation type="unfinished"/> + </message> + <message> + <source>Welcome to Bitcoin Core.</source> + <translation type="unfinished"/> + </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 type="unfinished"/> + </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 type="unfinished"/> + </message> + <message> + <source>Use the default data directory</source> + <translation type="unfinished"/> + </message> + <message> + <source>Use a custom data directory:</source> + <translation type="unfinished"/> + </message> + <message> + <source>Bitcoin</source> + <translation>Биткойн</translation> + </message> + <message> + <source>Error: Specified data directory "%1" can not be created.</source> + <translation type="unfinished"/> + </message> + <message> + <source>Error</source> + <translation>Алдаа</translation> + </message> + <message> + <source>GB of free space available</source> + <translation type="unfinished"/> + </message> + <message> + <source>(of %1GB needed)</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>OpenURIDialog</name> + <message> + <source>Open URI</source> + <translation type="unfinished"/> + </message> + <message> + <source>Open payment request from URI or file</source> + <translation type="unfinished"/> + </message> + <message> + <source>URI:</source> + <translation type="unfinished"/> + </message> + <message> + <source>Select payment request file</source> + <translation type="unfinished"/> + </message> + <message> + <source>Select payment request file to open</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>OptionsDialog</name> + <message> + <source>Options</source> + <translation>Сонголтууд</translation> + </message> + <message> + <source>&Main</source> + <translation type="unfinished"/> + </message> + <message> + <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB.</source> + <translation type="unfinished"/> + </message> + <message> + <source>Pay transaction &fee</source> + <translation type="unfinished"/> + </message> + <message> + <source>Automatically start Bitcoin after logging in to the system.</source> + <translation type="unfinished"/> + </message> + <message> + <source>&Start Bitcoin on system login</source> + <translation type="unfinished"/> + </message> + <message> + <source>Size of &database cache</source> + <translation type="unfinished"/> + </message> + <message> + <source>MB</source> + <translation>МБ</translation> + </message> + <message> + <source>Number of script &verification threads</source> + <translation type="unfinished"/> + </message> + <message> + <source>Connect to the Bitcoin network through a SOCKS proxy.</source> + <translation>Биткойны сүлжээрүү SOCKS проксигоор холбогдох.</translation> + </message> + <message> + <source>&Connect through SOCKS proxy (default proxy):</source> + <translation type="unfinished"/> + </message> + <message> + <source>IP address of the proxy (e.g. IPv4: 127.0.0.1 / IPv6: ::1)</source> + <translation>проксигийн IP хаяг (жишээ нь: IPv4: 127.0.0.1 / IPv6: ::1)</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 type="unfinished"/> + </message> + <message> + <source>Third party transaction URLs</source> + <translation type="unfinished"/> + </message> + <message> + <source>Active command-line options that override above options:</source> + <translation type="unfinished"/> + </message> + <message> + <source>Reset all client options to default.</source> + <translation type="unfinished"/> + </message> + <message> + <source>&Reset Options</source> + <translation type="unfinished"/> + </message> + <message> + <source>&Network</source> + <translation type="unfinished"/> + </message> + <message> + <source>(0 = auto, <0 = leave that many cores free)</source> + <translation type="unfinished"/> + </message> + <message> + <source>W&allet</source> + <translation type="unfinished"/> + </message> + <message> + <source>Expert</source> + <translation type="unfinished"/> + </message> + <message> + <source>Enable coin &control features</source> + <translation type="unfinished"/> + </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 type="unfinished"/> + </message> + <message> + <source>&Spend unconfirmed change</source> + <translation type="unfinished"/> + </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 type="unfinished"/> + </message> + <message> + <source>Map port using &UPnP</source> + <translation type="unfinished"/> + </message> + <message> + <source>Proxy &IP:</source> + <translation type="unfinished"/> + </message> + <message> + <source>&Port:</source> + <translation type="unfinished"/> + </message> + <message> + <source>Port of the proxy (e.g. 9050)</source> + <translation type="unfinished"/> + </message> + <message> + <source>SOCKS &Version:</source> + <translation type="unfinished"/> + </message> + <message> + <source>SOCKS version of the proxy (e.g. 5)</source> + <translation type="unfinished"/> + </message> + <message> + <source>&Window</source> + <translation type="unfinished"/> + </message> + <message> + <source>Show only a tray icon after minimizing the window.</source> + <translation type="unfinished"/> + </message> + <message> + <source>&Minimize to the tray instead of the taskbar</source> + <translation type="unfinished"/> + </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 Quit in the menu.</source> + <translation type="unfinished"/> + </message> + <message> + <source>M&inimize on close</source> + <translation type="unfinished"/> + </message> + <message> + <source>&Display</source> + <translation type="unfinished"/> + </message> + <message> + <source>User Interface &language:</source> + <translation type="unfinished"/> + </message> + <message> + <source>The user interface language can be set here. This setting will take effect after restarting Bitcoin.</source> + <translation type="unfinished"/> + </message> + <message> + <source>&Unit to show amounts in:</source> + <translation type="unfinished"/> + </message> + <message> + <source>Choose the default subdivision unit to show in the interface and when sending coins.</source> + <translation type="unfinished"/> + </message> + <message> + <source>Whether to show Bitcoin addresses in the transaction list or not.</source> + <translation type="unfinished"/> + </message> + <message> + <source>&Display addresses in transaction list</source> + <translation type="unfinished"/> + </message> + <message> + <source>Whether to show coin control features or not.</source> + <translation type="unfinished"/> + </message> + <message> + <source>&OK</source> + <translation type="unfinished"/> + </message> + <message> + <source>&Cancel</source> + <translation type="unfinished"/> + </message> + <message> + <source>default</source> + <translation type="unfinished"/> + </message> + <message> + <source>none</source> + <translation type="unfinished"/> + </message> + <message> + <source>Confirm options reset</source> + <translation type="unfinished"/> + </message> + <message> + <source>Client restart required to activate changes.</source> + <translation>Ѳѳрчлѳлтүүдийг идэвхижүүлхийн тулд клиентийг ахин эхлүүлэх шаардлагтай</translation> + </message> + <message> + <source>Client will be shutdown, do you want to proceed?</source> + <translation>Клиент унтрах гэж байна, яг унтраах уу?</translation> + </message> + <message> + <source>This change would require a client restart.</source> + <translation>Энэ ѳѳрчлѳлтийг оруулахын тулд кли1нт програмыг ахин эхлүүлэх шаардлагтай</translation> + </message> + <message> + <source>The supplied proxy address is invalid.</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>OverviewPage</name> + <message> + <source>Form</source> + <translation type="unfinished"/> + </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 type="unfinished"/> + </message> + <message> + <source>Wallet</source> + <translation>Түрүйвч</translation> + </message> + <message> + <source>Available:</source> + <translation>Хэрэглэж болох хэмжээ:</translation> + </message> + <message> + <source>Your current spendable balance</source> + <translation type="unfinished"/> + </message> + <message> + <source>Pending:</source> + <translation type="unfinished"/> + </message> + <message> + <source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source> + <translation type="unfinished"/> + </message> + <message> + <source>Immature:</source> + <translation type="unfinished"/> + </message> + <message> + <source>Mined balance that has not yet matured</source> + <translation type="unfinished"/> + </message> + <message> + <source>Total:</source> + <translation type="unfinished"/> + </message> + <message> + <source>Your current total balance</source> + <translation type="unfinished"/> + </message> + <message> + <source><b>Recent transactions</b></source> + <translation><b>Сүүлд хийгдсэн гүйлгээнүүд</b></translation> + </message> + <message> + <source>out of sync</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>PaymentServer</name> + <message> + <source>URI handling</source> + <translation type="unfinished"/> + </message> + <message> + <source>URI can not be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters.</source> + <translation type="unfinished"/> + </message> + <message> + <source>Requested payment amount of %1 is too small (considered dust).</source> + <translation type="unfinished"/> + </message> + <message> + <source>Payment request error</source> + <translation type="unfinished"/> + </message> + <message> + <source>Cannot start bitcoin: click-to-pay handler</source> + <translation type="unfinished"/> + </message> + <message> + <source>Net manager warning</source> + <translation type="unfinished"/> + </message> + <message> + <source>Your active proxy doesn't support SOCKS5, which is required for payment requests via proxy.</source> + <translation type="unfinished"/> + </message> + <message> + <source>Payment request fetch URL is invalid: %1</source> + <translation type="unfinished"/> + </message> + <message> + <source>Payment request file handling</source> + <translation type="unfinished"/> + </message> + <message> + <source>Payment request file can not be read or processed! This can be caused by an invalid payment request file.</source> + <translation type="unfinished"/> + </message> + <message> + <source>Unverified payment requests to custom payment scripts are unsupported.</source> + <translation type="unfinished"/> + </message> + <message> + <source>Refund from %1</source> + <translation type="unfinished"/> + </message> + <message> + <source>Error communicating with %1: %2</source> + <translation type="unfinished"/> + </message> + <message> + <source>Payment request can not be parsed or processed!</source> + <translation type="unfinished"/> + </message> + <message> + <source>Bad response from server %1</source> + <translation type="unfinished"/> + </message> + <message> + <source>Payment acknowledged</source> + <translation type="unfinished"/> + </message> + <message> + <source>Network request error</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>QObject</name> + <message> + <source>Bitcoin</source> + <translation>Биткойн</translation> + </message> + <message> + <source>Error: Specified data directory "%1" does not exist.</source> + <translation type="unfinished"/> + </message> + <message> + <source>Error: Cannot parse configuration file: %1. Only use key=value syntax.</source> + <translation type="unfinished"/> + </message> + <message> + <source>Error: Invalid combination of -regtest and -testnet.</source> + <translation type="unfinished"/> + </message> + <message> + <source>Bitcoin Core didn't yet exit safely...</source> + <translation type="unfinished"/> + </message> + <message> + <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>QRImageWidget</name> + <message> + <source>&Save Image...</source> + <translation type="unfinished"/> + </message> + <message> + <source>&Copy Image</source> + <translation type="unfinished"/> + </message> + <message> + <source>Save QR Code</source> + <translation type="unfinished"/> + </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>Алга Байна</translation> + </message> + <message> + <source>Client version</source> + <translation>Клиентийн хувилбар</translation> + </message> + <message> + <source>&Information</source> + <translation>&Мэдээллэл</translation> + </message> + <message> + <source>Debug window</source> + <translation type="unfinished"/> + </message> + <message> + <source>General</source> + <translation>Ерѳнхий</translation> + </message> + <message> + <source>Using OpenSSL version</source> + <translation type="unfinished"/> + </message> + <message> + <source>Startup time</source> + <translation type="unfinished"/> + </message> + <message> + <source>Network</source> + <translation>Сүлжээ</translation> + </message> + <message> + <source>Name</source> + <translation>Нэр</translation> + </message> + <message> + <source>Number of connections</source> + <translation>Холболтын тоо</translation> + </message> + <message> + <source>Block chain</source> + <translation>Блокийн цуваа</translation> + </message> + <message> + <source>Current number of blocks</source> + <translation>Одоогийн блокийн тоо</translation> + </message> + <message> + <source>Estimated total blocks</source> + <translation>Нийт блокийн барагцаа</translation> + </message> + <message> + <source>Last block time</source> + <translation>Сүүлийн блокийн хугацаа</translation> + </message> + <message> + <source>&Open</source> + <translation>&Нээх</translation> + </message> + <message> + <source>&Console</source> + <translation>&Консол</translation> + </message> + <message> + <source>&Network Traffic</source> + <translation type="unfinished"/> + </message> + <message> + <source>&Clear</source> + <translation type="unfinished"/> + </message> + <message> + <source>Totals</source> + <translation type="unfinished"/> + </message> + <message> + <source>In:</source> + <translation type="unfinished"/> + </message> + <message> + <source>Out:</source> + <translation type="unfinished"/> + </message> + <message> + <source>Build date</source> + <translation type="unfinished"/> + </message> + <message> + <source>Debug log file</source> + <translation type="unfinished"/> + </message> + <message> + <source>Open the Bitcoin debug log file from the current data directory. This can take a few seconds for large log files.</source> + <translation type="unfinished"/> + </message> + <message> + <source>Clear console</source> + <translation>Консолыг цэвэрлэх</translation> + </message> + <message> + <source>Welcome to the Bitcoin RPC console.</source> + <translation type="unfinished"/> + </message> + <message> + <source>Use up and down arrows to navigate history, and <b>Ctrl-L</b> to clear screen.</source> + <translation type="unfinished"/> + </message> + <message> + <source>Type <b>help</b> for an overview of available commands.</source> + <translation type="unfinished"/> + </message> + <message> + <source>%1 B</source> + <translation type="unfinished"/> + </message> + <message> + <source>%1 KB</source> + <translation type="unfinished"/> + </message> + <message> + <source>%1 MB</source> + <translation type="unfinished"/> + </message> + <message> + <source>%1 GB</source> + <translation type="unfinished"/> + </message> + <message> + <source>%1 m</source> + <translation type="unfinished"/> + </message> + <message> + <source>%1 h</source> + <translation type="unfinished"/> + </message> + <message> + <source>%1 h %2 m</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>ReceiveCoinsDialog</name> + <message> + <source>&Amount:</source> + <translation type="unfinished"/> + </message> + <message> + <source>&Label:</source> + <translation>&Шошго:</translation> + </message> + <message> + <source>&Message:</source> + <translation type="unfinished"/> + </message> + <message> + <source>Reuse one of the previously used receiving addresses. Reusing addresses has security and privacy issues. Do not use this unless re-generating a payment request made before.</source> + <translation type="unfinished"/> + </message> + <message> + <source>R&euse an existing receiving address (not recommended)</source> + <translation type="unfinished"/> + </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 type="unfinished"/> + </message> + <message> + <source>An optional label to associate with the new receiving address.</source> + <translation type="unfinished"/> + </message> + <message> + <source>Use this form to request payments. All fields are <b>optional</b>.</source> + <translation type="unfinished"/> + </message> + <message> + <source>An optional amount to request. Leave this empty or zero to not request a specific amount.</source> + <translation type="unfinished"/> + </message> + <message> + <source>Clear all fields of the form.</source> + <translation type="unfinished"/> + </message> + <message> + <source>Clear</source> + <translation type="unfinished"/> + </message> + <message> + <source>Requested payments history</source> + <translation type="unfinished"/> + </message> + <message> + <source>&Request payment</source> + <translation type="unfinished"/> + </message> + <message> + <source>Show the selected request (does the same as double clicking an entry)</source> + <translation type="unfinished"/> + </message> + <message> + <source>Show</source> + <translation>Харуул</translation> + </message> + <message> + <source>Remove the selected entries from the list</source> + <translation>Сонгогдсон ѳгѳгдлүүдийг устгах</translation> + </message> + <message> + <source>Remove</source> + <translation>Устгах</translation> + </message> + <message> + <source>Copy label</source> + <translation>Шошгыг санах</translation> + </message> + <message> + <source>Copy message</source> + <translation>Зурвасыг санах</translation> + </message> + <message> + <source>Copy amount</source> + <translation>Хэмжээг санах</translation> + </message> +</context> +<context> + <name>ReceiveRequestDialog</name> + <message> + <source>QR Code</source> + <translation type="unfinished"/> + </message> + <message> + <source>Copy &URI</source> + <translation type="unfinished"/> + </message> + <message> + <source>Copy &Address</source> + <translation type="unfinished"/> + </message> + <message> + <source>&Save Image...</source> + <translation type="unfinished"/> + </message> + <message> + <source>Request payment to %1</source> + <translation type="unfinished"/> + </message> + <message> + <source>Payment information</source> + <translation type="unfinished"/> + </message> + <message> + <source>URI</source> + <translation type="unfinished"/> + </message> + <message> + <source>Address</source> + <translation>Хаяг</translation> + </message> + <message> + <source>Amount</source> + <translation>Хэмжээ</translation> + </message> + <message> + <source>Label</source> + <translation>Шошго</translation> + </message> + <message> + <source>Message</source> + <translation>Зурвас</translation> + </message> + <message> + <source>Resulting URI too long, try to reduce the text for label / message.</source> + <translation type="unfinished"/> + </message> + <message> + <source>Error encoding URI into QR Code.</source> + <translation type="unfinished"/> + </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> + <message> + <source>(no label)</source> + <translation>(шошго алга)</translation> + </message> + <message> + <source>(no message)</source> + <translation>(зурвас алга)</translation> + </message> + <message> + <source>(no amount)</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>SendCoinsDialog</name> + <message> + <source>Send Coins</source> + <translation>Зоос явуулах</translation> + </message> + <message> + <source>Coin Control Features</source> + <translation type="unfinished"/> + </message> + <message> + <source>Inputs...</source> + <translation type="unfinished"/> + </message> + <message> + <source>automatically selected</source> + <translation>автоматаар сонгогдсон</translation> + </message> + <message> + <source>Insufficient funds!</source> + <translation>Таны дансны үлдэгдэл хүрэлцэхгүй байна!</translation> + </message> + <message> + <source>Quantity:</source> + <translation type="unfinished"/> + </message> + <message> + <source>Bytes:</source> + <translation type="unfinished"/> + </message> + <message> + <source>Amount:</source> + <translation>Хэмжээ:</translation> + </message> + <message> + <source>Priority:</source> + <translation type="unfinished"/> + </message> + <message> + <source>Fee:</source> + <translation>Тѳлбѳр:</translation> + </message> + <message> + <source>Low Output:</source> + <translation type="unfinished"/> + </message> + <message> + <source>After Fee:</source> + <translation type="unfinished"/> + </message> + <message> + <source>Change:</source> + <translation type="unfinished"/> + </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 type="unfinished"/> + </message> + <message> + <source>Custom change address</source> + <translation type="unfinished"/> + </message> + <message> + <source>Send to multiple recipients at once</source> + <translation>Нэгэн зэрэг олон хүлээн авагчруу явуулах</translation> + </message> + <message> + <source>Add &Recipient</source> + <translation>&Хүлээн авагчийг Нэмэх</translation> + </message> + <message> + <source>Clear all fields of the form.</source> + <translation type="unfinished"/> + </message> + <message> + <source>Clear &All</source> + <translation>&Бүгдийг Цэвэрлэ</translation> + </message> + <message> + <source>Balance:</source> + <translation>Баланс:</translation> + </message> + <message> + <source>Confirm the send action</source> + <translation>Явуулах үйлдлийг баталгаажуулна уу</translation> + </message> + <message> + <source>S&end</source> + <translation>Яв&уул</translation> + </message> + <message> + <source>Confirm send coins</source> + <translation>Зоос явуулахыг баталгаажуулна уу</translation> + </message> + <message> + <source>%1 to %2</source> + <translation type="unfinished"/> + </message> + <message> + <source>Copy quantity</source> + <translation type="unfinished"/> + </message> + <message> + <source>Copy amount</source> + <translation>Хэмжээг санах</translation> + </message> + <message> + <source>Copy fee</source> + <translation type="unfinished"/> + </message> + <message> + <source>Copy after fee</source> + <translation type="unfinished"/> + </message> + <message> + <source>Copy bytes</source> + <translation type="unfinished"/> + </message> + <message> + <source>Copy priority</source> + <translation type="unfinished"/> + </message> + <message> + <source>Copy low output</source> + <translation type="unfinished"/> + </message> + <message> + <source>Copy change</source> + <translation>Ѳѳрчлѳлтийг санах</translation> + </message> + <message> + <source>Total Amount %1 (= %2)</source> + <translation>Нийт дүн %1 (= %2)</translation> + </message> + <message> + <source>or</source> + <translation>эсвэл</translation> + </message> + <message> + <source>The recipient address is not valid, please recheck.</source> + <translation type="unfinished"/> + </message> + <message> + <source>The amount to pay must be larger than 0.</source> + <translation>Тѳлѳх хэмжээ 0.-оос их байх ёстой</translation> + </message> + <message> + <source>The amount exceeds your balance.</source> + <translation>Энэ хэмжээ таны балансаас хэтэрсэн байна.</translation> + </message> + <message> + <source>The total exceeds your balance when the %1 transaction fee is included.</source> + <translation>Гүйлгээний тѳлбѳр %1-ийг тооцхоор нийт дүн нь таны балансаас хэтрээд байна.</translation> + </message> + <message> + <source>Duplicate address found, can only send to each address once per send operation.</source> + <translation type="unfinished"/> + </message> + <message> + <source>Transaction creation failed!</source> + <translation type="unfinished"/> + </message> + <message> + <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"/> + </message> + <message> + <source>Warning: Invalid Bitcoin address</source> + <translation>Анхаар:Буруу Биткойны хаяг байна</translation> + </message> + <message> + <source>(no label)</source> + <translation>(шошгогүй)</translation> + </message> + <message> + <source>Warning: Unknown change address</source> + <translation type="unfinished"/> + </message> + <message> + <source>Are you sure you want to send?</source> + <translation type="unfinished"/> + </message> + <message> + <source>added as transaction fee</source> + <translation type="unfinished"/> + </message> + <message> + <source>Payment request expired</source> + <translation type="unfinished"/> + </message> + <message> + <source>Invalid payment address %1</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>SendCoinsEntry</name> + <message> + <source>A&mount:</source> + <translation>Дүн:</translation> + </message> + <message> + <source>Pay &To:</source> + <translation>Тѳлѳх &хаяг:</translation> + </message> + <message> + <source>The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> + <translation type="unfinished"/> + </message> + <message> + <source>Enter a label for this address to add it to your address book</source> + <translation>Энэ хаягийг ѳѳрийн бүртгэлдээ авахын тулд шошго оруул</translation> + </message> + <message> + <source>&Label:</source> + <translation>&Шошго:</translation> + </message> + <message> + <source>Choose previously used address</source> + <translation type="unfinished"/> + </message> + <message> + <source>This is a normal payment.</source> + <translation type="unfinished"/> + </message> + <message> + <source>Alt+A</source> + <translation>Alt+A</translation> + </message> + <message> + <source>Paste address from clipboard</source> + <translation>Копидсон хаягийг буулгах</translation> + </message> + <message> + <source>Alt+P</source> + <translation>Alt+P</translation> + </message> + <message> + <source>Remove this entry</source> + <translation type="unfinished"/> + </message> + <message> + <source>Message:</source> + <translation>Зурвас:</translation> + </message> + <message> + <source>This is a verified payment request.</source> + <translation type="unfinished"/> + </message> + <message> + <source>Enter a label for this address to add it to the list of used addresses</source> + <translation type="unfinished"/> + </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 type="unfinished"/> + </message> + <message> + <source>This is an unverified payment request.</source> + <translation type="unfinished"/> + </message> + <message> + <source>Pay To:</source> + <translation type="unfinished"/> + </message> + <message> + <source>Memo:</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>ShutdownWindow</name> + <message> + <source>Bitcoin Core is shutting down...</source> + <translation>Биткойны цѳм хаагдаж байна...</translation> + </message> + <message> + <source>Do not shut down the computer until this window disappears.</source> + <translation>Энэ цонхыг хаагдтал компьютерээ бүү унтраагаарай</translation> + </message> +</context> +<context> + <name>SignVerifyMessageDialog</name> + <message> + <source>Signatures - Sign / Verify a Message</source> + <translation type="unfinished"/> + </message> + <message> + <source>&Sign Message</source> + <translation type="unfinished"/> + </message> + <message> + <source>You can sign messages with your addresses to prove you own them. Be careful not to sign anything vague, 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 type="unfinished"/> + </message> + <message> + <source>The address to sign the message with (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> + <translation type="unfinished"/> + </message> + <message> + <source>Choose previously used address</source> + <translation type="unfinished"/> + </message> + <message> + <source>Alt+A</source> + <translation>Alt+A</translation> + </message> + <message> + <source>Paste address from clipboard</source> + <translation>Копидсон хаягийг буулгах</translation> + </message> + <message> + <source>Alt+P</source> + <translation>Alt+P</translation> + </message> + <message> + <source>Enter the message you want to sign here</source> + <translation type="unfinished"/> + </message> + <message> + <source>Signature</source> + <translation type="unfinished"/> + </message> + <message> + <source>Copy the current signature to the system clipboard</source> + <translation type="unfinished"/> + </message> + <message> + <source>Sign the message to prove you own this Bitcoin address</source> + <translation type="unfinished"/> + </message> + <message> + <source>Sign &Message</source> + <translation type="unfinished"/> + </message> + <message> + <source>Reset all sign message fields</source> + <translation type="unfinished"/> + </message> + <message> + <source>Clear &All</source> + <translation>&Бүгдийг Цэвэрлэ</translation> + </message> + <message> + <source>&Verify Message</source> + <translation type="unfinished"/> + </message> + <message> + <source>Enter the signing 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.</source> + <translation type="unfinished"/> + </message> + <message> + <source>The address the message was signed with (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> + <translation type="unfinished"/> + </message> + <message> + <source>Verify the message to ensure it was signed with the specified Bitcoin address</source> + <translation type="unfinished"/> + </message> + <message> + <source>Verify &Message</source> + <translation type="unfinished"/> + </message> + <message> + <source>Reset all verify message fields</source> + <translation type="unfinished"/> + </message> + <message> + <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> + <translation type="unfinished"/> + </message> + <message> + <source>Click "Sign Message" to generate signature</source> + <translation type="unfinished"/> + </message> + <message> + <source>The entered address is invalid.</source> + <translation type="unfinished"/> + </message> + <message> + <source>Please check the address and try again.</source> + <translation type="unfinished"/> + </message> + <message> + <source>The entered address does not refer to a key.</source> + <translation type="unfinished"/> + </message> + <message> + <source>Wallet unlock was cancelled.</source> + <translation type="unfinished"/> + </message> + <message> + <source>Private key for the entered address is not available.</source> + <translation type="unfinished"/> + </message> + <message> + <source>Message signing failed.</source> + <translation type="unfinished"/> + </message> + <message> + <source>Message signed.</source> + <translation type="unfinished"/> + </message> + <message> + <source>The signature could not be decoded.</source> + <translation type="unfinished"/> + </message> + <message> + <source>Please check the signature and try again.</source> + <translation type="unfinished"/> + </message> + <message> + <source>The signature did not match the message digest.</source> + <translation type="unfinished"/> + </message> + <message> + <source>Message verification failed.</source> + <translation type="unfinished"/> + </message> + <message> + <source>Message verified.</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>SplashScreen</name> + <message> + <source>Bitcoin Core</source> + <translation type="unfinished"/> + </message> + <message> + <source>The Bitcoin Core developers</source> + <translation type="unfinished"/> + </message> + <message> + <source>[testnet]</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>TrafficGraphWidget</name> + <message> + <source>KB/s</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>TransactionDesc</name> + <message> + <source>Open until %1</source> + <translation>%1 хүртэл нээлттэй</translation> + </message> + <message> + <source>conflicted</source> + <translation>зѳрчилдлѳѳ</translation> + </message> + <message> + <source>%1/offline</source> + <translation type="unfinished"/> + </message> + <message> + <source>%1/unconfirmed</source> + <translation>%1/баталгаажаагүй</translation> + </message> + <message> + <source>%1 confirmations</source> + <translation>%1 баталгаажилтууд</translation> + </message> + <message> + <source>Status</source> + <translation type="unfinished"/> + </message> + <message numerus="yes"> + <source>, broadcast through %n node(s)</source> + <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> + </message> + <message> + <source>Date</source> + <translation>Огноо</translation> + </message> + <message> + <source>Source</source> + <translation type="unfinished"/> + </message> + <message> + <source>Generated</source> + <translation type="unfinished"/> + </message> + <message> + <source>From</source> + <translation type="unfinished"/> + </message> + <message> + <source>To</source> + <translation type="unfinished"/> + </message> + <message> + <source>own address</source> + <translation type="unfinished"/> + </message> + <message> + <source>label</source> + <translation type="unfinished"/> + </message> + <message> + <source>Credit</source> + <translation type="unfinished"/> + </message> + <message numerus="yes"> + <source>matures in %n more block(s)</source> + <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> + </message> + <message> + <source>not accepted</source> + <translation type="unfinished"/> + </message> + <message> + <source>Debit</source> + <translation type="unfinished"/> + </message> + <message> + <source>Transaction fee</source> + <translation type="unfinished"/> + </message> + <message> + <source>Net amount</source> + <translation type="unfinished"/> + </message> + <message> + <source>Message</source> + <translation>Зурвас</translation> + </message> + <message> + <source>Comment</source> + <translation type="unfinished"/> + </message> + <message> + <source>Transaction ID</source> + <translation type="unfinished"/> + </message> + <message> + <source>Merchant</source> + <translation type="unfinished"/> + </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 type="unfinished"/> + </message> + <message> + <source>Debug information</source> + <translation type="unfinished"/> + </message> + <message> + <source>Transaction</source> + <translation type="unfinished"/> + </message> + <message> + <source>Inputs</source> + <translation type="unfinished"/> + </message> + <message> + <source>Amount</source> + <translation>Хэмжээ</translation> + </message> + <message> + <source>true</source> + <translation type="unfinished"/> + </message> + <message> + <source>false</source> + <translation type="unfinished"/> + </message> + <message> + <source>, has not been successfully broadcast yet</source> + <translation>, хараахан амжилттай цацагдаагүй байна</translation> + </message> + <message numerus="yes"> + <source>Open for %n more block(s)</source> + <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> + </message> + <message> + <source>unknown</source> + <translation>үл мэдэгдэх</translation> + </message> +</context> +<context> + <name>TransactionDescDialog</name> + <message> + <source>Transaction details</source> + <translation>Гүйлгээний мэдээллэл</translation> + </message> + <message> + <source>This pane shows a detailed description of the transaction</source> + <translation>Гүйлгээний дэлгэрэнгүйг энэ бичил цонх харуулж байна</translation> + </message> +</context> +<context> + <name>TransactionTableModel</name> + <message> + <source>Date</source> + <translation>Огноо</translation> + </message> + <message> + <source>Type</source> + <translation>Тѳрѳл</translation> + </message> + <message> + <source>Address</source> + <translation>Хаяг</translation> + </message> + <message> + <source>Amount</source> + <translation>Хэмжээ</translation> + </message> + <message> + <source>Immature (%1 confirmations, will be available after %2)</source> + <translation type="unfinished"/> + </message> + <message numerus="yes"> + <source>Open for %n more block(s)</source> + <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> + </message> + <message> + <source>Open until %1</source> + <translation>%1 хүртэл нээлттэй</translation> + </message> + <message> + <source>Confirmed (%1 confirmations)</source> + <translation>Баталгаажлаа (%1 баталгаажилт)</translation> + </message> + <message> + <source>This block was not received by any other nodes and will probably not be accepted!</source> + <translation>Энэ блокийг аль ч нод хүлээн авсангүй ба ер нь зѳвшѳѳрѳгдѳхгүй байж мэднэ!</translation> + </message> + <message> + <source>Generated but not accepted</source> + <translation>Үүсгэгдсэн гэхдээ хүлээн авагдаагүй</translation> + </message> + <message> + <source>Offline</source> + <translation type="unfinished"/> + </message> + <message> + <source>Unconfirmed</source> + <translation>Баталгаажаагүй</translation> + </message> + <message> + <source>Confirming (%1 of %2 recommended confirmations)</source> + <translation type="unfinished"/> + </message> + <message> + <source>Conflicted</source> + <translation>Зѳрчилдлѳѳ</translation> + </message> + <message> + <source>Received with</source> + <translation>Хүлээн авсан хаяг</translation> + </message> + <message> + <source>Received from</source> + <translation>Хүлээн авагдсан хаяг</translation> + </message> + <message> + <source>Sent to</source> + <translation>Явуулсан хаяг</translation> + </message> + <message> + <source>Payment to yourself</source> + <translation>Ѳѳрлүүгээ хийсэн тѳлбѳр</translation> + </message> + <message> + <source>Mined</source> + <translation>Олборлогдсон</translation> + </message> + <message> + <source>(n/a)</source> + <translation>(алга байна)</translation> + </message> + <message> + <source>Transaction status. Hover over this field to show number of confirmations.</source> + <translation>Гүйлгээний байдал. Энд хулганыг авчирч баталгаажуулалтын тоог харна уу.</translation> + </message> + <message> + <source>Date and time that the transaction was received.</source> + <translation>Гүйлгээг хүлээн авсан огноо ба цаг.</translation> + </message> + <message> + <source>Type of transaction.</source> + <translation>Гүйлгээний тѳрѳл</translation> + </message> + <message> + <source>Destination address of transaction.</source> + <translation>Гүйлгээг хүлээн авах хаяг</translation> + </message> + <message> + <source>Amount removed from or added to balance.</source> + <translation>Балансаас авагдсан болон нэмэгдсэн хэмжээ.</translation> + </message> +</context> +<context> + <name>TransactionView</name> + <message> + <source>All</source> + <translation>Бүгд</translation> + </message> + <message> + <source>Today</source> + <translation>Ѳнѳѳдѳр</translation> + </message> + <message> + <source>This week</source> + <translation>Энэ долоо хоног</translation> + </message> + <message> + <source>This month</source> + <translation>Энэ сар</translation> + </message> + <message> + <source>Last month</source> + <translation>Ѳнгѳрсѳн сар</translation> + </message> + <message> + <source>This year</source> + <translation>Энэ жил</translation> + </message> + <message> + <source>Range...</source> + <translation type="unfinished"/> + </message> + <message> + <source>Received with</source> + <translation>Хүлээн авсан хаяг</translation> + </message> + <message> + <source>Sent to</source> + <translation>Явуулсан хаяг</translation> + </message> + <message> + <source>To yourself</source> + <translation>Ѳѳрлүүгээ</translation> + </message> + <message> + <source>Mined</source> + <translation>Олборлогдсон</translation> + </message> + <message> + <source>Other</source> + <translation>Бусад</translation> + </message> + <message> + <source>Enter address or label to search</source> + <translation>Хайлт хийхийн тулд хаяг эсвэл шошгыг оруул</translation> + </message> + <message> + <source>Min amount</source> + <translation>Хамгийн бага хэмжээ</translation> + </message> + <message> + <source>Copy address</source> + <translation>Хаягийг санах</translation> + </message> + <message> + <source>Copy label</source> + <translation>Шошгыг санах</translation> + </message> + <message> + <source>Copy amount</source> + <translation>Хэмжээг санах</translation> + </message> + <message> + <source>Copy transaction ID</source> + <translation type="unfinished"/> + </message> + <message> + <source>Edit label</source> + <translation>Шошгыг ѳѳрчлѳх</translation> + </message> + <message> + <source>Show transaction details</source> + <translation>Гүйлгээний дэлгэрэнгүйг харуул</translation> + </message> + <message> + <source>Export Transaction History</source> + <translation type="unfinished"/> + </message> + <message> + <source>Exporting Failed</source> + <translation type="unfinished"/> + </message> + <message> + <source>There was an error trying to save the transaction history to %1.</source> + <translation type="unfinished"/> + </message> + <message> + <source>Exporting Successful</source> + <translation type="unfinished"/> + </message> + <message> + <source>The transaction history was successfully saved to %1.</source> + <translation>Гүйлгээнүй түүхийг %1-д амжилттай хадгаллаа.</translation> + </message> + <message> + <source>Comma separated file (*.csv)</source> + <translation>Таслалаар тусгаарлагдсан хүснэгтэн файл (.csv)</translation> + </message> + <message> + <source>Confirmed</source> + <translation>Баталгаажлаа</translation> + </message> + <message> + <source>Date</source> + <translation>Огноо</translation> + </message> + <message> + <source>Type</source> + <translation>Тѳрѳл</translation> + </message> + <message> + <source>Label</source> + <translation>Шошго</translation> + </message> + <message> + <source>Address</source> + <translation>Хаяг</translation> + </message> + <message> + <source>Amount</source> + <translation>Хэмжээ</translation> + </message> + <message> + <source>ID</source> + <translation>Тодорхойлолт</translation> + </message> + <message> + <source>Range:</source> + <translation type="unfinished"/> + </message> + <message> + <source>to</source> + <translation>-рүү/руу</translation> + </message> +</context> +<context> + <name>WalletFrame</name> + <message> + <source>No wallet has been loaded.</source> + <translation>Ямар ч түрүйвч ачааллагдсангүй.</translation> + </message> +</context> +<context> + <name>WalletModel</name> + <message> + <source>Send Coins</source> + <translation>Зоос явуулах</translation> + </message> +</context> +<context> + <name>WalletView</name> + <message> + <source>&Export</source> + <translation type="unfinished"/> + </message> + <message> + <source>Export the data in the current tab to a file</source> + <translation type="unfinished"/> + </message> + <message> + <source>Backup Wallet</source> + <translation type="unfinished"/> + </message> + <message> + <source>Wallet Data (*.dat)</source> + <translation type="unfinished"/> + </message> + <message> + <source>Backup Failed</source> + <translation type="unfinished"/> + </message> + <message> + <source>There was an error trying to save the wallet data to %1.</source> + <translation type="unfinished"/> + </message> + <message> + <source>The wallet data was successfully saved to %1.</source> + <translation type="unfinished"/> + </message> + <message> + <source>Backup Successful</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>bitcoin-core</name> + <message> + <source>Usage:</source> + <translation>Хэрэглээ:</translation> + </message> + <message> + <source>List commands</source> + <translation>Үйлдлүүдийг жагсаах</translation> + </message> + <message> + <source>Get help for a command</source> + <translation>Үйлдэлд туслалцаа авах</translation> + </message> + <message> + <source>Options:</source> + <translation>Сонголтууд:</translation> + </message> + <message> + <source>Specify configuration file (default: bitcoin.conf)</source> + <translation type="unfinished"/> + </message> + <message> + <source>Specify pid file (default: bitcoind.pid)</source> + <translation type="unfinished"/> + </message> + <message> + <source>Specify data directory</source> + <translation type="unfinished"/> + </message> + <message> + <source>Listen for connections on <port> (default: 8333 or testnet: 18333)</source> + <translation><port> дээрх холболтуудыг чагна (ѳгѳгдмѳл: 8333 эсвэл testnet: 18333)</translation> + </message> + <message> + <source>Maintain at most <n> connections to peers (default: 125)</source> + <translation type="unfinished"/> + </message> + <message> + <source>Connect to a node to retrieve peer addresses, and disconnect</source> + <translation type="unfinished"/> + </message> + <message> + <source>Specify your own public address</source> + <translation type="unfinished"/> + </message> + <message> + <source>Threshold for disconnecting misbehaving peers (default: 100)</source> + <translation type="unfinished"/> + </message> + <message> + <source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source> + <translation type="unfinished"/> + </message> + <message> + <source>An error occurred while setting up the RPC port %u for listening on IPv4: %s</source> + <translation type="unfinished"/> + </message> + <message> + <source>Listen for JSON-RPC connections on <port> (default: 8332 or testnet: 18332)</source> + <translation type="unfinished"/> + </message> + <message> + <source>Accept command line and JSON-RPC commands</source> + <translation type="unfinished"/> + </message> + <message> + <source>Bitcoin Core RPC client version</source> + <translation type="unfinished"/> + </message> + <message> + <source>Run in the background as a daemon and accept commands</source> + <translation type="unfinished"/> + </message> + <message> + <source>Use the test network</source> + <translation type="unfinished"/> + </message> + <message> + <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> + <translation type="unfinished"/> + </message> + <message> + <source>%s, you must set a rpcpassword in the configuration file: +%s +It is recommended you use the following random password: +rpcuser=bitcoinrpc +rpcpassword=%s +(you do not need to remember this password) +The username and password MUST NOT be the same. +If the file does not exist, create it with owner-readable-only file permissions. +It is also recommended to set alertnotify so you are notified of problems; +for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com +</source> + <translation type="unfinished"/> + </message> + <message> + <source>Acceptable ciphers (default: TLSv1.2+HIGH:TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!3DES:@STRENGTH)</source> + <translation type="unfinished"/> + </message> + <message> + <source>An error occurred while setting up the RPC port %u for listening on IPv6, falling back to IPv4: %s</source> + <translation type="unfinished"/> + </message> + <message> + <source>Bind to given address and always listen on it. Use [host]:port notation for IPv6</source> + <translation type="unfinished"/> + </message> + <message> + <source>Continuously rate-limit free transactions to <n>*1000 bytes per minute (default:15)</source> + <translation type="unfinished"/> + </message> + <message> + <source>Enter regression test mode, which uses a special chain in which blocks can be solved instantly. This is intended for regression testing tools and app development.</source> + <translation type="unfinished"/> + </message> + <message> + <source>Enter regression test mode, which uses a special chain in which blocks can be solved instantly.</source> + <translation type="unfinished"/> + </message> + <message> + <source>Error: Listening for incoming connections failed (listen returned error %d)</source> + <translation type="unfinished"/> + </message> + <message> + <source>Error: 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"/> + </message> + <message> + <source>Error: This transaction requires a transaction fee of at least %s because of its amount, complexity, or use of recently received funds!</source> + <translation type="unfinished"/> + </message> + <message> + <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source> + <translation type="unfinished"/> + </message> + <message> + <source>Fees smaller than this are considered zero fee (for transaction creation) (default:</source> + <translation type="unfinished"/> + </message> + <message> + <source>Flush database activity from memory pool to disk log every <n> megabytes (default: 100)</source> + <translation type="unfinished"/> + </message> + <message> + <source>How thorough the block verification of -checkblocks is (0-4, default: 3)</source> + <translation type="unfinished"/> + </message> + <message> + <source>In this mode -genproclimit controls how many blocks are generated immediately.</source> + <translation type="unfinished"/> + </message> + <message> + <source>Set the number of script verification threads (%u to %d, 0 = auto, <0 = leave that many cores free, default: %d)</source> + <translation type="unfinished"/> + </message> + <message> + <source>Set the processor limit for when generation is on (-1 = unlimited, default: -1)</source> + <translation type="unfinished"/> + </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 type="unfinished"/> + </message> + <message> + <source>Unable to bind to %s on this computer. Bitcoin Core is probably already running.</source> + <translation type="unfinished"/> + </message> + <message> + <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: -proxy)</source> + <translation type="unfinished"/> + </message> + <message> + <source>Warning: -paytxfee is set very high! This is the transaction fee you will pay if you send a transaction.</source> + <translation type="unfinished"/> + </message> + <message> + <source>Warning: Please check that your computer's date and time are correct! If your clock is wrong Bitcoin will not work properly.</source> + <translation type="unfinished"/> + </message> + <message> + <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source> + <translation type="unfinished"/> + </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 type="unfinished"/> + </message> + <message> + <source>Warning: error reading wallet.dat! All keys read correctly, but transaction data or address book entries might be missing or incorrect.</source> + <translation type="unfinished"/> + </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 type="unfinished"/> + </message> + <message> + <source>(default: 1)</source> + <translation type="unfinished"/> + </message> + <message> + <source>(default: wallet.dat)</source> + <translation type="unfinished"/> + </message> + <message> + <source><category> can be:</source> + <translation type="unfinished"/> + </message> + <message> + <source>Attempt to recover private keys from a corrupt wallet.dat</source> + <translation type="unfinished"/> + </message> + <message> + <source>Bitcoin Core Daemon</source> + <translation type="unfinished"/> + </message> + <message> + <source>Block creation options:</source> + <translation type="unfinished"/> + </message> + <message> + <source>Clear list of wallet transactions (diagnostic tool; implies -rescan)</source> + <translation type="unfinished"/> + </message> + <message> + <source>Connect only to the specified node(s)</source> + <translation type="unfinished"/> + </message> + <message> + <source>Connect through SOCKS proxy</source> + <translation>SOCKS проксигоор холбогдох</translation> + </message> + <message> + <source>Connect to JSON-RPC on <port> (default: 8332 or testnet: 18332)</source> + <translation type="unfinished"/> + </message> + <message> + <source>Connection options:</source> + <translation type="unfinished"/> + </message> + <message> + <source>Corrupted block database detected</source> + <translation type="unfinished"/> + </message> + <message> + <source>Debugging/Testing options:</source> + <translation type="unfinished"/> + </message> + <message> + <source>Disable safemode, override a real safe mode event (default: 0)</source> + <translation type="unfinished"/> + </message> + <message> + <source>Discover own IP address (default: 1 when listening and no -externalip)</source> + <translation type="unfinished"/> + </message> + <message> + <source>Do not load the wallet and disable wallet RPC calls</source> + <translation type="unfinished"/> + </message> + <message> + <source>Do you want to rebuild the block database now?</source> + <translation type="unfinished"/> + </message> + <message> + <source>Error initializing block database</source> + <translation type="unfinished"/> + </message> + <message> + <source>Error initializing wallet database environment %s!</source> + <translation type="unfinished"/> + </message> + <message> + <source>Error loading block database</source> + <translation type="unfinished"/> + </message> + <message> + <source>Error opening block database</source> + <translation type="unfinished"/> + </message> + <message> + <source>Error: Disk space is low!</source> + <translation type="unfinished"/> + </message> + <message> + <source>Error: Wallet locked, unable to create transaction!</source> + <translation type="unfinished"/> + </message> + <message> + <source>Error: system error: </source> + <translation type="unfinished"/> + </message> + <message> + <source>Failed to listen on any port. Use -listen=0 if you want this.</source> + <translation type="unfinished"/> + </message> + <message> + <source>Failed to read block info</source> + <translation type="unfinished"/> + </message> + <message> + <source>Failed to read block</source> + <translation type="unfinished"/> + </message> + <message> + <source>Failed to sync block index</source> + <translation type="unfinished"/> + </message> + <message> + <source>Failed to write block index</source> + <translation type="unfinished"/> + </message> + <message> + <source>Failed to write block info</source> + <translation type="unfinished"/> + </message> + <message> + <source>Failed to write block</source> + <translation type="unfinished"/> + </message> + <message> + <source>Failed to write file info</source> + <translation type="unfinished"/> + </message> + <message> + <source>Failed to write to coin database</source> + <translation type="unfinished"/> + </message> + <message> + <source>Failed to write transaction index</source> + <translation type="unfinished"/> + </message> + <message> + <source>Failed to write undo data</source> + <translation type="unfinished"/> + </message> + <message> + <source>Fee per kB to add to transactions you send</source> + <translation type="unfinished"/> + </message> + <message> + <source>Fees smaller than this are considered zero fee (for relaying) (default:</source> + <translation type="unfinished"/> + </message> + <message> + <source>Find peers using DNS lookup (default: 1 unless -connect)</source> + <translation type="unfinished"/> + </message> + <message> + <source>Force safe mode (default: 0)</source> + <translation type="unfinished"/> + </message> + <message> + <source>Generate coins (default: 0)</source> + <translation type="unfinished"/> + </message> + <message> + <source>How many blocks to check at startup (default: 288, 0 = all)</source> + <translation type="unfinished"/> + </message> + <message> + <source>If <category> is not supplied, output all debugging information.</source> + <translation type="unfinished"/> + </message> + <message> + <source>Importing...</source> + <translation type="unfinished"/> + </message> + <message> + <source>Incorrect or no genesis block found. Wrong datadir for network?</source> + <translation type="unfinished"/> + </message> + <message> + <source>Invalid -onion address: '%s'</source> + <translation type="unfinished"/> + </message> + <message> + <source>Not enough file descriptors available.</source> + <translation type="unfinished"/> + </message> + <message> + <source>Prepend debug output with timestamp (default: 1)</source> + <translation type="unfinished"/> + </message> + <message> + <source>RPC client options:</source> + <translation type="unfinished"/> + </message> + <message> + <source>Rebuild block chain index from current blk000??.dat files</source> + <translation type="unfinished"/> + </message> + <message> + <source>Select SOCKS version for -proxy (4 or 5, default: 5)</source> + <translation type="unfinished"/> + </message> + <message> + <source>Set database cache size in megabytes (%d to %d, default: %d)</source> + <translation type="unfinished"/> + </message> + <message> + <source>Set maximum block size in bytes (default: %d)</source> + <translation type="unfinished"/> + </message> + <message> + <source>Set the number of threads to service RPC calls (default: 4)</source> + <translation type="unfinished"/> + </message> + <message> + <source>Specify wallet file (within data directory)</source> + <translation type="unfinished"/> + </message> + <message> + <source>Spend unconfirmed change when sending transactions (default: 1)</source> + <translation type="unfinished"/> + </message> + <message> + <source>This is intended for regression testing tools and app development.</source> + <translation type="unfinished"/> + </message> + <message> + <source>Usage (deprecated, use bitcoin-cli):</source> + <translation type="unfinished"/> + </message> + <message> + <source>Verifying blocks...</source> + <translation type="unfinished"/> + </message> + <message> + <source>Verifying wallet...</source> + <translation type="unfinished"/> + </message> + <message> + <source>Wait for RPC server to start</source> + <translation>RPC серверийг эхэлтэл хүлээ</translation> + </message> + <message> + <source>Wallet %s resides outside data directory %s</source> + <translation type="unfinished"/> + </message> + <message> + <source>Wallet options:</source> + <translation>Түрүйвчийн сонголтууд:</translation> + </message> + <message> + <source>Warning: Deprecated argument -debugnet ignored, use -debug=net</source> + <translation type="unfinished"/> + </message> + <message> + <source>You need to rebuild the database using -reindex to change -txindex</source> + <translation type="unfinished"/> + </message> + <message> + <source>Imports blocks from external blk000??.dat file</source> + <translation type="unfinished"/> + </message> + <message> + <source>Cannot obtain a lock on data directory %s. Bitcoin Core is probably already running.</source> + <translation type="unfinished"/> + </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 type="unfinished"/> + </message> + <message> + <source>Output debugging information (default: 0, supplying <category> is optional)</source> + <translation type="unfinished"/> + </message> + <message> + <source>Set maximum size of high-priority/low-fee transactions in bytes (default: %d)</source> + <translation type="unfinished"/> + </message> + <message> + <source>Information</source> + <translation type="unfinished"/> + </message> + <message> + <source>Invalid amount for -minrelaytxfee=<amount>: '%s'</source> + <translation type="unfinished"/> + </message> + <message> + <source>Invalid amount for -mintxfee=<amount>: '%s'</source> + <translation type="unfinished"/> + </message> + <message> + <source>Limit size of signature cache to <n> entries (default: 50000)</source> + <translation type="unfinished"/> + </message> + <message> + <source>Log transaction priority and fee per kB when mining blocks (default: 0)</source> + <translation type="unfinished"/> + </message> + <message> + <source>Maintain a full transaction index (default: 0)</source> + <translation type="unfinished"/> + </message> + <message> + <source>Maximum per-connection receive buffer, <n>*1000 bytes (default: 5000)</source> + <translation type="unfinished"/> + </message> + <message> + <source>Maximum per-connection send buffer, <n>*1000 bytes (default: 1000)</source> + <translation type="unfinished"/> + </message> + <message> + <source>Only accept block chain matching built-in checkpoints (default: 1)</source> + <translation type="unfinished"/> + </message> + <message> + <source>Only connect to nodes in network <net> (IPv4, IPv6 or Tor)</source> + <translation type="unfinished"/> + </message> + <message> + <source>Print block on startup, if found in block index</source> + <translation type="unfinished"/> + </message> + <message> + <source>Print block tree on startup (default: 0)</source> + <translation type="unfinished"/> + </message> + <message> + <source>RPC SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source> + <translation type="unfinished"/> + </message> + <message> + <source>RPC server options:</source> + <translation type="unfinished"/> + </message> + <message> + <source>Randomly drop 1 of every <n> network messages</source> + <translation type="unfinished"/> + </message> + <message> + <source>Randomly fuzz 1 of every <n> network messages</source> + <translation type="unfinished"/> + </message> + <message> + <source>Run a thread to flush wallet periodically (default: 1)</source> + <translation type="unfinished"/> + </message> + <message> + <source>SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source> + <translation type="unfinished"/> + </message> + <message> + <source>Send command to Bitcoin Core</source> + <translation type="unfinished"/> + </message> + <message> + <source>Send trace/debug info to console instead of debug.log file</source> + <translation type="unfinished"/> + </message> + <message> + <source>Set minimum block size in bytes (default: 0)</source> + <translation type="unfinished"/> + </message> + <message> + <source>Sets the DB_PRIVATE flag in the wallet db environment (default: 1)</source> + <translation type="unfinished"/> + </message> + <message> + <source>Show all debugging options (usage: --help -help-debug)</source> + <translation type="unfinished"/> + </message> + <message> + <source>Show benchmark information (default: 0)</source> + <translation type="unfinished"/> + </message> + <message> + <source>Shrink debug.log file on client startup (default: 1 when no -debug)</source> + <translation type="unfinished"/> + </message> + <message> + <source>Signing transaction failed</source> + <translation type="unfinished"/> + </message> + <message> + <source>Specify connection timeout in milliseconds (default: 5000)</source> + <translation type="unfinished"/> + </message> + <message> + <source>Start Bitcoin Core Daemon</source> + <translation type="unfinished"/> + </message> + <message> + <source>System error: </source> + <translation type="unfinished"/> + </message> + <message> + <source>Transaction amount too small</source> + <translation type="unfinished"/> + </message> + <message> + <source>Transaction amounts must be positive</source> + <translation type="unfinished"/> + </message> + <message> + <source>Transaction too large</source> + <translation type="unfinished"/> + </message> + <message> + <source>Use UPnP to map the listening port (default: 0)</source> + <translation type="unfinished"/> + </message> + <message> + <source>Use UPnP to map the listening port (default: 1 when listening)</source> + <translation type="unfinished"/> + </message> + <message> + <source>Username for JSON-RPC connections</source> + <translation type="unfinished"/> + </message> + <message> + <source>Warning</source> + <translation type="unfinished"/> + </message> + <message> + <source>Warning: This version is obsolete, upgrade required!</source> + <translation type="unfinished"/> + </message> + <message> + <source>Zapping all transactions from wallet...</source> + <translation type="unfinished"/> + </message> + <message> + <source>on startup</source> + <translation type="unfinished"/> + </message> + <message> + <source>version</source> + <translation>хувилбар</translation> + </message> + <message> + <source>wallet.dat corrupt, salvage failed</source> + <translation type="unfinished"/> + </message> + <message> + <source>Password for JSON-RPC connections</source> + <translation type="unfinished"/> + </message> + <message> + <source>Allow JSON-RPC connections from specified IP address</source> + <translation type="unfinished"/> + </message> + <message> + <source>Send commands to node running on <ip> (default: 127.0.0.1)</source> + <translation type="unfinished"/> + </message> + <message> + <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> + <translation type="unfinished"/> + </message> + <message> + <source>Upgrade wallet to latest format</source> + <translation>Түрүйвчийг хамгийн сүүлийн үеийн форматруу шинэчлэх</translation> + </message> + <message> + <source>Set key pool size to <n> (default: 100)</source> + <translation type="unfinished"/> + </message> + <message> + <source>Rescan the block chain for missing wallet transactions</source> + <translation type="unfinished"/> + </message> + <message> + <source>Use OpenSSL (https) for JSON-RPC connections</source> + <translation type="unfinished"/> + </message> + <message> + <source>Server certificate file (default: server.cert)</source> + <translation type="unfinished"/> + </message> + <message> + <source>Server private key (default: server.pem)</source> + <translation type="unfinished"/> + </message> + <message> + <source>This help message</source> + <translation type="unfinished"/> + </message> + <message> + <source>Unable to bind to %s on this computer (bind returned error %d, %s)</source> + <translation type="unfinished"/> + </message> + <message> + <source>Allow DNS lookups for -addnode, -seednode and -connect</source> + <translation type="unfinished"/> + </message> + <message> + <source>Loading addresses...</source> + <translation>Хаягуудыг ачааллаж байна...</translation> + </message> + <message> + <source>Error loading wallet.dat: Wallet corrupted</source> + <translation>wallet.dat-ыг ачааллахад алдаа гарлаа: Түрүйвч эвдэрсэн байна</translation> + </message> + <message> + <source>Error loading wallet.dat: Wallet requires newer version of Bitcoin</source> + <translation>wallet.dat-ыг ачааллахад алдаа гарлаа: Түрүйвч Биткойны шинэ хувилбарыг шаардаж байна</translation> + </message> + <message> + <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> + <translation type="unfinished"/> + </message> + <message> + <source>Error loading wallet.dat</source> + <translation>wallet.dat-ыг ачааллахад алдаа гарлаа</translation> + </message> + <message> + <source>Invalid -proxy address: '%s'</source> + <translation>Эдгээр прокси хаягнууд буруу байна: '%s'</translation> + </message> + <message> + <source>Unknown network specified in -onlynet: '%s'</source> + <translation type="unfinished"/> + </message> + <message> + <source>Unknown -socks proxy version requested: %i</source> + <translation type="unfinished"/> + </message> + <message> + <source>Cannot resolve -bind address: '%s'</source> + <translation type="unfinished"/> + </message> + <message> + <source>Cannot resolve -externalip address: '%s'</source> + <translation type="unfinished"/> + </message> + <message> + <source>Invalid amount for -paytxfee=<amount>: '%s'</source> + <translation type="unfinished"/> + </message> + <message> + <source>Invalid amount</source> + <translation>Буруу хэмжээ</translation> + </message> + <message> + <source>Insufficient funds</source> + <translation>Таны дансны үлдэгдэл хүрэлцэхгүй байна</translation> + </message> + <message> + <source>Loading block index...</source> + <translation>Блокийн индексүүдийг ачааллаж байна...</translation> + </message> + <message> + <source>Add a node to connect to and attempt to keep the connection open</source> + <translation>Холболт хийхийн тулд мѳн холболтой онгорхой хадгалхын тулд шинэ нод нэм</translation> + </message> + <message> + <source>Loading wallet...</source> + <translation>Түрүйвчийг ачааллаж байна...</translation> + </message> + <message> + <source>Cannot downgrade wallet</source> + <translation type="unfinished"/> + </message> + <message> + <source>Cannot write default address</source> + <translation type="unfinished"/> + </message> + <message> + <source>Rescanning...</source> + <translation>Ахин уншиж байна...</translation> + </message> + <message> + <source>Done loading</source> + <translation>Ачааллаж дууслаа</translation> + </message> + <message> + <source>To use the %s option</source> + <translation>%s сонголтыг ашиглахын тулд</translation> + </message> + <message> + <source>Error</source> + <translation>Алдаа</translation> + </message> + <message> + <source>You must set rpcpassword=<password> in the configuration file: +%s +If the file does not exist, create it with owner-readable-only file permissions.</source> + <translation type="unfinished"/> + </message> +</context> +</TS>
\ No newline at end of file diff --git a/src/qt/locale/bitcoin_ms_MY.ts b/src/qt/locale/bitcoin_ms_MY.ts index 9835a2e19f..0f92a6d49f 100644 --- a/src/qt/locale/bitcoin_ms_MY.ts +++ b/src/qt/locale/bitcoin_ms_MY.ts @@ -1,4 +1,4 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="ms_MY" version="2.0"> +<?xml version="1.0" ?><!DOCTYPE TS><TS language="ms_MY" version="2.1"> <context> <name>AboutDialog</name> <message> @@ -1039,6 +1039,14 @@ Address: %4 <translation type="unfinished"/> </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 type="unfinished"/> + </message> + <message> + <source>Third party transaction URLs</source> + <translation type="unfinished"/> + </message> + <message> <source>Active command-line options that override above options:</source> <translation type="unfinished"/> </message> @@ -1340,7 +1348,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <source>Bitcoin Core did't yet exit safely...</source> + <source>Bitcoin Core didn't yet exit safely...</source> <translation type="unfinished"/> </message> <message> diff --git a/src/qt/locale/bitcoin_nb.ts b/src/qt/locale/bitcoin_nb.ts index 078bad7edc..09ef29d871 100644 --- a/src/qt/locale/bitcoin_nb.ts +++ b/src/qt/locale/bitcoin_nb.ts @@ -1,4 +1,4 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="nb" version="2.0"> +<?xml version="1.0" ?><!DOCTYPE TS><TS language="nb" version="2.1"> <context> <name>AboutDialog</name> <message> @@ -1048,6 +1048,14 @@ Adresse: %4 <translation>IP-adressen til proxyen (f.eks. IPv4: 127.0.0.1 / IPv6: ::1)</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 type="unfinished"/> + </message> + <message> + <source>Third party transaction URLs</source> + <translation type="unfinished"/> + </message> + <message> <source>Active command-line options that override above options:</source> <translation>Aktive kommandolinjevalg som overstyrer valgene ovenfor:</translation> </message> @@ -1349,8 +1357,8 @@ Adresse: %4 <translation>Feil: Ugyldig kombinasjon av -regtest og -testnet.</translation> </message> <message> - <source>Bitcoin Core did't yet exit safely...</source> - <translation>Bitcoin Core har annå ikke avsluttet på en sikker måte...</translation> + <source>Bitcoin Core didn't yet exit safely...</source> + <translation type="unfinished"/> </message> <message> <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> diff --git a/src/qt/locale/bitcoin_nl.ts b/src/qt/locale/bitcoin_nl.ts index 0da46059b5..8cbbbdad7f 100644 --- a/src/qt/locale/bitcoin_nl.ts +++ b/src/qt/locale/bitcoin_nl.ts @@ -1,4 +1,4 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="nl" version="2.0"> +<?xml version="1.0" ?><!DOCTYPE TS><TS language="nl" version="2.1"> <context> <name>AboutDialog</name> <message> @@ -1048,6 +1048,14 @@ Adres: %4 <translation>IP-adres van de proxy (bijv. IPv4: 127.0.0.1 / IPv6: ::1)</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>Derde partijen URL's (bijvoorbeeld block explorer) dat in de transacties tab verschijnen als contextmenu elementen. %s in de URL is vervangen door transactie hash. Verscheidene URL's zijn gescheiden door een verticale streep |. </translation> + </message> + <message> + <source>Third party transaction URLs</source> + <translation>Transactie-URLs van derde partijen</translation> + </message> + <message> <source>Active command-line options that override above options:</source> <translation>Actieve commandoregelopties die bovenstaande opties overschrijven:</translation> </message> @@ -1349,8 +1357,8 @@ Adres: %4 <translation>Fout: Ongeldige combinatie van -regtest en -testnet</translation> </message> <message> - <source>Bitcoin Core did't yet exit safely...</source> - <translation type="unfinished"/> + <source>Bitcoin Core didn't yet exit safely...</source> + <translation>Bitcoin Core is nog niet veilig uitgeschakeld...</translation> </message> <message> <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> @@ -2959,7 +2967,7 @@ bijvoorbeeld: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo </message> <message> <source>Importing...</source> - <translation type="unfinished"/> + <translation>Importeren...</translation> </message> <message> <source>Incorrect or no genesis block found. Wrong datadir for network?</source> diff --git a/src/qt/locale/bitcoin_pam.ts b/src/qt/locale/bitcoin_pam.ts index 4a5e0363a8..22f1b7ccc3 100644 --- a/src/qt/locale/bitcoin_pam.ts +++ b/src/qt/locale/bitcoin_pam.ts @@ -1,4 +1,4 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="pam" version="2.0"> +<?xml version="1.0" ?><!DOCTYPE TS><TS language="pam" version="2.1"> <context> <name>AboutDialog</name> <message> @@ -1046,6 +1046,14 @@ Address: %4 <translation type="unfinished"/> </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 type="unfinished"/> + </message> + <message> + <source>Third party transaction URLs</source> + <translation type="unfinished"/> + </message> + <message> <source>Active command-line options that override above options:</source> <translation type="unfinished"/> </message> @@ -1347,7 +1355,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <source>Bitcoin Core did't yet exit safely...</source> + <source>Bitcoin Core didn't yet exit safely...</source> <translation type="unfinished"/> </message> <message> diff --git a/src/qt/locale/bitcoin_pl.ts b/src/qt/locale/bitcoin_pl.ts index 06845bfc3b..cbc08dd25d 100644 --- a/src/qt/locale/bitcoin_pl.ts +++ b/src/qt/locale/bitcoin_pl.ts @@ -1,4 +1,4 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="pl" version="2.0"> +<?xml version="1.0" ?><!DOCTYPE TS><TS language="pl" version="2.1"> <context> <name>AboutDialog</name> <message> @@ -1048,6 +1048,14 @@ Adres: %4 <translation>Adres IP serwera proxy (np. IPv4: 127.0.0.1 / IPv6: ::1)</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 type="unfinished"/> + </message> + <message> + <source>Third party transaction URLs</source> + <translation type="unfinished"/> + </message> + <message> <source>Active command-line options that override above options:</source> <translation type="unfinished"/> </message> @@ -1287,7 +1295,7 @@ Adres: %4 </message> <message> <source>Your active proxy doesn't support SOCKS5, which is required for payment requests via proxy.</source> - <translation type="unfinished"/> + <translation>Twoje aktywne proxy nie obsługuje SOCKS5, co jest wymagane dla żądania płatności przez proxy.</translation> </message> <message> <source>Payment request fetch URL is invalid: %1</source> @@ -1349,8 +1357,8 @@ Adres: %4 <translation>Błąd: Niepoprawna kombinacja -regtest i -testnet.</translation> </message> <message> - <source>Bitcoin Core did't yet exit safely...</source> - <translation type="unfinished"/> + <source>Bitcoin Core didn't yet exit safely...</source> + <translation>Bitcoin Core jeszcze się nie wyłączył bezpiecznie…</translation> </message> <message> <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> @@ -1555,7 +1563,7 @@ Adres: %4 </message> <message> <source>Use this form to request payments. All fields are <b>optional</b>.</source> - <translation type="unfinished"/> + <translation>Użyj tego formularza do zażądania płatności. Wszystkie pola są <b>opcjonalne</b>.</translation> </message> <message> <source>An optional amount to request. Leave this empty or zero to not request a specific amount.</source> @@ -2790,11 +2798,11 @@ na przykład: alertnotify=echo %%s | mail -s "Alarm Bitcoin" admin@foo </message> <message> <source>(default: 1)</source> - <translation type="unfinished"/> + <translation>(domyślnie: 1)</translation> </message> <message> <source>(default: wallet.dat)</source> - <translation type="unfinished"/> + <translation>(domyślnie: wallet.dat)</translation> </message> <message> <source><category> can be:</source> @@ -2934,7 +2942,7 @@ na przykład: alertnotify=echo %%s | mail -s "Alarm Bitcoin" admin@foo </message> <message> <source>Fees smaller than this are considered zero fee (for relaying) (default:</source> - <translation type="unfinished"/> + <translation>Opłaty mniejsze niż to są uznawane za nieistniejące (przy przekazywaniu) (domyślnie:</translation> </message> <message> <source>Find peers using DNS lookup (default: 1 unless -connect)</source> @@ -2958,7 +2966,7 @@ na przykład: alertnotify=echo %%s | mail -s "Alarm Bitcoin" admin@foo </message> <message> <source>Importing...</source> - <translation type="unfinished"/> + <translation>Importowanie…</translation> </message> <message> <source>Incorrect or no genesis block found. Wrong datadir for network?</source> @@ -3082,7 +3090,7 @@ na przykład: alertnotify=echo %%s | mail -s "Alarm Bitcoin" admin@foo </message> <message> <source>Log transaction priority and fee per kB when mining blocks (default: 0)</source> - <translation type="unfinished"/> + <translation>Loguj priorytety transakcji i opłaty na kB podczas kopania bloków (domyślnie: 0)</translation> </message> <message> <source>Maintain a full transaction index (default: 0)</source> @@ -3106,7 +3114,7 @@ na przykład: alertnotify=echo %%s | mail -s "Alarm Bitcoin" admin@foo </message> <message> <source>Print block on startup, if found in block index</source> - <translation type="unfinished"/> + <translation>Wyświetlaj blok podczas uruchamiania, jeżeli znaleziono indeks bloków</translation> </message> <message> <source>Print block tree on startup (default: 0)</source> @@ -3122,7 +3130,7 @@ na przykład: alertnotify=echo %%s | mail -s "Alarm Bitcoin" admin@foo </message> <message> <source>Randomly drop 1 of every <n> network messages</source> - <translation type="unfinished"/> + <translation>Losowo ignoruje 1 z każdych <n> wiadomości sieciowych.</translation> </message> <message> <source>Randomly fuzz 1 of every <n> network messages</source> @@ -3130,7 +3138,7 @@ na przykład: alertnotify=echo %%s | mail -s "Alarm Bitcoin" admin@foo </message> <message> <source>Run a thread to flush wallet periodically (default: 1)</source> - <translation type="unfinished"/> + <translation>Uruchom wątek do okresowego zapisywania portfela (domyślnie: 1)</translation> </message> <message> <source>SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source> @@ -3138,7 +3146,7 @@ na przykład: alertnotify=echo %%s | mail -s "Alarm Bitcoin" admin@foo </message> <message> <source>Send command to Bitcoin Core</source> - <translation type="unfinished"/> + <translation>Wyślij komendę do Bitcoin Core</translation> </message> <message> <source>Send trace/debug info to console instead of debug.log file</source> @@ -3218,7 +3226,7 @@ na przykład: alertnotify=echo %%s | mail -s "Alarm Bitcoin" admin@foo </message> <message> <source>on startup</source> - <translation type="unfinished"/> + <translation>podczas uruchamiania</translation> </message> <message> <source>version</source> diff --git a/src/qt/locale/bitcoin_pt_BR.ts b/src/qt/locale/bitcoin_pt_BR.ts index 94a87596ca..ee1c2a7381 100644 --- a/src/qt/locale/bitcoin_pt_BR.ts +++ b/src/qt/locale/bitcoin_pt_BR.ts @@ -1,4 +1,4 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="pt_BR" version="2.0"> +<?xml version="1.0" ?><!DOCTYPE TS><TS language="pt_BR" version="2.1"> <context> <name>AboutDialog</name> <message> @@ -1047,6 +1047,14 @@ Endereço: %4</translation> <translation>Endereço de IP do proxy (e.g. IPv4: 127.0.0.1 / IPv6: ::1)</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 type="unfinished"/> + </message> + <message> + <source>Third party transaction URLs</source> + <translation type="unfinished"/> + </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> </message> @@ -1348,7 +1356,7 @@ Endereço: %4</translation> <translation>Erro: Combinação inválida de-regtest e testnet.</translation> </message> <message> - <source>Bitcoin Core did't yet exit safely...</source> + <source>Bitcoin Core didn't yet exit safely...</source> <translation type="unfinished"/> </message> <message> diff --git a/src/qt/locale/bitcoin_pt_PT.ts b/src/qt/locale/bitcoin_pt_PT.ts index d6dbbbf42a..7a9595a6dd 100644 --- a/src/qt/locale/bitcoin_pt_PT.ts +++ b/src/qt/locale/bitcoin_pt_PT.ts @@ -1,4 +1,4 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="pt_PT" version="2.0"> +<?xml version="1.0" ?><!DOCTYPE TS><TS language="pt_PT" version="2.1"> <context> <name>AboutDialog</name> <message> @@ -1047,6 +1047,14 @@ Endereço: %4</translation> <translation>Endereço IP do proxy (p.ex. IPv4: 127.0.0.1 / IPv6: ::1)</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 type="unfinished"/> + </message> + <message> + <source>Third party transaction URLs</source> + <translation type="unfinished"/> + </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> </message> @@ -1348,7 +1356,7 @@ Endereço: %4</translation> <translation>Erro: Combinação inválida de -regtest e -testnet.</translation> </message> <message> - <source>Bitcoin Core did't yet exit safely...</source> + <source>Bitcoin Core didn't yet exit safely...</source> <translation type="unfinished"/> </message> <message> diff --git a/src/qt/locale/bitcoin_ro_RO.ts b/src/qt/locale/bitcoin_ro_RO.ts index 0a310db989..1d9d4cc936 100644 --- a/src/qt/locale/bitcoin_ro_RO.ts +++ b/src/qt/locale/bitcoin_ro_RO.ts @@ -1,4 +1,4 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="ro_RO" version="2.0"> +<?xml version="1.0" ?><!DOCTYPE TS><TS language="ro_RO" version="2.1"> <context> <name>AboutDialog</name> <message> @@ -1048,6 +1048,14 @@ Adresa: %4 <translation type="unfinished"/> </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 type="unfinished"/> + </message> + <message> + <source>Third party transaction URLs</source> + <translation type="unfinished"/> + </message> + <message> <source>Active command-line options that override above options:</source> <translation type="unfinished"/> </message> @@ -1349,7 +1357,7 @@ Adresa: %4 <translation>Eroare: combinație nevalidă de -regtest și -testnet.</translation> </message> <message> - <source>Bitcoin Core did't yet exit safely...</source> + <source>Bitcoin Core didn't yet exit safely...</source> <translation type="unfinished"/> </message> <message> diff --git a/src/qt/locale/bitcoin_ru.ts b/src/qt/locale/bitcoin_ru.ts index d9840a9c5e..570c3a61e7 100644 --- a/src/qt/locale/bitcoin_ru.ts +++ b/src/qt/locale/bitcoin_ru.ts @@ -1,4 +1,4 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="ru" version="2.0"> +<?xml version="1.0" ?><!DOCTYPE TS><TS language="ru" version="2.1"> <context> <name>AboutDialog</name> <message> @@ -1048,6 +1048,14 @@ Address: %4 <translation>IP-адрес прокси (например IPv4: 127.0.0.1 / IPv6: ::1)</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 (например, block explorer), которые отображаются на вкладке транзакций как пункты контекстного меню. %s в URL заменяется хэшем транзакции. URL отделяются друг от друга вертикальной чертой |.</translation> + </message> + <message> + <source>Third party transaction URLs</source> + <translation>Сторонние URL транзакций.</translation> + </message> + <message> <source>Active command-line options that override above options:</source> <translation>Активные опции командной строки, которые перекрывают вышеуказанные опции:</translation> </message> @@ -1349,8 +1357,8 @@ Address: %4 <translation>Ошибка: неверная комбинация -regtest и -testnet.</translation> </message> <message> - <source>Bitcoin Core did't yet exit safely...</source> - <translation>Bitcoin Core еще не готов к безопасному завершению...</translation> + <source>Bitcoin Core didn't yet exit safely...</source> + <translation>Bitcoin Core ещё не завершился безопасно...</translation> </message> <message> <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> diff --git a/src/qt/locale/bitcoin_sah.ts b/src/qt/locale/bitcoin_sah.ts index 5cdf9a93d7..3bc3e65c62 100644 --- a/src/qt/locale/bitcoin_sah.ts +++ b/src/qt/locale/bitcoin_sah.ts @@ -1,4 +1,4 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="sah" version="2.0"> +<?xml version="1.0" ?><!DOCTYPE TS><TS language="sah" version="2.1"> <context> <name>AboutDialog</name> <message> @@ -1039,6 +1039,14 @@ Address: %4 <translation type="unfinished"/> </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 type="unfinished"/> + </message> + <message> + <source>Third party transaction URLs</source> + <translation type="unfinished"/> + </message> + <message> <source>Active command-line options that override above options:</source> <translation type="unfinished"/> </message> @@ -1340,7 +1348,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <source>Bitcoin Core did't yet exit safely...</source> + <source>Bitcoin Core didn't yet exit safely...</source> <translation type="unfinished"/> </message> <message> diff --git a/src/qt/locale/bitcoin_sk.ts b/src/qt/locale/bitcoin_sk.ts index b12462dbb2..d96e9d9366 100644 --- a/src/qt/locale/bitcoin_sk.ts +++ b/src/qt/locale/bitcoin_sk.ts @@ -1,4 +1,4 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="sk" version="2.0"> +<?xml version="1.0" ?><!DOCTYPE TS><TS language="sk" version="2.1"> <context> <name>AboutDialog</name> <message> @@ -63,7 +63,7 @@ This product includes software developed by the OpenSSL Project for use in the O </message> <message> <source>Delete the currently selected address from the list</source> - <translation type="unfinished"/> + <translation>Vymaž vybranú adresu zo zoznamu</translation> </message> <message> <source>Export the data in the current tab to a file</source> @@ -79,11 +79,11 @@ This product includes software developed by the OpenSSL Project for use in the O </message> <message> <source>Choose the address to send coins to</source> - <translation type="unfinished"/> + <translation>Zvoľte adresu kam poslať coins</translation> </message> <message> <source>Choose the address to receive coins with</source> - <translation type="unfinished"/> + <translation>Zvoľte adresu na ktorú prijať coins</translation> </message> <message> <source>C&hoose</source> @@ -99,11 +99,11 @@ This product includes software developed by the OpenSSL Project for use in the O </message> <message> <source>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source> - <translation type="unfinished"/> + <translation>Toto sú Vaše Bitcoin adresy pre posielanie platieb. Vždy skontrolujte množstvo a prijímaciu adresu pred poslaním coins.</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 type="unfinished"/> + <translation>Toto sú vaše Bitcoin adresy pre prijímanie platieb. Odporúča sa použiť novú prijímaciu adresu pre každú transakciu.</translation> </message> <message> <source>Copy &Label</source> @@ -127,7 +127,7 @@ This product includes software developed by the OpenSSL Project for use in the O </message> <message> <source>There was an error trying to save the address list to %1.</source> - <translation type="unfinished"/> + <translation>Nastala chyba pri pokuse uložiť zoznam adries do %1.</translation> </message> </context> <context> @@ -392,15 +392,15 @@ This product includes software developed by the OpenSSL Project for use in the O </message> <message> <source>Encrypt the private keys that belong to your wallet</source> - <translation type="unfinished"/> + <translation>Zašifruj súkromné kľúče ktoré patria do vašej peňaženky</translation> </message> <message> <source>Sign messages with your Bitcoin addresses to prove you own them</source> - <translation type="unfinished"/> + <translation>Podpísať správu s vašou adresou Bitcoin aby ste preukázali že ju vlastníte</translation> </message> <message> <source>Verify messages to ensure they were signed with specified Bitcoin addresses</source> - <translation type="unfinished"/> + <translation>Overiť či správa bola podpísaná uvedenou Bitcoin adresou</translation> </message> <message> <source>&File</source> @@ -428,7 +428,7 @@ This product includes software developed by the OpenSSL Project for use in the O </message> <message> <source>Request payments (generates QR codes and bitcoin: URIs)</source> - <translation type="unfinished"/> + <translation>Vyžiadať platbu (vygeneruje QR kód a bitcoin: URI)</translation> </message> <message> <source>&About Bitcoin Core</source> @@ -436,11 +436,11 @@ This product includes software developed by the OpenSSL Project for use in the O </message> <message> <source>Show the list of used sending addresses and labels</source> - <translation type="unfinished"/> + <translation>Zobraziť zoznam použitých adries odosielateľa a ich popisy</translation> </message> <message> <source>Show the list of used receiving addresses and labels</source> - <translation type="unfinished"/> + <translation>Zobraziť zoznam použitých prijímacích adries a ich popisov</translation> </message> <message> <source>Open a bitcoin: URI or payment request</source> @@ -448,7 +448,7 @@ This product includes software developed by the OpenSSL Project for use in the O </message> <message> <source>&Command-line options</source> - <translation>Voľby príkazového riadku</translation> + <translation>Možnosti príkazového riadku</translation> </message> <message> <source>Show the Bitcoin Core help message to get a list with possible Bitcoin command-line options</source> @@ -488,15 +488,15 @@ This product includes software developed by the OpenSSL Project for use in the O </message> <message> <source>%1 and %2</source> - <translation type="unfinished"/> + <translation> %1 a %2</translation> </message> <message numerus="yes"> <source>%n year(s)</source> - <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> + <translation><numerusform>%</numerusform><numerusform>%d)</numerusform><numerusform>%n rokov</numerusform></translation> </message> <message> <source>%1 behind</source> - <translation>%1 za</translation> + <translation>%1 pozadu</translation> </message> <message> <source>Last received block was generated %1 ago.</source> @@ -555,7 +555,7 @@ Adresa: %4</translation> </message> <message> <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> - <translation type="unfinished"/> + <translation>Vyskytla sa neblahá chyba. Bitcoin nemôže daľej bezpečne pokračovať a vypne sa.</translation> </message> </context> <context> @@ -569,7 +569,7 @@ Adresa: %4</translation> <name>CoinControlDialog</name> <message> <source>Coin Control Address Selection</source> - <translation type="unfinished"/> + <translation>Coin Control výber adresy</translation> </message> <message> <source>Quantity:</source> @@ -593,11 +593,11 @@ Adresa: %4</translation> </message> <message> <source>Low Output:</source> - <translation type="unfinished"/> + <translation>Malá hodnota na výstupe:</translation> </message> <message> <source>After Fee:</source> - <translation type="unfinished"/> + <translation>Po poplatku:</translation> </message> <message> <source>Change:</source> @@ -605,7 +605,7 @@ Adresa: %4</translation> </message> <message> <source>(un)select all</source> - <translation type="unfinished"/> + <translation>(ne)vybrať všetko</translation> </message> <message> <source>Tree mode</source> @@ -657,11 +657,11 @@ Adresa: %4</translation> </message> <message> <source>Lock unspent</source> - <translation type="unfinished"/> + <translation>Uzamknúť neminuté</translation> </message> <message> <source>Unlock unspent</source> - <translation type="unfinished"/> + <translation>Odomknúť neminuté</translation> </message> <message> <source>Copy quantity</source> @@ -729,7 +729,7 @@ Adresa: %4</translation> </message> <message> <source>(%1 locked)</source> - <translation type="unfinished"/> + <translation>(%1 zamknutých)</translation> </message> <message> <source>none</source> @@ -777,7 +777,7 @@ Adresa: %4</translation> </message> <message> <source>Amounts below 0.546 times the minimum relay fee are shown as dust.</source> - <translation type="unfinished"/> + <translation>Sumy pod 0.546 násobkom minimálneho poplatku pre prenos sú považované za prach.</translation> </message> <message> <source>This label turns red, if the change is smaller than %1.</source> @@ -808,11 +808,11 @@ Adresa: %4</translation> </message> <message> <source>The label associated with this address list entry</source> - <translation type="unfinished"/> + <translation>Popis tejto položký v zozname adries je prázdny</translation> </message> <message> <source>The address associated with this address list entry. This can only be modified for sending addresses.</source> - <translation type="unfinished"/> + <translation>Adresa spojená s týmto záznamom v adresári. Možno upravovať len pre odosielajúce adresy.</translation> </message> <message> <source>&Address</source> @@ -863,7 +863,7 @@ Adresa: %4</translation> </message> <message> <source>Directory already exists. Add %1 if you intend to create a new directory here.</source> - <translation type="unfinished"/> + <translation>Priečinok už existuje. Pridajte "%1" ak chcete vytvoriť nový priečinok tu.</translation> </message> <message> <source>Path already exists, and is not a directory.</source> @@ -878,7 +878,7 @@ Adresa: %4</translation> <name>HelpMessageDialog</name> <message> <source>Bitcoin Core - Command-line options</source> - <translation type="unfinished"/> + <translation>Jadro Bitcoin - možnosti príkazového riadku</translation> </message> <message> <source>Bitcoin Core</source> @@ -937,7 +937,7 @@ Adresa: %4</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 type="unfinished"/> + <translation>Jadro Bitcoin stiahne zo siete a uloží kópiu Bitcoin blockchain. Aspoň %1GB dát bude uložených v tomto priečinku a časom porastie. Peňaženka bude tiež uložená v tomto priečinku.</translation> </message> <message> <source>Use the default data directory</source> @@ -953,7 +953,7 @@ Adresa: %4</translation> </message> <message> <source>Error: Specified data directory "%1" can not be created.</source> - <translation type="unfinished"/> + <translation>Chyba: Predpísaný priečinok pre dáta "%1" nemôže byt vytvorený.</translation> </message> <message> <source>Error</source> @@ -976,7 +976,7 @@ Adresa: %4</translation> </message> <message> <source>Open payment request from URI or file</source> - <translation type="unfinished"/> + <translation>Otvoriť požiadavku na zaplatenie z URI alebo súboru</translation> </message> <message> <source>URI:</source> @@ -984,11 +984,11 @@ Adresa: %4</translation> </message> <message> <source>Select payment request file</source> - <translation type="unfinished"/> + <translation>Vyberte súbor s výzvou k platbe</translation> </message> <message> <source>Select payment request file to open</source> - <translation type="unfinished"/> + <translation>Vyberte ktorý súbor s výzvou k platbe otvoriť</translation> </message> </context> <context> @@ -1003,7 +1003,7 @@ Adresa: %4</translation> </message> <message> <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB.</source> - <translation type="unfinished"/> + <translation>Voliteľný transakčný poplatok za kB ktorý pomôže rýchlemu spracovaniu transakcie. Väčšina transakcií má 1 kB. Poplatok 0.01 je odporúčaný.</translation> </message> <message> <source>Pay transaction &fee</source> @@ -1019,7 +1019,7 @@ Adresa: %4</translation> </message> <message> <source>Size of &database cache</source> - <translation type="unfinished"/> + <translation>Veľkosť vyrovnávacej pamäti databázy</translation> </message> <message> <source>MB</source> @@ -1031,15 +1031,23 @@ Adresa: %4</translation> </message> <message> <source>Connect to the Bitcoin network through a SOCKS proxy.</source> - <translation type="unfinished"/> + <translation>Pripojiť k Bitcoin sieti cez SOCKS proxy.</translation> </message> <message> <source>&Connect through SOCKS proxy (default proxy):</source> - <translation type="unfinished"/> + <translation>Pripojiť sa cez SOCKS proxy (predvolené proxy)</translation> </message> <message> <source>IP address of the proxy (e.g. IPv4: 127.0.0.1 / IPv6: ::1)</source> - <translation type="unfinished"/> + <translation>IP adresy proxy (napr. IPv4: 127.0.0.1 / IPv6: ::1)</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 tretích strán (napr. prehliadač blockchain) ktoré sa zobrazujú v záložke transakcií ako položky kontextového menu. %s v URL je nahradené hash-om transakcie. Viaceré URL sú oddelené zvislou čiarou |.</translation> + </message> + <message> + <source>Third party transaction URLs</source> + <translation>URL transakcií s tretími stranami</translation> </message> <message> <source>Active command-line options that override above options:</source> @@ -1063,15 +1071,15 @@ Adresa: %4</translation> </message> <message> <source>W&allet</source> - <translation type="unfinished"/> + <translation>Peňaženka</translation> </message> <message> <source>Expert</source> - <translation type="unfinished"/> + <translation>Expert</translation> </message> <message> <source>Enable coin &control features</source> - <translation type="unfinished"/> + <translation>Povoliť možnosti coin control</translation> </message> <message> <source>If you disable the spending of unconfirmed change, the change from a transaction cannot be used until that transaction has at least one confirmation. This also affects how your balance is computed.</source> @@ -1139,7 +1147,7 @@ Adresa: %4</translation> </message> <message> <source>The user interface language can be set here. This setting will take effect after restarting Bitcoin.</source> - <translation type="unfinished"/> + <translation>Tu sa dá nastaviť jazyk užívateľského rozhrania. Toto nastavenie bude účinné po reštartovaní Bitcoin.</translation> </message> <message> <source>&Unit to show amounts in:</source> @@ -1147,11 +1155,11 @@ Adresa: %4</translation> </message> <message> <source>Choose the default subdivision unit to show in the interface and when sending coins.</source> - <translation type="unfinished"/> + <translation>Zvoľte ako deliť bitcoin pri zobrazovaní pri platbách a užívateľskom rozhraní.</translation> </message> <message> <source>Whether to show Bitcoin addresses in the transaction list or not.</source> - <translation type="unfinished"/> + <translation>Či ukazovať Bitcoin adresy v zozname transakcií alebo nie.</translation> </message> <message> <source>&Display addresses in transaction list</source> @@ -1159,7 +1167,7 @@ Adresa: %4</translation> </message> <message> <source>Whether to show coin control features or not.</source> - <translation type="unfinished"/> + <translation>Či zobrazovať možnosti "Coin control" alebo nie.</translation> </message> <message> <source>&OK</source> @@ -1179,19 +1187,19 @@ Adresa: %4</translation> </message> <message> <source>Confirm options reset</source> - <translation type="unfinished"/> + <translation>Potvrdiť obnovenie možností</translation> </message> <message> <source>Client restart required to activate changes.</source> - <translation type="unfinished"/> + <translation>Reštart klienta potrebný pre aktivovanie zmien.</translation> </message> <message> <source>Client will be shutdown, do you want to proceed?</source> - <translation type="unfinished"/> + <translation>Klient bude vypnutý, chcete pokračovať?</translation> </message> <message> <source>This change would require a client restart.</source> - <translation type="unfinished"/> + <translation>Táto zmena by vyžadovala reštart klienta.</translation> </message> <message> <source>The supplied proxy address is invalid.</source> @@ -1206,7 +1214,7 @@ Adresa: %4</translation> </message> <message> <source>The displayed information may be out of date. Your wallet automatically synchronizes with the Bitcoin network after a connection is established, but this process has not completed yet.</source> - <translation type="unfinished"/> + <translation>Zobrazené informácie môžu byť neaktuápne. Vaša peňaženka sa automaticky synchronizuje so sieťou Bitcoin po nadviazaní spojenia ale tento proces ešte nieje ukončený.</translation> </message> <message> <source>Wallet</source> @@ -1214,19 +1222,19 @@ Adresa: %4</translation> </message> <message> <source>Available:</source> - <translation type="unfinished"/> + <translation>Disponibilné:</translation> </message> <message> <source>Your current spendable balance</source> - <translation type="unfinished"/> + <translation>Váš aktuálny disponibilný zostatok</translation> </message> <message> <source>Pending:</source> - <translation type="unfinished"/> + <translation>Čakajúce potvrdenie</translation> </message> <message> <source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source> - <translation type="unfinished"/> + <translation>Suma transakcií ktoré ešte neboli potvrdené a ešte sa nepočítajú do disponibilného zostatku</translation> </message> <message> <source>Immature:</source> @@ -1234,7 +1242,7 @@ Adresa: %4</translation> </message> <message> <source>Mined balance that has not yet matured</source> - <translation type="unfinished"/> + <translation>Vytvorený zostatok ktorý ešte nedosiahol zrelosť</translation> </message> <message> <source>Total:</source> @@ -1261,15 +1269,15 @@ Adresa: %4</translation> </message> <message> <source>URI can not be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters.</source> - <translation type="unfinished"/> + <translation>URI sa nedá rozložiť! To môže byť spôsobené neplatou Bitcoin adresou alebo zle upravenými vlastnosťami URI.</translation> </message> <message> <source>Requested payment amount of %1 is too small (considered dust).</source> - <translation type="unfinished"/> + <translation>Požadovaná platba sumy %1 je príliš malá (považovaná za prach).</translation> </message> <message> <source>Payment request error</source> - <translation type="unfinished"/> + <translation>Chyba pri vyžiadaní platby</translation> </message> <message> <source>Cannot start bitcoin: click-to-pay handler</source> @@ -1277,7 +1285,7 @@ Adresa: %4</translation> </message> <message> <source>Net manager warning</source> - <translation type="unfinished"/> + <translation>Varovanie správcu siete</translation> </message> <message> <source>Your active proxy doesn't support SOCKS5, which is required for payment requests via proxy.</source> @@ -1297,15 +1305,15 @@ Adresa: %4</translation> </message> <message> <source>Unverified payment requests to custom payment scripts are unsupported.</source> - <translation type="unfinished"/> + <translation>Program nepodporuje neoverené platobné výzvy na vlastná skripty.</translation> </message> <message> <source>Refund from %1</source> - <translation type="unfinished"/> + <translation>Vrátenie z %1</translation> </message> <message> <source>Error communicating with %1: %2</source> - <translation type="unfinished"/> + <translation>Chyba komunikácie s %1: %2 </translation> </message> <message> <source>Payment request can not be parsed or processed!</source> @@ -1317,11 +1325,11 @@ Adresa: %4</translation> </message> <message> <source>Payment acknowledged</source> - <translation type="unfinished"/> + <translation>Platba potvrdená</translation> </message> <message> <source>Network request error</source> - <translation type="unfinished"/> + <translation>Chyba požiadavky siete</translation> </message> </context> <context> @@ -1332,7 +1340,7 @@ Adresa: %4</translation> </message> <message> <source>Error: Specified data directory "%1" does not exist.</source> - <translation type="unfinished"/> + <translation>Chyba: Uvedený priečinok s dátami "%1" neexistuje.</translation> </message> <message> <source>Error: Cannot parse configuration file: %1. Only use key=value syntax.</source> @@ -1340,11 +1348,11 @@ Adresa: %4</translation> </message> <message> <source>Error: Invalid combination of -regtest and -testnet.</source> - <translation type="unfinished"/> + <translation>Chyba: Nesprávna kombinácia -regtest a -testnet.</translation> </message> <message> - <source>Bitcoin Core did't yet exit safely...</source> - <translation type="unfinished"/> + <source>Bitcoin Core didn't yet exit safely...</source> + <translation>Jadro Bitcoin sa ešte úspešne nevyplo ...</translation> </message> <message> <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> @@ -1478,15 +1486,15 @@ Adresa: %4</translation> </message> <message> <source>Welcome to the Bitcoin RPC console.</source> - <translation type="unfinished"/> + <translation>Vitajte v Bitcoin RPC konzole. Baník, pyčo!</translation> </message> <message> <source>Use up and down arrows to navigate history, and <b>Ctrl-L</b> to clear screen.</source> - <translation type="unfinished"/> + <translation>Použi šipky hore a dolu pre navigáciu históriou a <b>Ctrl-L</b> pre vyčistenie obrazovky.</translation> </message> <message> <source>Type <b>help</b> for an overview of available commands.</source> - <translation type="unfinished"/> + <translation>Napíš <b>help</b> pre prehľad dostupných príkazov.</translation> </message> <message> <source>%1 B</source> @@ -1545,11 +1553,11 @@ Adresa: %4</translation> </message> <message> <source>An optional label to associate with the new receiving address.</source> - <translation type="unfinished"/> + <translation>Voliteľný popis ktorý sa pridá k tejto novej prijímajúcej adrese.</translation> </message> <message> <source>Use this form to request payments. All fields are <b>optional</b>.</source> - <translation type="unfinished"/> + <translation>Použite tento formulár pre vyžiadanie platby. Všetky polia sú <b>voliteľné</b>.</translation> </message> <message> <source>An optional amount to request. Leave this empty or zero to not request a specific amount.</source> @@ -1573,7 +1581,7 @@ Adresa: %4</translation> </message> <message> <source>Show the selected request (does the same as double clicking an entry)</source> - <translation type="unfinished"/> + <translation>Zobraz zvolenú požiadavku (urobí to isté ako dvoj-klik na záznam)</translation> </message> <message> <source>Show</source> @@ -1581,7 +1589,7 @@ Adresa: %4</translation> </message> <message> <source>Remove the selected entries from the list</source> - <translation type="unfinished"/> + <translation>Odstrániť zvolené záznamy zo zoznamu</translation> </message> <message> <source>Remove</source> @@ -1694,7 +1702,7 @@ Adresa: %4</translation> </message> <message> <source>Coin Control Features</source> - <translation type="unfinished"/> + <translation>Možnosti "Coin Control"</translation> </message> <message> <source>Inputs...</source> @@ -1730,11 +1738,11 @@ Adresa: %4</translation> </message> <message> <source>Low Output:</source> - <translation type="unfinished"/> + <translation>Malá hodnota na výstupe:</translation> </message> <message> <source>After Fee:</source> - <translation type="unfinished"/> + <translation>Po poplatku:</translation> </message> <message> <source>Change:</source> @@ -1854,7 +1862,7 @@ Adresa: %4</translation> </message> <message> <source>Warning: Invalid Bitcoin address</source> - <translation type="unfinished"/> + <translation>Varovanie: Nesprávna Bitcoin adresa</translation> </message> <message> <source>(no label)</source> @@ -1862,7 +1870,7 @@ Adresa: %4</translation> </message> <message> <source>Warning: Unknown change address</source> - <translation type="unfinished"/> + <translation>Varovanie: Neznáma adresa pre výdavok</translation> </message> <message> <source>Are you sure you want to send?</source> @@ -1874,7 +1882,7 @@ Adresa: %4</translation> </message> <message> <source>Payment request expired</source> - <translation type="unfinished"/> + <translation>Vypršala platnosť požiadavky na platbu</translation> </message> <message> <source>Invalid payment address %1</source> @@ -1933,7 +1941,7 @@ Adresa: %4</translation> </message> <message> <source>This is a verified payment request.</source> - <translation type="unfinished"/> + <translation>Toto je overená výzva k platbe.</translation> </message> <message> <source>Enter a label for this address to add it to the list of used addresses</source> @@ -1945,7 +1953,7 @@ Adresa: %4</translation> </message> <message> <source>This is an unverified payment request.</source> - <translation type="unfinished"/> + <translation>Toto je neoverená výzva k platbe.</translation> </message> <message> <source>Pay To:</source> @@ -1953,7 +1961,7 @@ Adresa: %4</translation> </message> <message> <source>Memo:</source> - <translation type="unfinished"/> + <translation>Poznámka:</translation> </message> </context> <context> @@ -1964,14 +1972,14 @@ Adresa: %4</translation> </message> <message> <source>Do not shut down the computer until this window disappears.</source> - <translation type="unfinished"/> + <translation>Nevypínajte počítač kým toto okno nezmizne.</translation> </message> </context> <context> <name>SignVerifyMessageDialog</name> <message> <source>Signatures - Sign / Verify a Message</source> - <translation type="unfinished"/> + <translation>Podpisy - Podpísať / Overiť správu</translation> </message> <message> <source>&Sign Message</source> @@ -2011,7 +2019,7 @@ Adresa: %4</translation> </message> <message> <source>Copy the current signature to the system clipboard</source> - <translation type="unfinished"/> + <translation>Kopírovať práve zvolenú adresu do systémového klipbordu</translation> </message> <message> <source>Sign the message to prove you own this Bitcoin address</source> @@ -2023,7 +2031,7 @@ Adresa: %4</translation> </message> <message> <source>Reset all sign message fields</source> - <translation type="unfinished"/> + <translation>Vynulovať všetky polia podpisu správy</translation> </message> <message> <source>Clear &All</source> @@ -2035,7 +2043,7 @@ Adresa: %4</translation> </message> <message> <source>Enter the signing 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.</source> - <translation type="unfinished"/> + <translation>Vložte podpisovaciu adresu, správu (uistite sa, že kopírujete ukončenia riadkov, medzery, odrážky, atď. presne) a podpis pod to na overenie adresy. Buďte opatrní a nečítajte ako podpísané viac než je v samotnej podpísanej správe a môžete sa tak vyhnúť podvodu mitm útokom.</translation> </message> <message> <source>The address the message was signed with (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> @@ -2043,7 +2051,7 @@ Adresa: %4</translation> </message> <message> <source>Verify the message to ensure it was signed with the specified Bitcoin address</source> - <translation type="unfinished"/> + <translation>Overím správy sa uistiť že bola podpísaná označenou Bitcoin adresou</translation> </message> <message> <source>Verify &Message</source> @@ -2051,7 +2059,7 @@ Adresa: %4</translation> </message> <message> <source>Reset all verify message fields</source> - <translation type="unfinished"/> + <translation>Obnoviť všetky polia v overiť správu</translation> </message> <message> <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> @@ -2071,7 +2079,7 @@ Adresa: %4</translation> </message> <message> <source>The entered address does not refer to a key.</source> - <translation type="unfinished"/> + <translation>Vložená adresa nezodpovedá žiadnemu kľúcu.</translation> </message> <message> <source>Wallet unlock was cancelled.</source> @@ -2079,7 +2087,7 @@ Adresa: %4</translation> </message> <message> <source>Private key for the entered address is not available.</source> - <translation type="unfinished"/> + <translation>Súkromný kľúč pre vložená adresu nieje k dispozícii.</translation> </message> <message> <source>Message signing failed.</source> @@ -2099,7 +2107,7 @@ Adresa: %4</translation> </message> <message> <source>The signature did not match the message digest.</source> - <translation type="unfinished"/> + <translation>Podpis sa nezhoduje so zhrnutím správy</translation> </message> <message> <source>Message verification failed.</source> @@ -2140,7 +2148,7 @@ Adresa: %4</translation> </message> <message> <source>conflicted</source> - <translation type="unfinished"/> + <translation>sporné</translation> </message> <message> <source>%1/offline</source> @@ -2160,7 +2168,7 @@ Adresa: %4</translation> </message> <message numerus="yes"> <source>, broadcast through %n node(s)</source> - <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> + <translation><numerusform>,</numerusform><numerusform>,</numerusform><numerusform>, vysielať cez %n nód</numerusform></translation> </message> <message> <source>Date</source> @@ -2196,7 +2204,7 @@ Adresa: %4</translation> </message> <message numerus="yes"> <source>matures in %n more block(s)</source> - <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> + <translation><numerusform>Dospeje o %n blokov</numerusform><numerusform>Dospeje o %n blokov</numerusform><numerusform>dospeje o %n blokov</numerusform></translation> </message> <message> <source>not accepted</source> @@ -2302,7 +2310,7 @@ Adresa: %4</translation> </message> <message> <source>Immature (%1 confirmations, will be available after %2)</source> - <translation type="unfinished"/> + <translation>Nezrelé (%1 potvrdení, bude k dispozícii po %2)</translation> </message> <message numerus="yes"> <source>Open for %n more block(s)</source> @@ -2326,19 +2334,19 @@ Adresa: %4</translation> </message> <message> <source>Offline</source> - <translation type="unfinished"/> + <translation>Offline</translation> </message> <message> <source>Unconfirmed</source> - <translation type="unfinished"/> + <translation>Nepotvrdené</translation> </message> <message> <source>Confirming (%1 of %2 recommended confirmations)</source> - <translation type="unfinished"/> + <translation> Potvrdzuje sa ( %1 z %2 odporúčaných potvrdení)</translation> </message> <message> <source>Conflicted</source> - <translation type="unfinished"/> + <translation>V rozpore</translation> </message> <message> <source>Received with</source> @@ -2485,7 +2493,7 @@ Adresa: %4</translation> </message> <message> <source>The transaction history was successfully saved to %1.</source> - <translation type="unfinished"/> + <translation>História transakciá bola úspešne uložená do %1.</translation> </message> <message> <source>Comma separated file (*.csv)</source> @@ -2566,11 +2574,11 @@ Adresa: %4</translation> </message> <message> <source>There was an error trying to save the wallet data to %1.</source> - <translation type="unfinished"/> + <translation>Vyskytla sa chyba pri pokuse o uloženie dát peňaženky do %1.</translation> </message> <message> <source>The wallet data was successfully saved to %1.</source> - <translation type="unfinished"/> + <translation>Dáta peňaženky boli úspešne uložené do %1.</translation> </message> <message> <source>Backup Successful</source> @@ -2617,7 +2625,7 @@ Adresa: %4</translation> </message> <message> <source>Connect to a node to retrieve peer addresses, and disconnect</source> - <translation type="unfinished"/> + <translation>Pripojiť sa k nóde, získať adresy ďaľších počítačov v sieti a odpojit sa.</translation> </message> <message> <source>Specify your own public address</source> @@ -2633,7 +2641,7 @@ Adresa: %4</translation> </message> <message> <source>An error occurred while setting up the RPC port %u for listening on IPv4: %s</source> - <translation type="unfinished"/> + <translation>Vyskytla sa chyba pri nastavovaní RPC portu %u pre počúvanie na IPv4: %s</translation> </message> <message> <source>Listen for JSON-RPC connections on <port> (default: 8332 or testnet: 18332)</source> @@ -2645,7 +2653,7 @@ Adresa: %4</translation> </message> <message> <source>Bitcoin Core RPC client version</source> - <translation type="unfinished"/> + <translation>Verzia RPC klienta Jadra Bitcoin</translation> </message> <message> <source>Run in the background as a daemon and accept commands</source> @@ -2657,7 +2665,7 @@ Adresa: %4</translation> </message> <message> <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> - <translation type="unfinished"/> + <translation>Prijať spojenia zvonku (predvolené: 1 ak žiadne -proxy alebo -connect)</translation> </message> <message> <source>%s, you must set a rpcpassword in the configuration file: @@ -2679,11 +2687,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <source>An error occurred while setting up the RPC port %u for listening on IPv6, falling back to IPv4: %s</source> - <translation type="unfinished"/> + <translation>Vyskytla sa chyba pri nastavovaní RPC portu %u pre počúvanie na IPv6, vraciam sa späť ku IPv4: %s</translation> </message> <message> <source>Bind to given address and always listen on it. Use [host]:port notation for IPv6</source> - <translation type="unfinished"/> + <translation>Spojiť s danou adresou a vždy na nej počúvať. Použite zápis [host]:port pre IPv6</translation> </message> <message> <source>Continuously rate-limit free transactions to <n>*1000 bytes per minute (default:15)</source> @@ -2691,7 +2699,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <source>Enter regression test mode, which uses a special chain in which blocks can be solved instantly. This is intended for regression testing tools and app development.</source> - <translation type="unfinished"/> + <translation>Vstúpiť do regresného testovacieho módu, ktorý používa špeciálnu reťaz v ktorej môžu byť bloky v okamihu vyriešené. Pre účely regresného testovania a vývoja aplikácie.</translation> </message> <message> <source>Enter regression test mode, which uses a special chain in which blocks can be solved instantly.</source> @@ -2711,7 +2719,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source> - <translation type="unfinished"/> + <translation>Vykonaj príkaz keď sa zmení transakcia peňaženky (%s v príkaze je nahradená TxID)</translation> </message> <message> <source>Fees smaller than this are considered zero fee (for transaction creation) (default:</source> @@ -2767,7 +2775,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <source>Warning: error reading wallet.dat! All keys read correctly, but transaction data or address book entries might be missing or incorrect.</source> - <translation type="unfinished"/> + <translation>Varovanie: chyba pri čítaní wallet.dad! Všetky kľúče sú čitateľné ale transakčné dáta alebo záznamy v adresári môžu byť nesprávne.</translation> </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> @@ -2775,11 +2783,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <source>(default: 1)</source> - <translation type="unfinished"/> + <translation>(predvolené: 1)</translation> </message> <message> <source>(default: wallet.dat)</source> - <translation type="unfinished"/> + <translation>(predvolené: wallet.dat)</translation> </message> <message> <source><category> can be:</source> @@ -2787,7 +2795,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <source>Attempt to recover private keys from a corrupt wallet.dat</source> - <translation type="unfinished"/> + <translation>Pokus zachrániť súkromné kľúče z poškodeného wallet.dat</translation> </message> <message> <source>Bitcoin Core Daemon</source> @@ -2807,7 +2815,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <source>Connect through SOCKS proxy</source> - <translation type="unfinished"/> + <translation>Pripojiť cez SOCKS proxy</translation> </message> <message> <source>Connect to JSON-RPC on <port> (default: 8332 or testnet: 18332)</source> @@ -2815,7 +2823,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <source>Connection options:</source> - <translation type="unfinished"/> + <translation>Možnosti pripojenia:</translation> </message> <message> <source>Corrupted block database detected</source> @@ -2823,7 +2831,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <source>Debugging/Testing options:</source> - <translation type="unfinished"/> + <translation>Možnosti ladenia/testovania:</translation> </message> <message> <source>Disable safemode, override a real safe mode event (default: 0)</source> @@ -2831,7 +2839,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <source>Discover own IP address (default: 1 when listening and no -externalip)</source> - <translation type="unfinished"/> + <translation>Zisti vlastnú IP adresu (predvolené: 1 pri počúvaní/listening a žiadnej -externalip)</translation> </message> <message> <source>Do not load the wallet and disable wallet RPC calls</source> @@ -2847,7 +2855,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <source>Error initializing wallet database environment %s!</source> - <translation type="unfinished"/> + <translation>Chyba spustenia databázového prostredia peňaženky %s!</translation> </message> <message> <source>Error loading block database</source> @@ -2871,7 +2879,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <source>Failed to listen on any port. Use -listen=0 if you want this.</source> - <translation type="unfinished"/> + <translation>Chyba počúvania na ktoromkoľvek porte. Použi -listen=0 ak toto chcete.</translation> </message> <message> <source>Failed to read block info</source> @@ -2883,11 +2891,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <source>Failed to sync block index</source> - <translation type="unfinished"/> + <translation>Zlyhalo synchronizovanie zoznamu blokov</translation> </message> <message> <source>Failed to write block index</source> - <translation type="unfinished"/> + <translation>Zlyhalo zapisovanie do zoznamu blokov</translation> </message> <message> <source>Failed to write block info</source> @@ -2907,11 +2915,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <source>Failed to write transaction index</source> - <translation type="unfinished"/> + <translation>Zlyhal zápis zoznamu transakcií</translation> </message> <message> <source>Failed to write undo data</source> - <translation type="unfinished"/> + <translation>Zlyhalo zapisovanie </translation> </message> <message> <source>Fee per kB to add to transactions you send</source> @@ -2923,7 +2931,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <source>Find peers using DNS lookup (default: 1 unless -connect)</source> - <translation type="unfinished"/> + <translation>Nájsť počítače v bitcoin sieti použitím DNS vyhľadávania (predvolené: 1 okrem -connect)</translation> </message> <message> <source>Force safe mode (default: 0)</source> @@ -2931,11 +2939,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <source>Generate coins (default: 0)</source> - <translation type="unfinished"/> + <translation>Vytvárať mince (predvolené: 0)</translation> </message> <message> <source>How many blocks to check at startup (default: 288, 0 = all)</source> - <translation type="unfinished"/> + <translation>Koľko blokov skontrolovať pri spustení (predvolené: 288, 0 = všetky)</translation> </message> <message> <source>If <category> is not supplied, output all debugging information.</source> @@ -2943,19 +2951,19 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <source>Importing...</source> - <translation type="unfinished"/> + <translation>Prebieha import ...</translation> </message> <message> <source>Incorrect or no genesis block found. Wrong datadir for network?</source> - <translation type="unfinished"/> + <translation>Nesprávny alebo žiadny genesis blok nájdený. Nesprávny dátový priečinok alebo sieť?</translation> </message> <message> <source>Invalid -onion address: '%s'</source> - <translation type="unfinished"/> + <translation>Neplatná -onion adresa: '%s'</translation> </message> <message> <source>Not enough file descriptors available.</source> - <translation type="unfinished"/> + <translation>Nedostatok kľúčových slov súboru.</translation> </message> <message> <source>Prepend debug output with timestamp (default: 1)</source> @@ -2963,15 +2971,15 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <source>RPC client options:</source> - <translation type="unfinished"/> + <translation>Možnosti klienta RPC baník pyčo:</translation> </message> <message> <source>Rebuild block chain index from current blk000??.dat files</source> - <translation type="unfinished"/> + <translation>Znovu vytvoriť zoznam blokov zo súčasných blk000??.dat súborov</translation> </message> <message> <source>Select SOCKS version for -proxy (4 or 5, default: 5)</source> - <translation type="unfinished"/> + <translation>Zvoľte SOCKS verziu -proxy (4 alebo 5, predvolené 5)</translation> </message> <message> <source>Set database cache size in megabytes (%d to %d, default: %d)</source> @@ -2979,15 +2987,15 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <source>Set maximum block size in bytes (default: %d)</source> - <translation type="unfinished"/> + <translation>Nastaviť najväčšiu veľkosť bloku v bytoch (predvolené: %d)</translation> </message> <message> <source>Set the number of threads to service RPC calls (default: 4)</source> - <translation type="unfinished"/> + <translation>Nastaviť množstvo vlákien na obsluhu RPC volaní (predvolené: 4)</translation> </message> <message> <source>Specify wallet file (within data directory)</source> - <translation type="unfinished"/> + <translation>Označ súbor peňaženky (v priečinku s dátami)</translation> </message> <message> <source>Spend unconfirmed change when sending transactions (default: 1)</source> @@ -2999,7 +3007,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <source>Usage (deprecated, use bitcoin-cli):</source> - <translation type="unfinished"/> + <translation>Použitie (neodporúča sa, použite bitcoin-cli):</translation> </message> <message> <source>Verifying blocks...</source> @@ -3011,11 +3019,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <source>Wait for RPC server to start</source> - <translation type="unfinished"/> + <translation>Čakanie na štart RPC servra</translation> </message> <message> <source>Wallet %s resides outside data directory %s</source> - <translation type="unfinished"/> + <translation>Peňaženka %s sa nachádza mimo dátového priečinka %s </translation> </message> <message> <source>Wallet options:</source> @@ -3027,7 +3035,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <source>You need to rebuild the database using -reindex to change -txindex</source> - <translation type="unfinished"/> + <translation>Potrebujete prebudovať databázu použitím -reindex zmeniť -txindex</translation> </message> <message> <source>Imports blocks from external blk000??.dat file</source> @@ -3035,7 +3043,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <source>Cannot obtain a lock on data directory %s. Bitcoin Core is probably already running.</source> - <translation type="unfinished"/> + <translation>Neviem uzamknúť data adresár %s. Jadro Bitcoin je pravdepodobne už spustené.</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> @@ -3055,11 +3063,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <source>Invalid amount for -minrelaytxfee=<amount>: '%s'</source> - <translation type="unfinished"/> + <translation>Neplatná suma pre -minrelaytxfee=<amount>: '%s'</translation> </message> <message> <source>Invalid amount for -mintxfee=<amount>: '%s'</source> - <translation type="unfinished"/> + <translation>Neplatná suma pre -mintxfee=<amount>: '%s'</translation> </message> <message> <source>Limit size of signature cache to <n> entries (default: 50000)</source> @@ -3075,7 +3083,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <source>Maximum per-connection receive buffer, <n>*1000 bytes (default: 5000)</source> - <translation type="unfinished"/> + <translation>Maximálna veľkosť prijímacieho zásobníka pre jedno spojenie, <n>*1000 bytov (predvolené: 5000)</translation> </message> <message> <source>Maximum per-connection send buffer, <n>*1000 bytes (default: 1000)</source> @@ -3087,7 +3095,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <source>Only connect to nodes in network <net> (IPv4, IPv6 or Tor)</source> - <translation type="unfinished"/> + <translation>Pripájať sa len k nódam v sieti <net> (IPv4, IPv6 alebo Tor)</translation> </message> <message> <source>Print block on startup, if found in block index</source> @@ -3103,11 +3111,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <source>RPC server options:</source> - <translation type="unfinished"/> + <translation>Možnosti servra RPC:</translation> </message> <message> <source>Randomly drop 1 of every <n> network messages</source> - <translation type="unfinished"/> + <translation>Náhodne zahadzuj 1 z každých <n> sieťových správ</translation> </message> <message> <source>Randomly fuzz 1 of every <n> network messages</source> @@ -3115,7 +3123,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <source>Run a thread to flush wallet periodically (default: 1)</source> - <translation type="unfinished"/> + <translation>Mať spustené vlákno pravidelného čístenia peňaženky (predvolené: 1)</translation> </message> <message> <source>SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source> @@ -3123,7 +3131,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <source>Send command to Bitcoin Core</source> - <translation type="unfinished"/> + <translation>Poslať príkaz Jadru Bitcoin</translation> </message> <message> <source>Send trace/debug info to console instead of debug.log file</source> @@ -3131,23 +3139,23 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <source>Set minimum block size in bytes (default: 0)</source> - <translation type="unfinished"/> + <translation>Nastaviť minimálnu veľkosť bloku v bytoch (predvolené: 0)</translation> </message> <message> <source>Sets the DB_PRIVATE flag in the wallet db environment (default: 1)</source> - <translation type="unfinished"/> + <translation>Nastaví DB_PRIVATE možnosť v db prostredí peňaženky (prednastavené: 1)</translation> </message> <message> <source>Show all debugging options (usage: --help -help-debug)</source> - <translation type="unfinished"/> + <translation>Zobraziť všetky možnosti ladenia (použitie: --help --help-debug)</translation> </message> <message> <source>Show benchmark information (default: 0)</source> - <translation type="unfinished"/> + <translation>Zobraziť porovnávacie informácie (prednastavené: 0)</translation> </message> <message> <source>Shrink debug.log file on client startup (default: 1 when no -debug)</source> - <translation type="unfinished"/> + <translation>Zmenšiť debug.log pri spustení klienta (predvolené: 1 ak bez -debug)</translation> </message> <message> <source>Signing transaction failed</source> @@ -3159,7 +3167,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <source>Start Bitcoin Core Daemon</source> - <translation type="unfinished"/> + <translation>Štart služby Jadro Bitcoin</translation> </message> <message> <source>System error: </source> @@ -3171,7 +3179,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <source>Transaction amounts must be positive</source> - <translation type="unfinished"/> + <translation>Hodnoty transakcie musia byť väčšie ako nula (pozitívne)</translation> </message> <message> <source>Transaction too large</source> @@ -3203,7 +3211,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <source>on startup</source> - <translation type="unfinished"/> + <translation>pri štarte</translation> </message> <message> <source>version</source> @@ -3259,7 +3267,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <source>Unable to bind to %s on this computer (bind returned error %d, %s)</source> - <translation type="unfinished"/> + <translation>Nepodarilo sa spojiť s %s na tomto počítači (bind vrátil chybu %d, %s)</translation> </message> <message> <source>Allow DNS lookups for -addnode, -seednode and -connect</source> @@ -3291,19 +3299,19 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <source>Unknown network specified in -onlynet: '%s'</source> - <translation type="unfinished"/> + <translation>Neznáma sieť upresnená v -onlynet: '%s'</translation> </message> <message> <source>Unknown -socks proxy version requested: %i</source> - <translation type="unfinished"/> + <translation>Neznáma verzia -socks proxy požadovaná: %i</translation> </message> <message> <source>Cannot resolve -bind address: '%s'</source> - <translation type="unfinished"/> + <translation>Nemožno rozriešiť -bind adress: '%s'</translation> </message> <message> <source>Cannot resolve -externalip address: '%s'</source> - <translation type="unfinished"/> + <translation>Nemožno rozriešiť -externalip address: '%s'</translation> </message> <message> <source>Invalid amount for -paytxfee=<amount>: '%s'</source> diff --git a/src/qt/locale/bitcoin_sl_SI.ts b/src/qt/locale/bitcoin_sl_SI.ts index b966842d85..1a46c6ae6c 100644 --- a/src/qt/locale/bitcoin_sl_SI.ts +++ b/src/qt/locale/bitcoin_sl_SI.ts @@ -1,4 +1,4 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="sl_SI" version="2.0"> +<?xml version="1.0" ?><!DOCTYPE TS><TS language="sl_SI" version="2.1"> <context> <name>AboutDialog</name> <message> @@ -1043,6 +1043,14 @@ Naslov: %4 <translation type="unfinished"/> </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 type="unfinished"/> + </message> + <message> + <source>Third party transaction URLs</source> + <translation type="unfinished"/> + </message> + <message> <source>Active command-line options that override above options:</source> <translation type="unfinished"/> </message> @@ -1344,7 +1352,7 @@ Naslov: %4 <translation>Napaka: Neveljavna kombinacija -regtest and -testnet</translation> </message> <message> - <source>Bitcoin Core did't yet exit safely...</source> + <source>Bitcoin Core didn't yet exit safely...</source> <translation type="unfinished"/> </message> <message> diff --git a/src/qt/locale/bitcoin_sq.ts b/src/qt/locale/bitcoin_sq.ts index 5d9e7b7168..65e37ff903 100644 --- a/src/qt/locale/bitcoin_sq.ts +++ b/src/qt/locale/bitcoin_sq.ts @@ -1,4 +1,4 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="sq" version="2.0"> +<?xml version="1.0" ?><!DOCTYPE TS><TS language="sq" version="2.1"> <context> <name>AboutDialog</name> <message> @@ -1039,6 +1039,14 @@ Address: %4 <translation type="unfinished"/> </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 type="unfinished"/> + </message> + <message> + <source>Third party transaction URLs</source> + <translation type="unfinished"/> + </message> + <message> <source>Active command-line options that override above options:</source> <translation type="unfinished"/> </message> @@ -1340,7 +1348,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <source>Bitcoin Core did't yet exit safely...</source> + <source>Bitcoin Core didn't yet exit safely...</source> <translation type="unfinished"/> </message> <message> diff --git a/src/qt/locale/bitcoin_sr.ts b/src/qt/locale/bitcoin_sr.ts index 6549c53542..901eb59394 100644 --- a/src/qt/locale/bitcoin_sr.ts +++ b/src/qt/locale/bitcoin_sr.ts @@ -1,4 +1,4 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="sr" version="2.0"> +<?xml version="1.0" ?><!DOCTYPE TS><TS language="sr" version="2.1"> <context> <name>AboutDialog</name> <message> @@ -1039,6 +1039,14 @@ Address: %4 <translation type="unfinished"/> </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 type="unfinished"/> + </message> + <message> + <source>Third party transaction URLs</source> + <translation type="unfinished"/> + </message> + <message> <source>Active command-line options that override above options:</source> <translation type="unfinished"/> </message> @@ -1340,7 +1348,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <source>Bitcoin Core did't yet exit safely...</source> + <source>Bitcoin Core didn't yet exit safely...</source> <translation type="unfinished"/> </message> <message> diff --git a/src/qt/locale/bitcoin_sv.ts b/src/qt/locale/bitcoin_sv.ts index 27a8c4d0e3..e98048e925 100644 --- a/src/qt/locale/bitcoin_sv.ts +++ b/src/qt/locale/bitcoin_sv.ts @@ -1,4 +1,4 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="sv" version="2.0"> +<?xml version="1.0" ?><!DOCTYPE TS><TS language="sv" version="2.1"> <context> <name>AboutDialog</name> <message> @@ -1049,6 +1049,14 @@ Adress: %4 <translation>Proxyns IP-adress (t.ex. IPv4: 127.0.0.1 / IPv6: ::1)</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>Tredjeparts URL:er (t.ex. en block utforskare) som finns i transaktionstabben som ett menyval i sammanhanget. %s i URL:en ersätts med tansaktionshashen. Flera URL:er är separerade med vertikala streck |.</translation> + </message> + <message> + <source>Third party transaction URLs</source> + <translation>Tredjeparts transaktions-URL:er</translation> + </message> + <message> <source>Active command-line options that override above options:</source> <translation>Aktiva kommandoradsalternativ som överrider alternativen ovan:</translation> </message> @@ -1350,8 +1358,8 @@ Adress: %4 <translation>Fel: Felaktig kombination av -regtest och -testnet.</translation> </message> <message> - <source>Bitcoin Core did't yet exit safely...</source> - <translation>Bitcoin Core avslutades säkert...</translation> + <source>Bitcoin Core didn't yet exit safely...</source> + <translation>Bitcoin Core avslutades inte ännu säkert...</translation> </message> <message> <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> diff --git a/src/qt/locale/bitcoin_th_TH.ts b/src/qt/locale/bitcoin_th_TH.ts index a26a128d93..96c49b12d0 100644 --- a/src/qt/locale/bitcoin_th_TH.ts +++ b/src/qt/locale/bitcoin_th_TH.ts @@ -1,4 +1,4 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="th_TH" version="2.0"> +<?xml version="1.0" ?><!DOCTYPE TS><TS language="th_TH" version="2.1"> <context> <name>AboutDialog</name> <message> @@ -1039,6 +1039,14 @@ Address: %4 <translation type="unfinished"/> </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 type="unfinished"/> + </message> + <message> + <source>Third party transaction URLs</source> + <translation type="unfinished"/> + </message> + <message> <source>Active command-line options that override above options:</source> <translation type="unfinished"/> </message> @@ -1340,7 +1348,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <source>Bitcoin Core did't yet exit safely...</source> + <source>Bitcoin Core didn't yet exit safely...</source> <translation type="unfinished"/> </message> <message> diff --git a/src/qt/locale/bitcoin_tr.ts b/src/qt/locale/bitcoin_tr.ts index 07d6e68f17..15ec92f982 100644 --- a/src/qt/locale/bitcoin_tr.ts +++ b/src/qt/locale/bitcoin_tr.ts @@ -1,4 +1,4 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="tr" version="2.0"> +<?xml version="1.0" ?><!DOCTYPE TS><TS language="tr" version="2.1"> <context> <name>AboutDialog</name> <message> @@ -1048,6 +1048,14 @@ Adres: %4 <translation>Vekil sunucusunun IP adresi (mesela IPv4: 127.0.0.1 / IPv6: ::1)</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>Muameleler sekmesinde bağlam menüsü unsurları olarak görünen üçüncü taraf bağlantıları (mesela bir blok tarayıcısı). URL'deki %s, muamele hash değeri ile değiştirilecektir. Birden çok bağlantılar düşey çubuklar | ile ayrılacaktır.</translation> + </message> + <message> + <source>Third party transaction URLs</source> + <translation>Üçüncü taraf muamele URL'leri</translation> + </message> + <message> <source>Active command-line options that override above options:</source> <translation>Yukarıdaki seçeneklerin yerine geçen faal komut satırı seçenekleri:</translation> </message> @@ -1349,7 +1357,7 @@ Adres: %4 <translation>Hata: -regtest ve -testnet'in geçersiz kombinasyonu.</translation> </message> <message> - <source>Bitcoin Core did't yet exit safely...</source> + <source>Bitcoin Core didn't yet exit safely...</source> <translation>Bitcoin Çekirdeği henüz güvenli bir şekilde çıkış yapmamıştır...</translation> </message> <message> diff --git a/src/qt/locale/bitcoin_uk.ts b/src/qt/locale/bitcoin_uk.ts index d78775319f..1e739395a2 100644 --- a/src/qt/locale/bitcoin_uk.ts +++ b/src/qt/locale/bitcoin_uk.ts @@ -1,4 +1,4 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="uk" version="2.0"> +<?xml version="1.0" ?><!DOCTYPE TS><TS language="uk" version="2.1"> <context> <name>AboutDialog</name> <message> @@ -1048,6 +1048,14 @@ Address: %4 <translation type="unfinished"/> </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 type="unfinished"/> + </message> + <message> + <source>Third party transaction URLs</source> + <translation type="unfinished"/> + </message> + <message> <source>Active command-line options that override above options:</source> <translation type="unfinished"/> </message> @@ -1349,7 +1357,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <source>Bitcoin Core did't yet exit safely...</source> + <source>Bitcoin Core didn't yet exit safely...</source> <translation type="unfinished"/> </message> <message> diff --git a/src/qt/locale/bitcoin_ur_PK.ts b/src/qt/locale/bitcoin_ur_PK.ts index 45b46e2689..d9634f63e3 100644 --- a/src/qt/locale/bitcoin_ur_PK.ts +++ b/src/qt/locale/bitcoin_ur_PK.ts @@ -1,4 +1,4 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="ur_PK" version="2.0"> +<?xml version="1.0" ?><!DOCTYPE TS><TS language="ur_PK" version="2.1"> <context> <name>AboutDialog</name> <message> @@ -1039,6 +1039,14 @@ Address: %4 <translation type="unfinished"/> </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 type="unfinished"/> + </message> + <message> + <source>Third party transaction URLs</source> + <translation type="unfinished"/> + </message> + <message> <source>Active command-line options that override above options:</source> <translation type="unfinished"/> </message> @@ -1340,7 +1348,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <source>Bitcoin Core did't yet exit safely...</source> + <source>Bitcoin Core didn't yet exit safely...</source> <translation type="unfinished"/> </message> <message> diff --git a/src/qt/locale/bitcoin_uz@Cyrl.ts b/src/qt/locale/bitcoin_uz@Cyrl.ts index e4ce310e20..6ba4f6fa1b 100644 --- a/src/qt/locale/bitcoin_uz@Cyrl.ts +++ b/src/qt/locale/bitcoin_uz@Cyrl.ts @@ -1,4 +1,4 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="uz@Cyrl" version="2.0"> +<?xml version="1.0" ?><!DOCTYPE TS><TS language="uz@Cyrl" version="2.1"> <context> <name>AboutDialog</name> <message> @@ -1039,6 +1039,14 @@ Address: %4 <translation type="unfinished"/> </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 type="unfinished"/> + </message> + <message> + <source>Third party transaction URLs</source> + <translation type="unfinished"/> + </message> + <message> <source>Active command-line options that override above options:</source> <translation type="unfinished"/> </message> @@ -1340,7 +1348,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <source>Bitcoin Core did't yet exit safely...</source> + <source>Bitcoin Core didn't yet exit safely...</source> <translation type="unfinished"/> </message> <message> diff --git a/src/qt/locale/bitcoin_vi.ts b/src/qt/locale/bitcoin_vi.ts index 88e37b5ea2..0f9fc4f0f1 100644 --- a/src/qt/locale/bitcoin_vi.ts +++ b/src/qt/locale/bitcoin_vi.ts @@ -1,4 +1,4 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="vi" version="2.0"> +<?xml version="1.0" ?><!DOCTYPE TS><TS language="vi" version="2.1"> <context> <name>AboutDialog</name> <message> @@ -1039,6 +1039,14 @@ Address: %4 <translation type="unfinished"/> </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 type="unfinished"/> + </message> + <message> + <source>Third party transaction URLs</source> + <translation type="unfinished"/> + </message> + <message> <source>Active command-line options that override above options:</source> <translation type="unfinished"/> </message> @@ -1340,7 +1348,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <source>Bitcoin Core did't yet exit safely...</source> + <source>Bitcoin Core didn't yet exit safely...</source> <translation type="unfinished"/> </message> <message> diff --git a/src/qt/locale/bitcoin_vi_VN.ts b/src/qt/locale/bitcoin_vi_VN.ts index 743e7119d1..2102729523 100644 --- a/src/qt/locale/bitcoin_vi_VN.ts +++ b/src/qt/locale/bitcoin_vi_VN.ts @@ -1,4 +1,4 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="vi_VN" version="2.0"> +<?xml version="1.0" ?><!DOCTYPE TS><TS language="vi_VN" version="2.1"> <context> <name>AboutDialog</name> <message> @@ -1039,6 +1039,14 @@ Address: %4 <translation type="unfinished"/> </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 type="unfinished"/> + </message> + <message> + <source>Third party transaction URLs</source> + <translation type="unfinished"/> + </message> + <message> <source>Active command-line options that override above options:</source> <translation type="unfinished"/> </message> @@ -1340,7 +1348,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <source>Bitcoin Core did't yet exit safely...</source> + <source>Bitcoin Core didn't yet exit safely...</source> <translation type="unfinished"/> </message> <message> diff --git a/src/qt/locale/bitcoin_zh_CN.ts b/src/qt/locale/bitcoin_zh_CN.ts index a8859892d6..ea98c4e4b1 100644 --- a/src/qt/locale/bitcoin_zh_CN.ts +++ b/src/qt/locale/bitcoin_zh_CN.ts @@ -1,4 +1,4 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="zh_CN" version="2.0"> +<?xml version="1.0" ?><!DOCTYPE TS><TS language="zh_CN" version="2.1"> <context> <name>AboutDialog</name> <message> @@ -1049,6 +1049,14 @@ Address: %4 <translation>代理的 IP 地址 (例如 IPv4: 127.0.0.1 / IPv6: ::1)</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 type="unfinished"/> + </message> + <message> + <source>Third party transaction URLs</source> + <translation type="unfinished"/> + </message> + <message> <source>Active command-line options that override above options:</source> <translation>有效的命令行参数覆盖上述选项:</translation> </message> @@ -1350,7 +1358,7 @@ Address: %4 <translation>错误：无效的 -regtest 与 -testnet 结合体。</translation> </message> <message> - <source>Bitcoin Core did't yet exit safely...</source> + <source>Bitcoin Core didn't yet exit safely...</source> <translation type="unfinished"/> </message> <message> diff --git a/src/qt/locale/bitcoin_zh_HK.ts b/src/qt/locale/bitcoin_zh_HK.ts index cf729a3f92..835d0134d6 100644 --- a/src/qt/locale/bitcoin_zh_HK.ts +++ b/src/qt/locale/bitcoin_zh_HK.ts @@ -1,4 +1,4 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="zh_HK" version="2.0"> +<?xml version="1.0" ?><!DOCTYPE TS><TS language="zh_HK" version="2.1"> <context> <name>AboutDialog</name> <message> @@ -1039,6 +1039,14 @@ Address: %4 <translation type="unfinished"/> </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 type="unfinished"/> + </message> + <message> + <source>Third party transaction URLs</source> + <translation type="unfinished"/> + </message> + <message> <source>Active command-line options that override above options:</source> <translation type="unfinished"/> </message> @@ -1340,7 +1348,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <source>Bitcoin Core did't yet exit safely...</source> + <source>Bitcoin Core didn't yet exit safely...</source> <translation type="unfinished"/> </message> <message> diff --git a/src/qt/locale/bitcoin_zh_TW.ts b/src/qt/locale/bitcoin_zh_TW.ts index 4f7561ab9e..fccdf48abd 100644 --- a/src/qt/locale/bitcoin_zh_TW.ts +++ b/src/qt/locale/bitcoin_zh_TW.ts @@ -1,4 +1,4 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="zh_TW" version="2.0"> +<?xml version="1.0" ?><!DOCTYPE TS><TS language="zh_TW" version="2.1"> <context> <name>AboutDialog</name> <message> @@ -1050,6 +1050,14 @@ Address: %4 <translation>代理伺服器的網際網路位址(像是 IPv4 的 127.0.0.1 或 IPv6 的 ::1)</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>在交易頁籤的情境選單出現的第三方(比如說區塊探索網站)網址連結。網址中的 %s 會被取代為交易的雜湊值。可以用直線符號 | 來分隔多個連結。</translation> + </message> + <message> + <source>Third party transaction URLs</source> + <translation>交易的第三方網址連結</translation> + </message> + <message> <source>Active command-line options that override above options:</source> <translation>從命令列取代掉以上設定的選項有:</translation> </message> @@ -1351,7 +1359,7 @@ Address: %4 <translation>錯誤: -regtest 和 -testnet 的使用組合無效。</translation> </message> <message> - <source>Bitcoin Core did't yet exit safely...</source> + <source>Bitcoin Core didn't yet exit safely...</source> <translation>位元幣核心還沒有安全地結束...</translation> </message> <message> diff --git a/src/rpcblockchain.cpp b/src/rpcblockchain.cpp index 1ed8a8e866..a303b5d3ef 100644 --- a/src/rpcblockchain.cpp +++ b/src/rpcblockchain.cpp @@ -64,8 +64,8 @@ Object blockToJSON(const CBlock& block, const CBlockIndex* blockindex) BOOST_FOREACH(const CTransaction&tx, block.vtx) txs.push_back(tx.GetHash().GetHex()); result.push_back(Pair("tx", txs)); - result.push_back(Pair("time", (boost::int64_t)block.GetBlockTime())); - result.push_back(Pair("nonce", (boost::uint64_t)block.nNonce)); + result.push_back(Pair("time", block.GetBlockTime())); + result.push_back(Pair("nonce", (uint64_t)block.nNonce)); result.push_back(Pair("bits", HexBits(block.nBits))); result.push_back(Pair("difficulty", GetDifficulty(blockindex))); result.push_back(Pair("chainwork", blockindex->nChainWork.GetHex())); @@ -175,7 +175,7 @@ Value getrawmempool(const Array& params, bool fHelp) Object info; info.push_back(Pair("size", (int)e.GetTxSize())); info.push_back(Pair("fee", ValueFromAmount(e.GetFee()))); - info.push_back(Pair("time", (boost::int64_t)e.GetTime())); + info.push_back(Pair("time", e.GetTime())); info.push_back(Pair("height", (int)e.GetHeight())); info.push_back(Pair("startingpriority", e.GetPriority(e.GetHeight()))); info.push_back(Pair("currentpriority", e.GetPriority(chainActive.Height()))); @@ -315,11 +315,11 @@ Value gettxoutsetinfo(const Array& params, bool fHelp) CCoinsStats stats; if (pcoinsTip->GetStats(stats)) { - ret.push_back(Pair("height", (boost::int64_t)stats.nHeight)); + ret.push_back(Pair("height", (int64_t)stats.nHeight)); ret.push_back(Pair("bestblock", stats.hashBlock.GetHex())); - ret.push_back(Pair("transactions", (boost::int64_t)stats.nTransactions)); - ret.push_back(Pair("txouts", (boost::int64_t)stats.nTransactionOutputs)); - ret.push_back(Pair("bytes_serialized", (boost::int64_t)stats.nSerializedSize)); + ret.push_back(Pair("transactions", (int64_t)stats.nTransactions)); + ret.push_back(Pair("txouts", (int64_t)stats.nTransactionOutputs)); + ret.push_back(Pair("bytes_serialized", (int64_t)stats.nSerializedSize)); ret.push_back(Pair("hash_serialized", stats.hashSerialized.GetHex())); ret.push_back(Pair("total_amount", ValueFromAmount(stats.nTotalAmount))); } diff --git a/src/rpcclient.cpp b/src/rpcclient.cpp index 8620a87297..4f3c39ce9b 100644 --- a/src/rpcclient.cpp +++ b/src/rpcclient.cpp @@ -128,53 +128,53 @@ Array RPCConvertValues(const std::string &strMethod, const std::vector<std::stri if (strMethod == "stop" && n > 0) ConvertTo<bool>(params[0]); if (strMethod == "getaddednodeinfo" && n > 0) ConvertTo<bool>(params[0]); if (strMethod == "setgenerate" && n > 0) ConvertTo<bool>(params[0]); - if (strMethod == "setgenerate" && n > 1) ConvertTo<boost::int64_t>(params[1]); - if (strMethod == "getnetworkhashps" && n > 0) ConvertTo<boost::int64_t>(params[0]); - if (strMethod == "getnetworkhashps" && n > 1) ConvertTo<boost::int64_t>(params[1]); + if (strMethod == "setgenerate" && n > 1) ConvertTo<int64_t>(params[1]); + if (strMethod == "getnetworkhashps" && n > 0) ConvertTo<int64_t>(params[0]); + if (strMethod == "getnetworkhashps" && n > 1) ConvertTo<int64_t>(params[1]); if (strMethod == "sendtoaddress" && n > 1) ConvertTo<double>(params[1]); if (strMethod == "settxfee" && n > 0) ConvertTo<double>(params[0]); - if (strMethod == "getreceivedbyaddress" && n > 1) ConvertTo<boost::int64_t>(params[1]); - if (strMethod == "getreceivedbyaccount" && n > 1) ConvertTo<boost::int64_t>(params[1]); - if (strMethod == "listreceivedbyaddress" && n > 0) ConvertTo<boost::int64_t>(params[0]); + if (strMethod == "getreceivedbyaddress" && n > 1) ConvertTo<int64_t>(params[1]); + if (strMethod == "getreceivedbyaccount" && n > 1) ConvertTo<int64_t>(params[1]); + if (strMethod == "listreceivedbyaddress" && n > 0) ConvertTo<int64_t>(params[0]); if (strMethod == "listreceivedbyaddress" && n > 1) ConvertTo<bool>(params[1]); - if (strMethod == "listreceivedbyaccount" && n > 0) ConvertTo<boost::int64_t>(params[0]); + if (strMethod == "listreceivedbyaccount" && n > 0) ConvertTo<int64_t>(params[0]); if (strMethod == "listreceivedbyaccount" && n > 1) ConvertTo<bool>(params[1]); - if (strMethod == "getbalance" && n > 1) ConvertTo<boost::int64_t>(params[1]); - if (strMethod == "getblockhash" && n > 0) ConvertTo<boost::int64_t>(params[0]); + if (strMethod == "getbalance" && n > 1) ConvertTo<int64_t>(params[1]); + if (strMethod == "getblockhash" && n > 0) ConvertTo<int64_t>(params[0]); if (strMethod == "move" && n > 2) ConvertTo<double>(params[2]); - if (strMethod == "move" && n > 3) ConvertTo<boost::int64_t>(params[3]); + if (strMethod == "move" && n > 3) ConvertTo<int64_t>(params[3]); if (strMethod == "sendfrom" && n > 2) ConvertTo<double>(params[2]); - if (strMethod == "sendfrom" && n > 3) ConvertTo<boost::int64_t>(params[3]); - if (strMethod == "listtransactions" && n > 1) ConvertTo<boost::int64_t>(params[1]); - if (strMethod == "listtransactions" && n > 2) ConvertTo<boost::int64_t>(params[2]); - if (strMethod == "listaccounts" && n > 0) ConvertTo<boost::int64_t>(params[0]); - if (strMethod == "walletpassphrase" && n > 1) ConvertTo<boost::int64_t>(params[1]); + if (strMethod == "sendfrom" && n > 3) ConvertTo<int64_t>(params[3]); + if (strMethod == "listtransactions" && n > 1) ConvertTo<int64_t>(params[1]); + if (strMethod == "listtransactions" && n > 2) ConvertTo<int64_t>(params[2]); + if (strMethod == "listaccounts" && n > 0) ConvertTo<int64_t>(params[0]); + if (strMethod == "walletpassphrase" && n > 1) ConvertTo<int64_t>(params[1]); if (strMethod == "getblocktemplate" && n > 0) ConvertTo<Object>(params[0]); - if (strMethod == "listsinceblock" && n > 1) ConvertTo<boost::int64_t>(params[1]); + if (strMethod == "listsinceblock" && n > 1) ConvertTo<int64_t>(params[1]); if (strMethod == "sendmany" && n > 1) ConvertTo<Object>(params[1]); - if (strMethod == "sendmany" && n > 2) ConvertTo<boost::int64_t>(params[2]); - if (strMethod == "addmultisigaddress" && n > 0) ConvertTo<boost::int64_t>(params[0]); + if (strMethod == "sendmany" && n > 2) ConvertTo<int64_t>(params[2]); + if (strMethod == "addmultisigaddress" && n > 0) ConvertTo<int64_t>(params[0]); if (strMethod == "addmultisigaddress" && n > 1) ConvertTo<Array>(params[1]); - if (strMethod == "createmultisig" && n > 0) ConvertTo<boost::int64_t>(params[0]); + if (strMethod == "createmultisig" && n > 0) ConvertTo<int64_t>(params[0]); if (strMethod == "createmultisig" && n > 1) ConvertTo<Array>(params[1]); - if (strMethod == "listunspent" && n > 0) ConvertTo<boost::int64_t>(params[0]); - if (strMethod == "listunspent" && n > 1) ConvertTo<boost::int64_t>(params[1]); + if (strMethod == "listunspent" && n > 0) ConvertTo<int64_t>(params[0]); + if (strMethod == "listunspent" && n > 1) ConvertTo<int64_t>(params[1]); if (strMethod == "listunspent" && n > 2) ConvertTo<Array>(params[2]); if (strMethod == "getblock" && n > 1) ConvertTo<bool>(params[1]); - if (strMethod == "getrawtransaction" && n > 1) ConvertTo<boost::int64_t>(params[1]); + if (strMethod == "getrawtransaction" && n > 1) ConvertTo<int64_t>(params[1]); if (strMethod == "createrawtransaction" && n > 0) ConvertTo<Array>(params[0]); if (strMethod == "createrawtransaction" && n > 1) ConvertTo<Object>(params[1]); if (strMethod == "signrawtransaction" && n > 1) ConvertTo<Array>(params[1], true); if (strMethod == "signrawtransaction" && n > 2) ConvertTo<Array>(params[2], true); if (strMethod == "sendrawtransaction" && n > 1) ConvertTo<bool>(params[1], true); - if (strMethod == "gettxout" && n > 1) ConvertTo<boost::int64_t>(params[1]); + if (strMethod == "gettxout" && n > 1) ConvertTo<int64_t>(params[1]); if (strMethod == "gettxout" && n > 2) ConvertTo<bool>(params[2]); if (strMethod == "lockunspent" && n > 0) ConvertTo<bool>(params[0]); if (strMethod == "lockunspent" && n > 1) ConvertTo<Array>(params[1]); if (strMethod == "importprivkey" && n > 2) ConvertTo<bool>(params[2]); - if (strMethod == "verifychain" && n > 0) ConvertTo<boost::int64_t>(params[0]); - if (strMethod == "verifychain" && n > 1) ConvertTo<boost::int64_t>(params[1]); - if (strMethod == "keypoolrefill" && n > 0) ConvertTo<boost::int64_t>(params[0]); + if (strMethod == "verifychain" && n > 0) ConvertTo<int64_t>(params[0]); + if (strMethod == "verifychain" && n > 1) ConvertTo<int64_t>(params[1]); + if (strMethod == "keypoolrefill" && n > 0) ConvertTo<int64_t>(params[0]); if (strMethod == "getrawmempool" && n > 0) ConvertTo<bool>(params[0]); return params; diff --git a/src/rpcmining.cpp b/src/rpcmining.cpp index cb903b585a..23876c603d 100644 --- a/src/rpcmining.cpp +++ b/src/rpcmining.cpp @@ -88,7 +88,7 @@ Value GetNetworkHashPS(int lookup, int height) { uint256 workDiff = pb->nChainWork - pb0->nChainWork; int64_t timeDiff = maxTime - minTime; - return (boost::int64_t)(workDiff.getdouble() / timeDiff); + return (int64_t)(workDiff.getdouble() / timeDiff); } Value getnetworkhashps(const Array& params, bool fHelp) @@ -226,8 +226,8 @@ Value gethashespersec(const Array& params, bool fHelp) ); if (GetTimeMillis() - nHPSTimerStart > 8000) - return (boost::int64_t)0; - return (boost::int64_t)dHashesPerSec; + return (int64_t)0; + return (int64_t)dHashesPerSec; } #endif diff --git a/src/rpcmisc.cpp b/src/rpcmisc.cpp index a2694d458a..27d6d61a36 100644 --- a/src/rpcmisc.cpp +++ b/src/rpcmisc.cpp @@ -69,18 +69,18 @@ Value getinfo(const Array& params, bool fHelp) } #endif obj.push_back(Pair("blocks", (int)chainActive.Height())); - obj.push_back(Pair("timeoffset", (boost::int64_t)GetTimeOffset())); + obj.push_back(Pair("timeoffset", GetTimeOffset())); obj.push_back(Pair("connections", (int)vNodes.size())); obj.push_back(Pair("proxy", (proxy.first.IsValid() ? proxy.first.ToStringIPPort() : string()))); obj.push_back(Pair("difficulty", (double)GetDifficulty())); obj.push_back(Pair("testnet", TestNet())); #ifdef ENABLE_WALLET if (pwalletMain) { - obj.push_back(Pair("keypoololdest", (boost::int64_t)pwalletMain->GetOldestKeyPoolTime())); + obj.push_back(Pair("keypoololdest", pwalletMain->GetOldestKeyPoolTime())); obj.push_back(Pair("keypoolsize", (int)pwalletMain->GetKeyPoolSize())); } if (pwalletMain && pwalletMain->IsCrypted()) - obj.push_back(Pair("unlocked_until", (boost::int64_t)nWalletUnlockTime)); + obj.push_back(Pair("unlocked_until", nWalletUnlockTime)); obj.push_back(Pair("paytxfee", ValueFromAmount(nTransactionFee))); #endif obj.push_back(Pair("relayfee", ValueFromAmount(CTransaction::nMinRelayTxFee))); @@ -187,7 +187,7 @@ CScript _createmultisig_redeemScript(const Array& params) if ((int)keys.size() < nRequired) throw runtime_error( strprintf("not enough keys supplied " - "(got %"PRIszu" keys, but need at least %d to redeem)", keys.size(), nRequired)); + "(got %u keys, but need at least %d to redeem)", keys.size(), nRequired)); std::vector<CPubKey> pubkeys; pubkeys.resize(keys.size()); for (unsigned int i = 0; i < keys.size(); i++) diff --git a/src/rpcnet.cpp b/src/rpcnet.cpp index 573d6cd3f6..024f6a09de 100644 --- a/src/rpcnet.cpp +++ b/src/rpcnet.cpp @@ -116,11 +116,11 @@ Value getpeerinfo(const Array& params, bool fHelp) if (!(stats.addrLocal.empty())) obj.push_back(Pair("addrlocal", stats.addrLocal)); obj.push_back(Pair("services", strprintf("%08x", stats.nServices))); - obj.push_back(Pair("lastsend", (boost::int64_t)stats.nLastSend)); - obj.push_back(Pair("lastrecv", (boost::int64_t)stats.nLastRecv)); - obj.push_back(Pair("bytessent", (boost::int64_t)stats.nSendBytes)); - obj.push_back(Pair("bytesrecv", (boost::int64_t)stats.nRecvBytes)); - obj.push_back(Pair("conntime", (boost::int64_t)stats.nTimeConnected)); + obj.push_back(Pair("lastsend", stats.nLastSend)); + obj.push_back(Pair("lastrecv", stats.nLastRecv)); + obj.push_back(Pair("bytessent", stats.nSendBytes)); + obj.push_back(Pair("bytesrecv", stats.nRecvBytes)); + obj.push_back(Pair("conntime", stats.nTimeConnected)); obj.push_back(Pair("pingtime", stats.dPingTime)); if (stats.dPingWait > 0.0) obj.push_back(Pair("pingwait", stats.dPingWait)); @@ -328,9 +328,9 @@ Value getnettotals(const Array& params, bool fHelp) ); Object obj; - obj.push_back(Pair("totalbytesrecv", static_cast< boost::uint64_t>(CNode::GetTotalBytesRecv()))); - obj.push_back(Pair("totalbytessent", static_cast<boost::uint64_t>(CNode::GetTotalBytesSent()))); - obj.push_back(Pair("timemillis", static_cast<boost::int64_t>(GetTimeMillis()))); + obj.push_back(Pair("totalbytesrecv", CNode::GetTotalBytesRecv())); + obj.push_back(Pair("totalbytessent", CNode::GetTotalBytesSent())); + obj.push_back(Pair("timemillis", GetTimeMillis())); return obj; } @@ -365,7 +365,7 @@ Value getnetworkinfo(const Array& params, bool fHelp) Object obj; obj.push_back(Pair("version", (int)CLIENT_VERSION)); obj.push_back(Pair("protocolversion",(int)PROTOCOL_VERSION)); - obj.push_back(Pair("timeoffset", (boost::int64_t)GetTimeOffset())); + obj.push_back(Pair("timeoffset", GetTimeOffset())); obj.push_back(Pair("connections", (int)vNodes.size())); obj.push_back(Pair("proxy", (proxy.first.IsValid() ? proxy.first.ToStringIPPort() : string()))); obj.push_back(Pair("relayfee", ValueFromAmount(CTransaction::nMinRelayTxFee))); diff --git a/src/rpcprotocol.cpp b/src/rpcprotocol.cpp index 652b14d187..5cbaa535ab 100644 --- a/src/rpcprotocol.cpp +++ b/src/rpcprotocol.cpp @@ -92,7 +92,7 @@ string HTTPReply(int nStatus, const string& strMsg, bool keepalive) "HTTP/1.1 %d %s\r\n" "Date: %s\r\n" "Connection: %s\r\n" - "Content-Length: %"PRIszu"\r\n" + "Content-Length: %u\r\n" "Content-Type: application/json\r\n" "Server: bitcoin-json-rpc/%s\r\n" "\r\n" diff --git a/src/rpcprotocol.h b/src/rpcprotocol.h index 8b3df19621..11bdd171d9 100644 --- a/src/rpcprotocol.h +++ b/src/rpcprotocol.h @@ -103,11 +103,27 @@ public: } bool connect(const std::string& server, const std::string& port) { - boost::asio::ip::tcp::resolver resolver(stream.get_io_service()); - boost::asio::ip::tcp::resolver::query query(server.c_str(), port.c_str()); - boost::asio::ip::tcp::resolver::iterator endpoint_iterator = resolver.resolve(query); - boost::asio::ip::tcp::resolver::iterator end; + using namespace boost::asio::ip; + tcp::resolver resolver(stream.get_io_service()); + tcp::resolver::iterator endpoint_iterator; +#if BOOST_VERSION >= 104300 + try { +#endif + // The default query (flags address_configured) tries IPv6 if + // non-localhost IPv6 configured, and IPv4 if non-localhost IPv4 + // configured. + tcp::resolver::query query(server.c_str(), port.c_str()); + endpoint_iterator = resolver.resolve(query); +#if BOOST_VERSION >= 104300 + } catch(boost::system::system_error &e) + { + // If we at first don't succeed, try blanket lookup (IPv4+IPv6 independent of configured interfaces) + tcp::resolver::query query(server.c_str(), port.c_str(), resolver_query_base::flags()); + endpoint_iterator = resolver.resolve(query); + } +#endif boost::system::error_code error = boost::asio::error::host_not_found; + tcp::resolver::iterator end; while (error && endpoint_iterator != end) { stream.lowest_layer().close(); diff --git a/src/rpcrawtransaction.cpp b/src/rpcrawtransaction.cpp index 50734a5c11..dee7daeb2a 100644 --- a/src/rpcrawtransaction.cpp +++ b/src/rpcrawtransaction.cpp @@ -55,7 +55,7 @@ void TxToJSON(const CTransaction& tx, const uint256 hashBlock, Object& entry) { entry.push_back(Pair("txid", tx.GetHash().GetHex())); entry.push_back(Pair("version", tx.nVersion)); - entry.push_back(Pair("locktime", (boost::int64_t)tx.nLockTime)); + entry.push_back(Pair("locktime", (int64_t)tx.nLockTime)); Array vin; BOOST_FOREACH(const CTxIn& txin, tx.vin) { @@ -65,13 +65,13 @@ void TxToJSON(const CTransaction& tx, const uint256 hashBlock, Object& entry) else { in.push_back(Pair("txid", txin.prevout.hash.GetHex())); - in.push_back(Pair("vout", (boost::int64_t)txin.prevout.n)); + in.push_back(Pair("vout", (int64_t)txin.prevout.n)); Object o; o.push_back(Pair("asm", txin.scriptSig.ToString())); o.push_back(Pair("hex", HexStr(txin.scriptSig.begin(), txin.scriptSig.end()))); in.push_back(Pair("scriptSig", o)); } - in.push_back(Pair("sequence", (boost::int64_t)txin.nSequence)); + in.push_back(Pair("sequence", (int64_t)txin.nSequence)); vin.push_back(in); } entry.push_back(Pair("vin", vin)); @@ -81,7 +81,7 @@ void TxToJSON(const CTransaction& tx, const uint256 hashBlock, Object& entry) const CTxOut& txout = tx.vout[i]; Object out; out.push_back(Pair("value", ValueFromAmount(txout.nValue))); - out.push_back(Pair("n", (boost::int64_t)i)); + out.push_back(Pair("n", (int64_t)i)); Object o; ScriptPubKeyToJSON(txout.scriptPubKey, o, true); out.push_back(Pair("scriptPubKey", o)); @@ -99,8 +99,8 @@ void TxToJSON(const CTransaction& tx, const uint256 hashBlock, Object& entry) if (chainActive.Contains(pindex)) { entry.push_back(Pair("confirmations", 1 + chainActive.Height() - pindex->nHeight)); - entry.push_back(Pair("time", (boost::int64_t)pindex->nTime)); - entry.push_back(Pair("blocktime", (boost::int64_t)pindex->nTime)); + entry.push_back(Pair("time", (int64_t)pindex->nTime)); + entry.push_back(Pair("blocktime", (int64_t)pindex->nTime)); } else entry.push_back(Pair("confirmations", 0)); diff --git a/src/rpcserver.cpp b/src/rpcserver.cpp index ac40ea7cf1..2534a9dcf4 100644 --- a/src/rpcserver.cpp +++ b/src/rpcserver.cpp @@ -39,6 +39,7 @@ static ssl::context* rpc_ssl_context = NULL; static boost::thread_group* rpc_worker_group = NULL; static boost::asio::io_service::work *rpc_dummy_work = NULL; static std::vector<CSubNet> rpc_allow_subnets; //!< List of subnets to allow RPC connections from +static std::vector< boost::shared_ptr<ip::tcp::acceptor> > rpc_acceptors; void RPCTypeCheck(const Array& params, const list<Value_type>& typesExpected, @@ -444,7 +445,7 @@ template <typename Protocol, typename SocketAcceptorService> static void RPCAcceptHandler(boost::shared_ptr< basic_socket_acceptor<Protocol, SocketAcceptorService> > acceptor, ssl::context& context, bool fUseSSL, - AcceptedConnection* conn, + boost::shared_ptr< AcceptedConnection > conn, const boost::system::error_code& error); /** @@ -456,7 +457,7 @@ static void RPCListen(boost::shared_ptr< basic_socket_acceptor<Protocol, SocketA const bool fUseSSL) { // Accept connection - AcceptedConnectionImpl<Protocol>* conn = new AcceptedConnectionImpl<Protocol>(acceptor->get_io_service(), context, fUseSSL); + boost::shared_ptr< AcceptedConnectionImpl<Protocol> > conn(new AcceptedConnectionImpl<Protocol>(acceptor->get_io_service(), context, fUseSSL)); acceptor->async_accept( conn->sslStream.lowest_layer(), @@ -466,7 +467,7 @@ static void RPCListen(boost::shared_ptr< basic_socket_acceptor<Protocol, SocketA boost::ref(context), fUseSSL, conn, - boost::asio::placeholders::error)); + _1)); } @@ -477,21 +478,20 @@ template <typename Protocol, typename SocketAcceptorService> static void RPCAcceptHandler(boost::shared_ptr< basic_socket_acceptor<Protocol, SocketAcceptorService> > acceptor, ssl::context& context, const bool fUseSSL, - AcceptedConnection* conn, + boost::shared_ptr< AcceptedConnection > conn, const boost::system::error_code& error) { // Immediately start accepting new connections, except when we're cancelled or our socket is closed. if (error != asio::error::operation_aborted && acceptor->is_open()) RPCListen(acceptor, context, fUseSSL); - AcceptedConnectionImpl<ip::tcp>* tcp_conn = dynamic_cast< AcceptedConnectionImpl<ip::tcp>* >(conn); + AcceptedConnectionImpl<ip::tcp>* tcp_conn = dynamic_cast< AcceptedConnectionImpl<ip::tcp>* >(conn.get()); - // TODO: Actually handle errors if (error) { - delete conn; + // TODO: Actually handle errors + LogPrintf("%s: Error: %s\n", __func__, error.message()); } - // Restrict callers by IP. It is important to // do this before starting client thread, to filter out // certain DoS and misbehaving clients. @@ -500,15 +500,22 @@ static void RPCAcceptHandler(boost::shared_ptr< basic_socket_acceptor<Protocol, // Only send a 403 if we're not using SSL to prevent a DoS during the SSL handshake. if (!fUseSSL) conn->stream() << HTTPReply(HTTP_FORBIDDEN, "", false) << std::flush; - delete conn; + conn->close(); } else { - ServiceConnection(conn); + ServiceConnection(conn.get()); conn->close(); - delete conn; } } +static ip::tcp::endpoint ParseEndpoint(const std::string &strEndpoint, int defaultPort) +{ + std::string addr; + int port = defaultPort; + SplitHostPort(strEndpoint, port, addr); + return ip::tcp::endpoint(asio::ip::address::from_string(addr), port); +} + void StartRPCThreads() { rpc_allow_subnets.clear(); @@ -590,56 +597,74 @@ void StartRPCThreads() SSL_CTX_set_cipher_list(rpc_ssl_context->impl(), strCiphers.c_str()); } - // Try a dual IPv6/IPv4 socket, falling back to separate IPv4 and IPv6 sockets - const bool loopback = !mapArgs.count("-rpcallowip"); - asio::ip::address bindAddress = loopback ? asio::ip::address_v6::loopback() : asio::ip::address_v6::any(); - ip::tcp::endpoint endpoint(bindAddress, GetArg("-rpcport", Params().RPCPort())); - boost::system::error_code v6_only_error; - boost::shared_ptr<ip::tcp::acceptor> acceptor(new ip::tcp::acceptor(*rpc_io_service)); - - bool fListening = false; - std::string strerr; - try + std::vector<ip::tcp::endpoint> vEndpoints; + bool bBindAny = false; + int defaultPort = GetArg("-rpcport", Params().RPCPort()); + if (!mapArgs.count("-rpcallowip")) // Default to loopback if not allowing external IPs { - acceptor->open(endpoint.protocol()); - acceptor->set_option(boost::asio::ip::tcp::acceptor::reuse_address(true)); - - // Try making the socket dual IPv6/IPv4 (if listening on the "any" address) - acceptor->set_option(boost::asio::ip::v6_only(loopback), v6_only_error); - - acceptor->bind(endpoint); - acceptor->listen(socket_base::max_connections); - - RPCListen(acceptor, *rpc_ssl_context, fUseSSL); - - fListening = true; - } - catch(boost::system::system_error &e) + vEndpoints.push_back(ip::tcp::endpoint(asio::ip::address_v6::loopback(), defaultPort)); + vEndpoints.push_back(ip::tcp::endpoint(asio::ip::address_v4::loopback(), defaultPort)); + if (mapArgs.count("-rpcbind")) + { + LogPrintf("WARNING: option -rpcbind was ignored because -rpcallowip was not specified, refusing to allow everyone to connect\n"); + } + } else if (mapArgs.count("-rpcbind")) // Specific bind address { - strerr = strprintf(_("An error occurred while setting up the RPC port %u for listening on IPv6, falling back to IPv4: %s"), endpoint.port(), e.what()); + BOOST_FOREACH(const std::string &addr, mapMultiArgs["-rpcbind"]) + { + try { + vEndpoints.push_back(ParseEndpoint(addr, defaultPort)); + } + catch(boost::system::system_error &e) + { + uiInterface.ThreadSafeMessageBox( + strprintf(_("Could not parse -rpcbind value %s as network address"), addr), + "", CClientUIInterface::MSG_ERROR); + StartShutdown(); + return; + } + } + } else { // No specific bind address specified, bind to any + vEndpoints.push_back(ip::tcp::endpoint(asio::ip::address_v6::any(), defaultPort)); + vEndpoints.push_back(ip::tcp::endpoint(asio::ip::address_v4::any(), defaultPort)); + // Prefer making the socket dual IPv6/IPv4 instead of binding + // to both addresses seperately. + bBindAny = true; } - try { - // If dual IPv6/IPv4 failed (or we're opening loopback interfaces only), open IPv4 separately - if (!fListening || loopback || v6_only_error) - { - bindAddress = loopback ? asio::ip::address_v4::loopback() : asio::ip::address_v4::any(); - endpoint.address(bindAddress); + bool fListening = false; + std::string strerr; + BOOST_FOREACH(const ip::tcp::endpoint &endpoint, vEndpoints) + { + asio::ip::address bindAddress = endpoint.address(); + LogPrintf("Binding RPC on address %s port %i (IPv4+IPv6 bind any: %i)\n", bindAddress.to_string(), endpoint.port(), bBindAny); + boost::system::error_code v6_only_error; + boost::shared_ptr<ip::tcp::acceptor> acceptor(new ip::tcp::acceptor(*rpc_io_service)); + rpc_acceptors.push_back(acceptor); - acceptor.reset(new ip::tcp::acceptor(*rpc_io_service)); + try { acceptor->open(endpoint.protocol()); acceptor->set_option(boost::asio::ip::tcp::acceptor::reuse_address(true)); + + // Try making the socket dual IPv6/IPv4 when listening on the IPv6 "any" address + acceptor->set_option(boost::asio::ip::v6_only( + !bBindAny || bindAddress != asio::ip::address_v6::any()), v6_only_error); + acceptor->bind(endpoint); acceptor->listen(socket_base::max_connections); RPCListen(acceptor, *rpc_ssl_context, fUseSSL); fListening = true; + // If dual IPv6/IPv4 bind succesful, skip binding to IPv4 separately + if(bBindAny && bindAddress == asio::ip::address_v6::any() && !v6_only_error) + break; + } + catch(boost::system::system_error &e) + { + LogPrintf("ERROR: Binding RPC on address %s port %i failed: %s\n", bindAddress.to_string(), endpoint.port(), e.what()); + strerr = strprintf(_("An error occurred while setting up the RPC address %s port %u for listening: %s"), bindAddress.to_string(), endpoint.port(), e.what()); } - } - catch(boost::system::system_error &e) - { - strerr = strprintf(_("An error occurred while setting up the RPC port %u for listening on IPv4: %s"), endpoint.port(), e.what()); } if (!fListening) { @@ -670,7 +695,16 @@ void StopRPCThreads() { if (rpc_io_service == NULL) return; + // First, cancel all timers and acceptors + // This is not done automatically by ->stop(), and in some cases the destructor of + // asio::io_service can hang if this is skipped. + BOOST_FOREACH(const boost::shared_ptr<ip::tcp::acceptor> &acceptor, rpc_acceptors) + acceptor->cancel(); + rpc_acceptors.clear(); + BOOST_FOREACH(const PAIRTYPE(std::string, boost::shared_ptr<deadline_timer>) &timer, deadlineTimers) + timer.second->cancel(); deadlineTimers.clear(); + rpc_io_service->stop(); if (rpc_worker_group != NULL) rpc_worker_group->join_all(); diff --git a/src/rpcwallet.cpp b/src/rpcwallet.cpp index 2479a1f87e..a8f267d7fc 100644 --- a/src/rpcwallet.cpp +++ b/src/rpcwallet.cpp @@ -49,7 +49,7 @@ void WalletTxToJSON(const CWalletTx& wtx, Object& entry) { entry.push_back(Pair("blockhash", wtx.hashBlock.GetHex())); entry.push_back(Pair("blockindex", wtx.nIndex)); - entry.push_back(Pair("blocktime", (boost::int64_t)(mapBlockIndex[wtx.hashBlock]->nTime))); + entry.push_back(Pair("blocktime", (int64_t)(mapBlockIndex[wtx.hashBlock]->nTime))); } uint256 hash = wtx.GetHash(); entry.push_back(Pair("txid", hash.GetHex())); @@ -57,8 +57,8 @@ void WalletTxToJSON(const CWalletTx& wtx, Object& entry) BOOST_FOREACH(const uint256& conflict, wtx.GetConflicts()) conflicts.push_back(conflict.GetHex()); entry.push_back(Pair("walletconflicts", conflicts)); - entry.push_back(Pair("time", (boost::int64_t)wtx.GetTxTime())); - entry.push_back(Pair("timereceived", (boost::int64_t)wtx.nTimeReceived)); + entry.push_back(Pair("time", wtx.GetTxTime())); + entry.push_back(Pair("timereceived", (int64_t)wtx.nTimeReceived)); BOOST_FOREACH(const PAIRTYPE(string,string)& item, wtx.mapValue) entry.push_back(Pair(item.first, item.second)); } @@ -1167,7 +1167,7 @@ void AcentryToJSON(const CAccountingEntry& acentry, const string& strAccount, Ar Object entry; entry.push_back(Pair("account", acentry.strAccount)); entry.push_back(Pair("category", "move")); - entry.push_back(Pair("time", (boost::int64_t)acentry.nTime)); + entry.push_back(Pair("time", acentry.nTime)); entry.push_back(Pair("amount", ValueFromAmount(acentry.nCreditDebit))); entry.push_back(Pair("otheraccount", acentry.strOtherAccount)); entry.push_back(Pair("comment", acentry.strComment)); @@ -1912,9 +1912,9 @@ Value getwalletinfo(const Array& params, bool fHelp) obj.push_back(Pair("walletversion", pwalletMain->GetVersion())); obj.push_back(Pair("balance", ValueFromAmount(pwalletMain->GetBalance()))); obj.push_back(Pair("txcount", (int)pwalletMain->mapWallet.size())); - obj.push_back(Pair("keypoololdest", (boost::int64_t)pwalletMain->GetOldestKeyPoolTime())); + obj.push_back(Pair("keypoololdest", pwalletMain->GetOldestKeyPoolTime())); obj.push_back(Pair("keypoolsize", (int)pwalletMain->GetKeyPoolSize())); if (pwalletMain->IsCrypted()) - obj.push_back(Pair("unlocked_until", (boost::int64_t)nWalletUnlockTime)); + obj.push_back(Pair("unlocked_until", nWalletUnlockTime)); return obj; } diff --git a/src/test/base58_tests.cpp b/src/test/base58_tests.cpp index 5689e69995..b81a19cfd8 100644 --- a/src/test/base58_tests.cpp +++ b/src/test/base58_tests.cpp @@ -233,7 +233,7 @@ BOOST_AUTO_TEST_CASE(base58_keys_valid_gen) continue; } CBitcoinAddress addrOut; - BOOST_CHECK_MESSAGE(boost::apply_visitor(CBitcoinAddressVisitor(&addrOut), dest), "encode dest: " + strTest); + BOOST_CHECK_MESSAGE(addrOut.Set(dest), "encode dest: " + strTest); BOOST_CHECK_MESSAGE(addrOut.ToString() == exp_base58string, "mismatch: " + strTest); } } @@ -241,7 +241,7 @@ BOOST_AUTO_TEST_CASE(base58_keys_valid_gen) // Visiting a CNoDestination must fail CBitcoinAddress dummyAddr; CTxDestination nodest = CNoDestination(); - BOOST_CHECK(!boost::apply_visitor(CBitcoinAddressVisitor(&dummyAddr), nodest)); + BOOST_CHECK(!dummyAddr.Set(nodest)); SelectParams(CChainParams::MAIN); } diff --git a/src/test/bignum.h b/src/test/bignum.h index b57800f372..a75f5250fa 100644 --- a/src/test/bignum.h +++ b/src/test/bignum.h @@ -10,6 +10,7 @@ #include <limits> #include <stdexcept> #include <stdint.h> +#include <string> #include <vector> #include <openssl/bn.h> diff --git a/src/test/util_tests.cpp b/src/test/util_tests.cpp index f4ca8c0539..3811569c0a 100644 --- a/src/test/util_tests.cpp +++ b/src/test/util_tests.cpp @@ -310,15 +310,15 @@ BOOST_AUTO_TEST_CASE(strprintf_numbers) size_t st = 12345678; /* unsigned size_t test value */ ssize_t sst = -12345678; /* signed size_t test value */ - BOOST_CHECK(strprintf("%s %"PRIszd" %s", B, sst, E) == B" -12345678 "E); - BOOST_CHECK(strprintf("%s %"PRIszu" %s", B, st, E) == B" 12345678 "E); - BOOST_CHECK(strprintf("%s %"PRIszx" %s", B, st, E) == B" bc614e "E); + BOOST_CHECK(strprintf("%s %d %s", B, sst, E) == B" -12345678 "E); + BOOST_CHECK(strprintf("%s %u %s", B, st, E) == B" 12345678 "E); + BOOST_CHECK(strprintf("%s %x %s", B, st, E) == B" bc614e "E); ptrdiff_t pt = 87654321; /* positive ptrdiff_t test value */ ptrdiff_t spt = -87654321; /* negative ptrdiff_t test value */ - BOOST_CHECK(strprintf("%s %"PRIpdd" %s", B, spt, E) == B" -87654321 "E); - BOOST_CHECK(strprintf("%s %"PRIpdu" %s", B, pt, E) == B" 87654321 "E); - BOOST_CHECK(strprintf("%s %"PRIpdx" %s", B, pt, E) == B" 5397fb1 "E); + BOOST_CHECK(strprintf("%s %d %s", B, spt, E) == B" -87654321 "E); + BOOST_CHECK(strprintf("%s %u %s", B, pt, E) == B" 87654321 "E); + BOOST_CHECK(strprintf("%s %x %s", B, pt, E) == B" 5397fb1 "E); } #undef B #undef E diff --git a/src/util.cpp b/src/util.cpp index 00e29446d5..aa3adf89ec 100644 --- a/src/util.cpp +++ b/src/util.cpp @@ -303,26 +303,6 @@ int LogPrintStr(const std::string &str) return ret; } -void ParseString(const string& str, char c, vector<string>& v) -{ - if (str.empty()) - return; - string::size_type i1 = 0; - string::size_type i2; - while (true) - { - i2 = str.find(c, i1); - if (i2 == str.npos) - { - v.push_back(str.substr(i1)); - return; - } - v.push_back(str.substr(i1, i2-i1)); - i1 = i2+1; - } -} - - string FormatMoney(int64_t n, bool fPlus) { // Note: not using straight sprintf here because we do NOT want @@ -1404,3 +1384,19 @@ bool ParseInt32(const std::string& str, int32_t *out) n <= std::numeric_limits<int32_t>::max(); } +void SetupEnvironment() +{ + #ifndef WIN32 + try + { + #if BOOST_FILESYSTEM_VERSION == 3 + boost::filesystem::path::codecvt(); // Raises runtime error if current locale is invalid + #else // boost filesystem v2 + std::locale(); // Raises runtime error if current locale is invalid + #endif + } catch(std::runtime_error &e) + { + setenv("LC_ALL", "C", 1); // Force C locale + } + #endif +} diff --git a/src/util.h b/src/util.h index 011a40e540..97185073e0 100644 --- a/src/util.h +++ b/src/util.h @@ -44,18 +44,6 @@ static const int64_t CENT = 1000000; #define UEND(a) ((unsigned char*)&((&(a))[1])) #define ARRAYLEN(array) (sizeof(array)/sizeof((array)[0])) -/* Format characters for (s)size_t, ptrdiff_t. - * - * Define these as empty as the tinyformat-based formatting system is - * type-safe, no special format characters are needed to specify sizes. - */ -#define PRIszx "x" -#define PRIszu "u" -#define PRIszd "d" -#define PRIpdx "x" -#define PRIpdu "u" -#define PRIpdd "d" - // This is needed because the foreach macro can't get over the comma in pair<t1, t2> #define PAIRTYPE(t1, t2) std::pair<t1, t2> @@ -118,6 +106,7 @@ extern volatile bool fReopenDebugLog; void RandAddSeed(); void RandAddSeedPerfmon(); +void SetupEnvironment(); /* Return true if log accepts specified category */ bool LogAcceptCategory(const char* category); @@ -165,7 +154,6 @@ static inline bool error(const char* format) void LogException(std::exception* pex, const char* pszThread); void PrintExceptionContinue(std::exception* pex, const char* pszThread); -void ParseString(const std::string& str, char c, std::vector<std::string>& v); std::string FormatMoney(int64_t n, bool fPlus=false); bool ParseMoney(const std::string& str, int64_t& nRet); bool ParseMoney(const char* pszIn, int64_t& nRet); diff --git a/src/wallet.cpp b/src/wallet.cpp index 418720de93..fa7aecddb6 100644 --- a/src/wallet.cpp +++ b/src/wallet.cpp @@ -1638,7 +1638,7 @@ bool CWallet::TopUpKeyPool(unsigned int kpSize) if (!walletdb.WritePool(nEnd, CKeyPool(GenerateNewKey()))) throw runtime_error("TopUpKeyPool() : writing generated key failed"); setKeyPool.insert(nEnd); - LogPrintf("keypool added key %d, size=%"PRIszu"\n", nEnd, setKeyPool.size()); + LogPrintf("keypool added key %d, size=%u\n", nEnd, setKeyPool.size()); } } return true; diff --git a/src/walletdb.cpp b/src/walletdb.cpp index 359a1cef61..80e9dded5f 100644 --- a/src/walletdb.cpp +++ b/src/walletdb.cpp @@ -894,7 +894,7 @@ bool CWalletDB::Recover(CDBEnv& dbenv, std::string filename, bool fOnlyKeys) LogPrintf("Salvage(aggressive) found no records in %s.\n", newFilename); return false; } - LogPrintf("Salvage(aggressive) found %"PRIszu" records\n", salvagedData.size()); + LogPrintf("Salvage(aggressive) found %u records\n", salvagedData.size()); bool fSuccess = allOK; Db* pdbCopy = new Db(&dbenv.dbenv, 0); |